ACTIVEMQ-2297 update to nexus, apache 6 pom, etc

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@786767 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Jencks 2009-06-20 08:14:41 +00:00
parent 1ebc6eeb04
commit 9ed41e25e1
5 changed files with 196 additions and 362 deletions

2
NOTICE
View File

@ -1,4 +1,4 @@
Apache ActiveMQ Copyright 2006-2008 Apache Software Foundation
Apache ActiveMQ Copyright 2005-2009 Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).

View File

@ -109,7 +109,13 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>nlog4j</artifactId>
<artifactId>slf4j-api</artifactId>
<version>${nlog4j-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${nlog4j-version}</version>
<scope>test</scope>
</dependency>

View File

@ -323,22 +323,22 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
<executions>
<execution>
<id>verify-legal-files</id>
<phase>verify</phase>
<goals>
<goal>verify-legal-files</goal>
</goals>
<configuration>
<strict>false</strict>
</configuration>
</execution>
</executions>
</plugin>
<!--<plugin>-->
<!--<groupId>org.apache.geronimo.genesis.plugins</groupId>-->
<!--<artifactId>tools-maven-plugin</artifactId>-->
<!--<executions>-->
<!--<execution>-->
<!--<id>verify-legal-files</id>-->
<!--<phase>verify</phase>-->
<!--<goals>-->
<!--<goal>verify-legal-files</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<strict>false</strict>-->
<!--</configuration>-->
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@ -397,30 +397,30 @@
<!--<appendAssemblyId>false</appendAssemblyId>-->
</configuration>
</execution>
<execution>
<id>unix-src</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/unix-src.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>windows-src</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/windows-src.xml</descriptor>
</descriptors>
</configuration>
</execution>
<!--<execution>-->
<!--<id>unix-src</id>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>attached</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<descriptors>-->
<!--<descriptor>src/main/descriptors/unix-src.xml</descriptor> -->
<!--</descriptors>-->
<!--</configuration>-->
<!--</execution>-->
<!--<execution>-->
<!--<id>windows-src</id>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>attached</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<descriptors>-->
<!--<descriptor>src/main/descriptors/windows-src.xml</descriptor> -->
<!--</descriptors>-->
<!--</configuration>-->
<!--</execution>-->
</executions>
</plugin>
<!-- plugin>
@ -435,43 +435,43 @@
</plugins>
</build>
<profiles>
<profile>
<id>assembly-src</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>unix-src</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/unix-src.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>windows-src</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/windows-src.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!--<profile>-->
<!--<id>assembly-src</id>-->
<!--<build>-->
<!--<plugins>-->
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-assembly-plugin</artifactId>-->
<!--<executions>-->
<!--<execution>-->
<!--<id>unix-src</id>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>attached</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<descriptors>-->
<!--<descriptor>src/main/descriptors/unix-src.xml</descriptor>-->
<!--</descriptors>-->
<!--</configuration>-->
<!--</execution>-->
<!--<execution>-->
<!--<id>windows-src</id>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>attached</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<descriptors>-->
<!--<descriptor>src/main/descriptors/windows-src.xml</descriptor>-->
<!--</descriptors>-->
<!--</configuration>-->
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->
<!--</plugins>-->
<!--</build>-->
<!--</profile>-->
</profiles>
</project>

View File

@ -16,7 +16,7 @@
limitations under the License.
-->
<component>
<id>common-bin</id>
<!--<id>common-bin</id>-->
<fileSets>
<!-- Copy over files that should not get the line endings converted -->

392
pom.xml
View File

@ -19,7 +19,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>4</version>
<version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -28,6 +28,7 @@
<version>5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ActiveMQ</name>
<inceptionYear>2005</inceptionYear>
<properties>
<activemq-version>5.3-SNAPSHOT</activemq-version>
@ -65,9 +66,8 @@
<junit-version>4.4</junit-version>
<jxta-version>2.0</jxta-version>
<log4j-version>1.2.14</log4j-version>
<nlog4j-version>1.2.25</nlog4j-version>
<nlog4j-version>1.5.2</nlog4j-version>
<org-apache-derby-version>10.1.3.1</org-apache-derby-version>
<org-apache-maven-surefire-plugin-version>2.3</org-apache-maven-surefire-plugin-version>
<p2psockets-version>1.1.2</p2psockets-version>
<regexp-version>1.3</regexp-version>
<rome-version>0.8</rome-version>
@ -79,8 +79,6 @@
<xstream-version>1.3.1</xstream-version>
<xbean-version>3.4</xbean-version>
<felix-version>1.0.0</felix-version>
<dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</dist-repo-url>
<m1-dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
<site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
<!-- OSGi bundles properties -->
<activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
@ -92,7 +90,7 @@
<activemq.osgi.symbolic.name>${groupId}.${artifactId}</activemq.osgi.symbolic.name>
</properties>
<prerequisites>
<maven>2.0.8</maven>
<maven>2.0.10</maven>
</prerequisites>
<url>http://activemq.apache.org</url>
@ -157,20 +155,10 @@
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<dependencyManagement>
<dependencies>
<!-- =============================== -->
<!-- ActiveMQ Dependencies -->
<!-- Internal ActiveMQ Dependencies -->
<!-- =============================== -->
<dependency>
<groupId>org.apache.activemq</groupId>
@ -236,11 +224,6 @@
<version>${activemq-version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-gbean-management</artifactId>
<version>${activemq-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
@ -412,7 +395,7 @@
<version>${camel-version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.hadoop.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@ -510,7 +493,7 @@
<artifactId>spring-aop</artifactId>
<version>${spring-version}</version>
<optional>true</optional>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
@ -534,13 +517,13 @@
<artifactId>spring-jms</artifactId>
<version>${spring-version}</version>
<optional>true</optional>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring-version}</version>
<optional>true</optional>
</dependency>
</dependency>
<!--
<dependency>
<groupId>org.springframework</groupId>
@ -921,88 +904,41 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.4</version>
<version>2.2-beta-4</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.0-alpha-4</version>
<executions>
<execution>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<index>true</index>
<compress>true</compress>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<goals>
<goal>process</goal>
</goals>
<configuration>
<properties>
<projectName>${projectName}</projectName>
</properties>
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-stage-plugin</artifactId>
<version>1.0-alpha-1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<allowTimestampedSnapshots>false</allowTimestampedSnapshots>
<preparationGoals>clean install</preparationGoals>
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${org-apache-maven-surefire-plugin-version}</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<forkMode>once</forkMode>
<argLine>-enableassertions</argLine>
<failIfNoTests>false</failIfNoTests>
<workingDirectory>${project.build.directory}</workingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@ -1010,9 +946,9 @@
<version>${felix-version}</version>
</plugin>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
<version>1.4</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@ -1049,14 +985,50 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<archive>
<index>true</index>
<compress>true</compress>
</archive>
<source>1.5</source>
<target>1.5</target>
<optimize>true</optimize>
<debug>true</debug>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</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>[2.0.10,)</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>verify-legal-files</goal>
</goals>
<configuration>
<strict>true</strict>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@ -1074,66 +1046,6 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/eclipse-classes</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
<executions>
<execution>
<id>verify-legal-files</id>
<phase>verify</phase>
<goals>
<goal>verify-legal-files</goal>
</goals>
<configuration>
<!-- Fail the build if no legal files were found -->
<strict>true</strict>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-stage-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
</plugin>
</plugins>
</build>
<reporting>
@ -1209,11 +1121,44 @@
<profiles>
<profile>
<id>release</id>
<id>apache-release</id>
<activation>
<property>
<name>apache-release</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<descriptorRefs>
<descriptorRef>
source-release
</descriptorRef>
</descriptorRefs>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<!-- apache version not yet released -->
<!--<groupId>org.apache</groupId>-->
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<!-- apache version not yet known -->
<version>2.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@ -1221,123 +1166,6 @@
<test>false</test>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
<arguments>-Prelease</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
<!-- We want a source jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
</configuration>
<executions>
<execution>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- We want to deploy the artifact to a staging location for perusal -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<altDeploymentRepository>${staging.altRepository}/${siteId}</altDeploymentRepository>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
<!-- We want the JavaDoc JAR published with the release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<source>1.5</source>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>full</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<test>false</test>
</configuration>
</plugin>
<!-- We want a source jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- We want the JavaDoc JAR published with the release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<source>1.5</source>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>