[Git][java-team/metainf-services][upstream] 2 commits: New upstream version 1.10

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / metainf-services


Commits:
e130ab5a by Emmanuel Bourg at 2024-07-28T14:24:36+02:00
New upstream version 1.10
- - - - -
4c84c220 by Emmanuel Bourg at 2024-07-28T14:24:44+02:00
New upstream version 1.11
- - - - -


5 changed files:

- .gitignore
- pom.xml
- src/main/java/org/kohsuke/MetaInfServices.java
- src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
- src/site/site.xml


Changes:

=====================================
.gitignore
=====================================
@@ -1 +1,2 @@
-/target/
\ No newline at end of file
+/target/
+.idea


=====================================
pom.xml
=====================================
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.kohsuke</groupId>
     <artifactId>pom</artifactId>
-    <version>20</version>
+    <version>21</version>
   </parent>
 
   <groupId>org.kohsuke.metainf-services</groupId>
   <artifactId>metainf-services</artifactId>
-  <version>1.9</version>
+  <version>1.11</version>
   <name>META-INF/services generator</name>
   <description>Annotation-driven META-INF/services auto-generation</description>
   <url>http://metainf-services.kohsuke.org/</url>
@@ -18,7 +18,7 @@
     <connection>scm:git:git at github.com/kohsuke/${project.artifactId}.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git</developerConnection>
     <url>http://${project.artifactId}.kohsuke.org/</url>
-    <tag>metainf-services-1.9</tag>
+    <tag>metainf-services-1.11</tag>
   </scm>
 
   <distributionManagement>
@@ -40,16 +40,16 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>3.11.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <compilerArgument>-proc:none</compilerArgument>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
@@ -66,7 +66,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.15</version>
+        <version>1.23</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -76,7 +76,7 @@
             <configuration>
               <signature>
                 <groupId>org.codehaus.mojo.signature</groupId>
-                <artifactId>java16</artifactId>
+                <artifactId>java18</artifactId>
                 <version>1.0</version>
               </signature>
             </configuration>
@@ -89,7 +89,7 @@
   <licenses>
     <license>
       <name>MIT license</name>
-      <url>http://www.opensource.org/licenses/mit-license.php</url>
+      <url>https://opensource.org/license/mit/</url>
       <distribution>repo</distribution>
     </license>
   </licenses>


=====================================
src/main/java/org/kohsuke/MetaInfServices.java
=====================================
@@ -30,10 +30,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
 import java.lang.annotation.Target;
 
 /**
- * Indicates that this class name should be listed into the <tt>META-INF/services/CONTRACTNAME</tt>.
+ * Indicates that this class name should be listed into the {@code META-INF/services/CONTRACTNAME}.
  *
  * <p>
- * If the class for which this annotation is placaed only have one base class or one interface,
+ * If the class for which this annotation is placed only have one base class or one interface,
  * then the CONTRACTNAME is the fully qualified name of that type.
  *
  * <p>


=====================================
src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
=====================================
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -105,10 +106,8 @@ public class AnnotationProcessorImpl extends AbstractProcessor {
                 while((line=r.readLine())!=null)
                     e.getValue().add(line);
                 r.close();
-            } catch (FileNotFoundException x) {
+            } catch (FileNotFoundException | NoSuchFileException x) {
                 // doesn't exist
-            } catch (java.nio.file.NoSuchFileException x) {
-               // doesn't exist
             } catch (IOException x) {
                 processingEnv.getMessager().printMessage(Kind.ERROR,"Failed to load existing service definition files: "+x);
             }


=====================================
src/site/site.xml
=====================================
@@ -3,7 +3,7 @@
   <skin>
     <groupId>org.kohsuke</groupId>
     <artifactId>maven-skin</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </skin>
 
   <body>



View it on GitLab: https://salsa.debian.org/java-team/metainf-services/-/compare/44f531c02a2391b9c1b7b5b1b2a72c0af7cd07f4...4c84c220803ae92f766731c1e02d2a520d5362a5

-- 
View it on GitLab: https://salsa.debian.org/java-team/metainf-services/-/compare/44f531c02a2391b9c1b7b5b1b2a72c0af7cd07f4...4c84c220803ae92f766731c1e02d2a520d5362a5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240728/d97c5f51/attachment.htm>