Author: djencks
Date: Tue Apr 1 00:15:43 2008
New Revision: 643308
URL: http://svn.apache.org/viewvc?rev=643308&view=rev
Log:
update build to use maven-remote-resources-plugin for legal files, specify
plugin versions, and include a release profile.
Added:
activemq/activeio/branches/activeio-3.0/LICENSE (props changed)
- copied unchanged from r642334,
activemq/activeio/branches/activeio-3.0/LICENSE.txt
activemq/activeio/branches/activeio-3.0/NOTICE
- copied, changed from r642334,
activemq/activeio/branches/activeio-3.0/NOTICE.txt
Removed:
activemq/activeio/branches/activeio-3.0/LICENSE.txt
activemq/activeio/branches/activeio-3.0/NOTICE.txt
activemq/activeio/branches/activeio-3.0/activeio-core/LICENSE.txt
activemq/activeio/branches/activeio-3.0/activeio-core/src/main/resources/META-INF/LICENSE.txt
activemq/activeio/branches/activeio-3.0/activeio-core/src/main/resources/META-INF/NOTICE.txt
Modified:
activemq/activeio/branches/activeio-3.0/pom.xml
Propchange: activemq/activeio/branches/activeio-3.0/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/activeio/branches/activeio-3.0/NOTICE (from r642334,
activemq/activeio/branches/activeio-3.0/NOTICE.txt)
URL:
http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/NOTICE?p2=activemq/activeio/branches/activeio-3.0/NOTICE&p1=activemq/activeio/branches/activeio-3.0/NOTICE.txt&r1=642334&r2=643308&rev=643308&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/NOTICE.txt (original)
+++ activemq/activeio/branches/activeio-3.0/NOTICE Tue Apr 1 00:15:43 2008
@@ -1,12 +1,6 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache ActiveMQ distribution. ==
- =========================================================================
+Apache ActiveMQ ActiveIO
+Copyright 2005-2008 Apache Software Foundation
- Apache ActiveMQ
- Copyright 2005-2006 The Apache Software Foundation
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
Modified: activemq/activeio/branches/activeio-3.0/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/pom.xml?rev=643308&r1=643307&r2=643308&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/pom.xml (original)
+++ activemq/activeio/branches/activeio-3.0/pom.xml Tue Apr 1 00:15:43 2008
@@ -45,6 +45,7 @@
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
+ <inceptionYear>2005</inceptionYear>
<licenses>
<license>
@@ -127,61 +128,16 @@
<!--<dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</dist-repo-url>-->
<!--<site-repo-url>scpexe://people.apache.org/www/incubator.apache.org/activemq/activeio-maven/</site-repo-url>-->
+ <!-- OSGi bundles properties -->
+ <activeio.osgi.import.pkg>*</activeio.osgi.import.pkg>
+ <activeio.osgi.export.pkg>org.apache.activeio*</activeio.osgi.export.pkg>
+ <activeio.osgi.private.pkg>!*</activeio.osgi.private.pkg>
+
<activeio.osgi.export>${activeio.osgi.export.pkg}*;version=${activeio.osgi.export.version}</activeio.osgi.export>
+
<activeio.osgi.export.version>${project.version}</activeio.osgi.export.version>
+ <activeio.osgi.import>${activeio.osgi.import.pkg}</activeio.osgi.import>
+
<activeio.osgi.symbolic.name>${groupId}.${artifactId}</activeio.osgi.symbolic.name>
</properties>
-<!--
- <ciManagement>
- <system>continuum</system>
- <url>http://ci.gbuild.org/continuum</url>
- <notifiers>
- <notifier>
- <configuration>
- <address>[EMAIL PROTECTED]</address>
- </configuration>
- </notifier>
- <notifier>
- <type>irc</type>
- <configuration>
- <host>irc.codehaus.org</host>
- <port>6667</port>
- <channel>#activemq</channel>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
--->
-
-<!--
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
--->
-
-<!--
- <pluginRepositories>
- <pluginRepository>
- <id>apache.incubating.releases</id>
- <name>Apache Incubating Release Distribution Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
--->
-
<distributionManagement>
<snapshotRepository>
<id>apache.snapshots</id>
@@ -201,9 +157,148 @@
</scm>
<build>
+ <pluginManagement>
+ <plugins>
+ <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>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </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.3</version>
+ </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>Apache ActiveMQ ActiveIO</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>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <compress>true</compress>
+ <manifestEntries>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+
+ <Package>org.apache.activeio</Package>
+ <Extension-Name>${project.artifactId}</Extension-Name>
+
<Implementation-Version>${project.version}</Implementation-Version>
+
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+
<Bundle-SymbolicName>${activeio.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Export-Package>${activeio.osgi.export}</Export-Package>
+ <Import-Package>${activeio.osgi.import}</Import-Package>
+ <Private-Package>${activeio.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache ActiveIO</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
@@ -217,29 +312,73 @@
<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>
<plugins>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ </links>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
+ <artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <artifactId>maven-pmd-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -249,17 +388,129 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2ee/1.4/docs/api</link>
- <!--<link>http://java.sun.com/j2se/1.5.0/docs/api</link>-->
- </links>
- </configuration>
- </plugin>
</plugins>
</reporting>
+
+ <profiles>
+
+ <profile>
+ <id>release</id>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Prelease</arguments>
+ </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>${deploy.altRepository}</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>
+
+ <!-- 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>
+
+ </profiles>
</project>
