Author: robbie Date: Mon Apr 21 14:17:36 2014 New Revision: 1588884 URL: http://svn.apache.org/r1588884 Log: QPID-5048: update the qpid parent pom to inherit from the new v14 apache parent, remove dependency management section.
Patch supplied by Andrew MacBean <[email protected]> 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=1588884&r1=1588883&r2=1588884&view=diff ============================================================================== --- qpid/qpid-parent-pom/trunk/pom.xml (original) +++ qpid/qpid-parent-pom/trunk/pom.xml Mon Apr 21 14:17:36 2014 @@ -21,7 +21,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>12</version> + <version>14</version> </parent> <groupId>org.apache.qpid</groupId> @@ -90,7 +90,7 @@ <commons-lang-version>2.6</commons-lang-version> <commons-logging-version>1.1.1</commons-logging-version> <geronimo-jms-1-1-version>1.1.1</geronimo-jms-1-1-version> - <geronimo-gta-version>1.1.1</geronimo-gta-version> + <geronimo-jta-version>1.1.1</geronimo-jta-version> <geronimo-servlet-version>1.0</geronimo-servlet-version> <geronimo-j2ee-connector-version>2.0.0</geronimo-j2ee-connector-version> <geronimo-ejb-version>1.0.1</geronimo-ejb-version> @@ -104,33 +104,34 @@ <!-- test dependency version numbers --> <junit-version>3.8.1</junit-version> - <mockito-version>1.9.0</mockito-version> + <mockito-version>1.9.5</mockito-version> <!-- plugin version numbers --> <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-deploy-plugin-version>2.7</maven-deploy-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> <maven-failsafe-and-surefire-plugins-version>2.16</maven-failsafe-and-surefire-plugins-version> <maven-gpg-plugin-version>1.4</maven-gpg-plugin-version> - <maven-install-plugin-version>2.5</maven-install-plugin-version> + <maven-install-plugin-version>2.5.1</maven-install-plugin-version> <maven-invoker-plugin-version>1.8</maven-invoker-plugin-version> <maven-jar-plugin-version>2.4</maven-jar-plugin-version> <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> <maven-plugin-plugin-version>3.2</maven-plugin-plugin-version> - <maven-release-plugin-version>2.3.2</maven-release-plugin-version> + <maven-release-plugin-version>2.4.2</maven-release-plugin-version> <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.8</maven-scm-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</clirr-maven-plugin-version> + <clirr-maven-plugin-version>2.6.1</clirr-maven-plugin-version> <maven-dependency-plugin-version>2.8</maven-dependency-plugin-version> + <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> @@ -139,243 +140,6 @@ <maven-jxr-plugin-version>2.3</maven-jxr-plugin-version> </properties> - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${mockito-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-websocket</artifactId> - <version>${jetty-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${jackson-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.dojotoolkit</groupId> - <artifactId>dojo</artifactId> - <version>${dojo-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.sleepycat</groupId> - <artifactId>je</artifactId> - <version>${bdb-version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils-core</artifactId> - <version>${commons-beanutils-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>${commons-digester-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>${commons-cli-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>${commons-collections-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>${commons-configuration-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>${geronimo-jms-1-1-version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>${geronimo-gta-version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - <version>${geronimo-servlet-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <version>${geronimo-j2ee-connector-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_3.0_spec</artifactId> - <version>${geronimo-ejb-version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.framework</groupId> - <artifactId>geronimo-kernel</artifactId> - <version>${geronimo-kernel-version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.bcel</groupId> - <artifactId>bcel</artifactId> - <version>${bcel-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - <version>${velocity-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - <version>${velocity-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.jolbox</groupId> - <artifactId>bonecp</artifactId> - <version>${bonecp-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson-version}</version> - <scope>compile</scope> - </dependency> - - </dependencies> - </dependencyManagement> - <build> <pluginManagement> <plugins> @@ -470,11 +234,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <version>${maven-release-plugin-version}</version> - <configuration> - <useReleaseProfile>false</useReleaseProfile> - <goals>deploy</goals> - <arguments>-Papache-release ${arguments}</arguments> - </configuration> </plugin> <!-- END SNIPPET: release-plugin-configuration --> <plugin> @@ -596,21 +355,6 @@ </build> - <repositories> - <!-- For the BDB JE dependency of the optional bdbstore plugin modules--> - <repository> - <id>oracle.releases</id> - <url>http://download.oracle.com/maven</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <profiles> <profile> <id>dependency-check</id> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
