From 27ac6b609dca0bf5763663a5cc08f56969ac8fe7 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Fri, 19 Jul 2019 17:01:43 +0100
Subject: [PATCH] AMQ-7247 - Update maven plugin API + Pax URL versions

---
 activemq-tooling/activemq-maven-plugin/pom.xml     | 14 +++++++-------
 .../activemq-memtest-maven-plugin/pom.xml          |  2 +-
 .../activemq-perf-maven-plugin/pom.xml             |  2 +-
 pom.xml                                            |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/activemq-tooling/activemq-maven-plugin/pom.xml b/activemq-tooling/activemq-maven-plugin/pom.xml
index 5588f8aba5..7f5cfeebd6 100644
--- a/activemq-tooling/activemq-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-maven-plugin/pom.xml
@@ -31,13 +31,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0</version>
+      <artifactId>maven-core</artifactId>
+      <version>${maven-core-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -72,6 +67,11 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
index e42b37b475..346571b5f9 100644
--- a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <version>${maven-core-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
index fde54a7a77..9490bdef01 100644
--- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <version>${maven-core-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
diff --git a/pom.xml b/pom.xml
index e87e3c5080..694557f693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
     <pax-exam-version>4.9.1</pax-exam-version>
     <paxexam-karaf-container-version>1.0.0</paxexam-karaf-container-version>
     <pax-runner-version>1.8.6</pax-runner-version>
-    <pax-url-version>2.4.3</pax-url-version>
+    <pax-url-version>2.6.1</pax-url-version>
     <felix-configadmin-version>1.8.0</felix-configadmin-version>
     <felix-framework-version>5.0.1</felix-framework-version>
 
@@ -176,6 +176,7 @@
     <maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version>
     <maven-graph-plugin-version>1.30</maven-graph-plugin-version>
     <maven-plugin-plugin-version>3.6.0</maven-plugin-plugin-version>
+    <maven-core-version>3.6.1</maven-core-version>
     <!-- OSGi bundles properties -->
     <activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
     <activemq.osgi.export.pkg>org.apache.activemq*</activemq.osgi.export.pkg>