[MNG-7250] Upgrade Sisu Inject/Plexus to 0.3.5

Since we have replaced the old JSR 250 library with javax.annotation library we go straight to 1.2. This closes #539
apache · Sep 13, 2021 · e08834b · e08834b
1 parent 383cabf
commit e08834b
Show file tree

Hide file tree

Showing 7 changed files with 772 additions and 399 deletions.
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -33,9 +33,7 @@ subject to the terms and conditions of the following licenses:
 #*    *### advertise about each non-Maven dependency
 #*    *###
 #*    *### infer SPDX license id
-#*    *##if ( $license.name == "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" )
-#*      *##set ( $spdx = 'CDDL-1.0' )
-#*    *##elseif ( $MITLicenseNames.contains( $license.name ) )
+#*    *##if ( $MITLicenseNames.contains( $license.name ) )
 #*      *##set ( $spdx = 'MIT' )
 #*    *##elseif ( $license.name == "Eclipse Public License, Version 1.0" )
 #*      *##set ( $spdx = 'EPL-1.0' )
@@ -62,7 +60,7 @@ subject to the terms and conditions of the following licenses:
 #*    *###
 #*    *### copy license file to lib/$artifactId.license
 #*    *##set ( $licFile = $directory + '/' + $project.artifact.artifactId + '.license' )
-#*    *##if ( $spdx == "MIT" )
+#*    *##if ( $spdx == "MIT" || $spdx == "unrecognized" )
 #*      *### MIT license contains date and copyright that makes the file specific to each artifact
 #*      *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}-${project.artifact.artifactId}-${project.artifact.version}.txt", "licenses/${licFile}" ) )
 #*    *##else

diff --git a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
@@ -36,7 +36,7 @@ javolution (http://javolution.org/).
 This product includes software developed by
 Rome (https://rome.dev.java.net/).
 
-about.html in archive lib/org.eclipse.sisu.inject-0.3.4.jar
+about.html in archive lib/org.eclipse.sisu.inject-0.3.5.jar
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

diff --git a/apache-maven/src/main/appended-resources/licenses/CDDL-1.0.txt b/apache-maven/src/main/appended-resources/licenses/CDDL-1.0.txt
diff --git a/apache-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.2.txt b/apache-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.2.txt
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -166,7 +166,7 @@ under the License.
     <exportedArtifact>org.apache.maven.resolver:maven-resolver-impl</exportedArtifact>
 
     <exportedArtifact>javax.inject:javax.inject</exportedArtifact>
-    <exportedArtifact>javax.annotation:jsr250-api</exportedArtifact>
+    <exportedArtifact>javax.annotation:javax.annotation-api</exportedArtifact>
     <exportedArtifact>org.slf4j:slf4j-api</exportedArtifact>
     <exportedArtifact>org.fusesource.jansi:jansi</exportedArtifact>
 

diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
@@ -116,7 +116,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
+      <artifactId>javax.annotation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@ under the License.
     <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
     <plexusUtilsVersion>3.3.0</plexusUtilsVersion>
     <guiceVersion>4.2.2</guiceVersion>
-    <sisuInjectVersion>0.3.4</sisuInjectVersion>
+    <sisuVersion>0.3.5</sisuVersion>
     <wagonVersion>3.4.3</wagonVersion>
     <jsoupVersion>1.12.1</jsoupVersion>
     <securityDispatcherVersion>2.0</securityDispatcherVersion>
@@ -248,12 +248,12 @@ under the License.
       <dependency>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>org.eclipse.sisu.plexus</artifactId>
-        <version>${sisuInjectVersion}</version>
+        <version>${sisuVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>org.eclipse.sisu.inject</artifactId>
-        <version>${sisuInjectVersion}</version>
+        <version>${sisuVersion}</version>
       </dependency>
       <dependency>
         <groupId>javax.inject</groupId>
@@ -262,8 +262,8 @@ under the License.
       </dependency>
       <dependency>
         <groupId>javax.annotation</groupId>
-        <artifactId>jsr250-api</artifactId>
-        <version>1.0</version>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>1.2</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -480,7 +480,7 @@ under the License.
         <plugin>
           <groupId>org.eclipse.sisu</groupId>
           <artifactId>sisu-maven-plugin</artifactId>
-          <version>${sisuInjectVersion}</version>
+          <version>${sisuVersion}</version>
           <executions>
             <execution>
               <goals>
@@ -545,10 +545,10 @@ under the License.
               <exclude>src/test/remote-repo/**</exclude>
               <exclude>**/*.odg</exclude>
               <!--
-                ! Excluded the license files itself cause they do not have have a license of themselfs.
+                ! Excluded the license files itself cause they do not have have a license of themselves.
               -->
-              <exclude>src/main/appended-resources/licenses/CDDL-1.0.txt</exclude>
               <exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude>
+              <exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.2.txt</exclude>
             </excludes>
           </configuration>
         </plugin>