You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/03/03 18:28:37 UTC

[1/3] qpid-jms git commit: update to latest apache parent pom v16, remove some version overrides, remove some unused properties

Repository: qpid-jms
Updated Branches:
  refs/heads/master f29381d98 -> 5cd279a62


update to latest apache parent pom v16, remove some version overrides, remove some unused properties


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5cd279a6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5cd279a6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5cd279a6

Branch: refs/heads/master
Commit: 5cd279a627f78248dc1c4a4085c6efc45a0136fc
Parents: 546eb45
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Mar 3 15:56:46 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Mar 3 16:52:01 2015 +0000

----------------------------------------------------------------------
 pom.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5cd279a6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4adef38..8852b01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>14</version>
+    <version>16</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -57,12 +57,8 @@
 
     <!-- Maven Plugin Versions for this Project -->
     <maven-javacc-plugin-version>2.6</maven-javacc-plugin-version>
-    <maven-surefire-plugin-version>2.16</maven-surefire-plugin-version>
-    <maven-assembly-plugin-version>2.4</maven-assembly-plugin-version>
-    <maven-release-plugin-version>2.4.1</maven-release-plugin-version>
     <maven-eclipse-plugin-version>2.9</maven-eclipse-plugin-version>
     <maven-idea-plugin-version>2.5</maven-idea-plugin-version>
-    <maven-compiler-plugin-version>3.1</maven-compiler-plugin-version>
     <findbugs-maven-plugin-version>3.0.0</findbugs-maven-plugin-version>
     <jacoco-plugin-version>0.7.2.201409121644</jacoco-plugin-version>
 
@@ -165,7 +161,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven-surefire-plugin-version}</version>
           <configuration>
             <runOrder>${surefire.runOrder}</runOrder>
             <redirectTestOutputToFile>${maven.test.redirectTestOutputToFile}</redirectTestOutputToFile>
@@ -200,11 +195,6 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>
             <autoVersionSubmodules>true</autoVersionSubmodules>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[2/3] qpid-jms git commit: group required and test dependency version properties, add missing property for jms spec

Posted by ro...@apache.org.
group required and test dependency version properties, add missing property for jms spec


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/546eb45d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/546eb45d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/546eb45d

Branch: refs/heads/master
Commit: 546eb45d6aee6be2c31d12bca3a7210478856f91
Parents: c7ef435
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Mar 3 15:47:01 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Mar 3 16:52:01 2015 +0000

----------------------------------------------------------------------
 pom.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/546eb45d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03a1254..4adef38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,15 +43,17 @@
     <target-version>1.7</target-version>
 
     <!-- Dependency Versions for this Project -->
-    <junit-version>4.12</junit-version>
+    <proton-version>0.8</proton-version>
+    <netty-version>4.0.17.Final</netty-version>
     <slf4j-version>1.7.10</slf4j-version>
+    <geronimo-jms-1-1-spec-version>1.1.1</geronimo-jms-1-1-spec-version>
+    <!-- Test Dependency Versions for this Project -->
     <activemq-version>5.11.1</activemq-version>
-    <proton-version>0.8</proton-version>
+    <junit-version>4.12</junit-version>
     <fuse-joram-tests-version>1.0</fuse-joram-tests-version>
     <jetty-version>8.1.16.v20140903</jetty-version>
     <mockito-version>1.10.19</mockito-version>
     <hamcrest-version>1.3</hamcrest-version>
-    <netty-version>4.0.17.Final</netty-version>
 
     <!-- Maven Plugin Versions for this Project -->
     <maven-javacc-plugin-version>2.6</maven-javacc-plugin-version>
@@ -116,7 +118,7 @@
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>1.1.1</version>
+        <version>${geronimo-jms-1-1-spec-version}</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[3/3] qpid-jms git commit: remove stale pluginManagement entry

Posted by ro...@apache.org.
remove stale pluginManagement entry


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/c7ef435a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/c7ef435a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/c7ef435a

Branch: refs/heads/master
Commit: c7ef435aa9233048fe32056534f347b44ab88530
Parents: f29381d
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Mar 3 15:25:41 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Mar 3 16:52:01 2015 +0000

----------------------------------------------------------------------
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c7ef435a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6cd0131..03a1254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@
     <maven-idea-plugin-version>2.5</maven-idea-plugin-version>
     <maven-compiler-plugin-version>3.1</maven-compiler-plugin-version>
     <findbugs-maven-plugin-version>3.0.0</findbugs-maven-plugin-version>
-    <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
     <jacoco-plugin-version>0.7.2.201409121644</jacoco-plugin-version>
 
     <!-- Test properties -->
@@ -215,11 +214,6 @@
           <version>${maven-javacc-plugin-version}</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>${build-helper-maven-plugin-version}</version>
-        </plugin>
-        <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
           <version>${jacoco-plugin-version}</version>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org