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 2014/04/22 12:11:49 UTC

svn commit: r1589069 - /qpid/qpid-parent-pom/trunk/pom.xml

Author: robbie
Date: Tue Apr 22 10:11:49 2014
New Revision: 1589069

URL: http://svn.apache.org/r1589069
Log:
QPID-5048: some qpid-parent pom tidyup

Modified:
    qpid/qpid-parent-pom/trunk/pom.xml

Modified: qpid/qpid-parent-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/qpid-parent-pom/trunk/pom.xml?rev=1589069&r1=1589068&r2=1589069&view=diff
==============================================================================
--- qpid/qpid-parent-pom/trunk/pom.xml (original)
+++ qpid/qpid-parent-pom/trunk/pom.xml Tue Apr 22 10:11:49 2014
@@ -70,6 +70,8 @@
   <properties>
     <minimum-maven-version>3.0.0</minimum-maven-version>
     <minimum-java-version>1.6.0</minimum-java-version>
+    <java.source>1.6</java.source>
+    <java.target>1.6</java.target>
 
     <!-- dependency version numbers -->
     <dojo-version>1.9.1</dojo-version>
@@ -103,11 +105,12 @@
     <junit-version>4.11</junit-version>
     <mockito-version>1.9.5</mockito-version>
 
-    <!-- plugin version numbers -->
+    <!-- plugin version numbers, overriding or matching parent -->
     <maven-antrun-plugin-version>1.7</maven-antrun-plugin-version>
     <maven-assembly-plugin-version>2.4</maven-assembly-plugin-version>
     <maven-clean-plugin-version>2.5</maven-clean-plugin-version>
     <maven-compiler-plugin-version>3.1</maven-compiler-plugin-version>
+    <maven-dependency-plugin-version>2.8</maven-dependency-plugin-version>
     <maven-deploy-plugin-version>2.8.1</maven-deploy-plugin-version>
     <maven-docck-plugin-version>1.0</maven-docck-plugin-version>
     <maven-enforcer-plugin-version>1.3.1</maven-enforcer-plugin-version>
@@ -122,13 +125,15 @@
     <maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version>
     <maven-resources-plugin-version>2.6</maven-resources-plugin-version>
     <maven-scm-plugin-version>1.9</maven-scm-plugin-version>
-    <maven-scm-publish-plugin-version>1.0-beta-2</maven-scm-publish-plugin-version>
     <maven-site-plugin-version>3.3</maven-site-plugin-version>
     <maven-source-plugin-version>2.2.1</maven-source-plugin-version>
     <apache-rat-plugin-version>0.10</apache-rat-plugin-version>
     <clirr-maven-plugin-version>2.6.1</clirr-maven-plugin-version>
     <maven-dependency-plugin-version>2.8</maven-dependency-plugin-version>
+    <!-- from the maven 3 profile override -->
+    <maven-scm-publish-plugin-version>1.0</maven-scm-publish-plugin-version>
 
+    <!-- plugin version numbers, not used in parent -->
     <javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
     <maven-rar-plugin-version>2.3</maven-rar-plugin-version>
     <maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version>
@@ -226,13 +231,11 @@
           <artifactId>maven-plugin-plugin</artifactId>
           <version>${maven-plugin-plugin-version}</version>
         </plugin>
-        <!-- START SNIPPET: release-plugin-configuration -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <version>${maven-release-plugin-version}</version>
         </plugin>
-        <!-- END SNIPPET: release-plugin-configuration -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-remote-resources-plugin</artifactId>
@@ -360,7 +363,7 @@
            Verifies that only the explicitly included licences have been used for any compile or runtime dependencies,
            and additionally for any modules that set 'dependency-change-verification' true also checks for a change in
            dependencies against a previous reference output that might signal need for updates to LICENSE and/or NOTICE
-           files inlcuded in their binary assembly files.
+           files included in their binary assembly files.
       -->
       <properties>
         <license-maven-plugin-output-dir>${project.build.directory}/license-maven-plugin</license-maven-plugin-output-dir>



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