From a8a650cbeea13308a96bd1fe4945cc88bd10b39e Mon Sep 17 00:00:00 2001
From: Hadrian Zbarcea <hadrian@apache.org>
Date: Mon, 31 Oct 2016 20:37:45 -0400
Subject: [PATCH] Fix warnings in Eclipse IDE; remove deprecated prerequisites
 in maven3

---
 activemq-karaf-itest/pom.xml   |  1 -
 activemq-leveldb-store/pom.xml |  1 -
 activemq-osgi/pom.xml          |  1 -
 activemq-spring/pom.xml        |  1 -
 assembly/pom.xml               |  1 -
 pom.xml                        | 58 ++++++++++++++--------------------
 6 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index e43d6e4644..14c65ed5b8 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -93,7 +93,6 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${org.osgi.core-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 8ff615fbb1..32d5677a1b 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -137,7 +137,6 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${org.osgi.core-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 83060319bd..130ec11fc4 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -227,7 +227,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>${maven-dependency-plugin-version}</version>
         <executions>
           <execution>
             <id>unpack</id>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 4f998d20a2..cda501900e 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -108,7 +108,6 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${org.osgi.core-version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7147587fa0..bf586db502 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -73,7 +73,6 @@
     <dependency>
       <groupId>org.apache.activemq.tooling</groupId>
       <artifactId>activemq-junit</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 101955cb26..10dabc9a10 100755
--- a/pom.xml
+++ b/pom.xml
@@ -184,10 +184,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <url>http://activemq.apache.org</url>
 
   <issueManagement>
@@ -1318,17 +1314,30 @@
                   </action>
                 </pluginExecution>
                 <pluginExecution>
-                    <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-plugin-plugin</artifactId>
-                        <versionRange>[3.1,)</versionRange>
-                        <goals>
-                            <goal>descriptor</goal>
-                        </goals>
-                    </pluginExecutionFilter>
-                    <action>
-                        <ignore />
-                    </action>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <versionRange>[3.1,)</versionRange>
+                    <goals>
+                      <goal>descriptor</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore />
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <versionRange>[1.0,)</versionRange>
+                    <goals>
+                      <goal>process</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore />
+                  </action>
                 </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
@@ -1350,25 +1359,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[3.0.2,)</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>ianal-maven-plugin</artifactId>