Merge pull request #246 from cstamas/drop-bad-boys

Move off from Maven2 codebase (maven-compat)

Author: ebarboni

nbm-maven-plugin/pom.xml

@@ -42,6 +42,10 @@ under the License.
     </prerequisites>
 
     <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
@@ -114,38 +118,33 @@ under the License.
             <artifactId>maven-plugin-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
-
-        <!-- BAD BOYS: we want to get rid of these -->
         <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-compat</artifactId>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-filtering</artifactId>
-            <version>3.4.0</version>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-util</artifactId>
+            <!-- scope compile to work across Maven 3.8/3.9 -->
         </dependency>
+
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-dependency-tree</artifactId>
-            <version>3.3.0</version>
+            <artifactId>maven-dependency-analyzer</artifactId>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-dependency-analyzer</artifactId>
-            <version>1.16.0</version>
+            <artifactId>maven-filtering</artifactId>
+            <version>3.4.0</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm</artifactId>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-xml</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
 
         <!-- tests -->
         <dependency>
@@ -168,10 +167,35 @@ under the License.
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/filtered-resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
+            <plugin>
+                <groupId>org.eclipse.sisu</groupId>
+                <artifactId>sisu-maven-plugin</artifactId>
+                <version>0.9.0.M4</version>
+                <executions>
+                    <execution>
+                        <id>index-project</id>
+                        <goals>
+                            <goal>main-index</goal>
+                            <goal>test-index</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <!-- TODO need to override parent version value... I suppose this will eventually end up in mojo parent pom, check regularly -->
                 <groupId>org.apache.maven.plugins</groupId>

nbm-maven-plugin/src/main/filtered-resources/org/apache/netbeans/nbm/lifecycle/NbmApplicationLifecycleMappingProvider.properties

@@ -0,0 +1,7 @@
+# TODO: good practice to lock down plugin versions (and use ${project.version} for plugins from this project)
+process-test-resources=org.apache.maven.plugins:maven-resources-plugin:testResources
+test-compile=org.apache.maven.plugins:maven-compiler-plugin:testCompile
+package=org.apache.netbeans.utilities:nbm-maven-plugin:cluster-app,org.apache.netbeans.utilities:nbm-maven-plugin:standalone-zip
+integration-test=org.apache.maven.plugins:maven-surefire-plugin:test
+install=org.apache.maven.plugins:maven-install-plugin:install
+deploy=org.apache.maven.plugins:maven-deploy-plugin:deploy

nbm-maven-plugin/src/main/filtered-resources/org/apache/netbeans/nbm/lifecycle/NbmLifecycleMappingProvider.properties

@@ -0,0 +1,10 @@
+# TODO: good practice to lock down plugin versions (and use ${project.version} for plugins from this project)
+process-resources=org.apache.maven.plugins:maven-resources-plugin:resources
+compile=org.apache.maven.plugins:maven-compiler-plugin:compile
+process-classes=org.apache.netbeans.utilities:nbm-maven-plugin:manifest
+process-test-resources=org.apache.maven.plugins:maven-resources-plugin:testResources
+test-compile=org.apache.maven.plugins:maven-compiler-plugin:testCompile
+test=org.apache.maven.plugins:maven-surefire-plugin:test
+package=org.apache.maven.plugins:maven-jar-plugin:jar,org.apache.netbeans.utilities:nbm-maven-plugin:branding,org.apache.netbeans.utilities:nbm-maven-plugin:nbm
+install=org.apache.maven.plugins:maven-install-plugin:install
+deploy=org.apache.maven.plugins:maven-deploy-plugin:deploy