Author: bago Date: Wed Feb 22 12:38:56 2012 New Revision: 1292257 URL: http://svn.apache.org/viewvc?rev=1292257&view=rev Log: move to geronimo / remove oracle dependencies and licensing stuff (JSIEVE-89) Clean up build configuration, assembly, notice/license attachment, ant build (JSIEVE-90)
Modified: james/jsieve/trunk/NOTICE.txt james/jsieve/trunk/RELEASE_NOTES.txt james/jsieve/trunk/all/src/assemble/bin.xml james/jsieve/trunk/core/pom.xml james/jsieve/trunk/mailet/pom.xml james/jsieve/trunk/manager/mailet/pom.xml james/jsieve/trunk/pom.xml james/jsieve/trunk/util/pom.xml Modified: james/jsieve/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/james/jsieve/trunk/NOTICE.txt?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/NOTICE.txt (original) +++ james/jsieve/trunk/NOTICE.txt Wed Feb 22 12:38:56 2012 @@ -1,5 +1,5 @@ Apache James JSieve Library -Copyright 2009 The Apache Software Foundation +Copyright 2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: james/jsieve/trunk/RELEASE_NOTES.txt URL: http://svn.apache.org/viewvc/james/jsieve/trunk/RELEASE_NOTES.txt?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/RELEASE_NOTES.txt (original) +++ james/jsieve/trunk/RELEASE_NOTES.txt Wed Feb 22 12:38:56 2012 @@ -45,6 +45,8 @@ Task [JSIEVE-61] - Split Parent And Aggregation Poms [JSIEVE-62] - Review TODOs [JSIEVE-64] - Improve and Standardise Build + [JSIEVE-89] - move to geronimo / remove oracle dependencies and licensing stuff + [JSIEVE-90] - Clean up build configuration, assembly, notice/license attachment, ant build Version 0.4 ----------- Modified: james/jsieve/trunk/all/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/all/src/assemble/bin.xml?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/all/src/assemble/bin.xml (original) +++ james/jsieve/trunk/all/src/assemble/bin.xml Wed Feb 22 12:38:56 2012 @@ -18,10 +18,6 @@ limitations under the License. --> <id>bin</id> - <!-- - Generates a jar file including the binary jar and the runtime dependencies. - including NOTICE and LICENSE in the root. - --> <formats> <format>zip</format> <format>tar.gz</format> @@ -36,107 +32,25 @@ <include>RELEASE_NOTES.txt</include> </includes> </fileSet> - <fileSet> - <directory>${project.basedir}/../core/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../mailet/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../util/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../manager/api/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../manager/core/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../manager/jsieve/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../manager/mailet/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../manager/mock/target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>apache-jsieve*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../target/site/apidocs</directory> - <outputDirectory>/apidocs</outputDirectory> - </fileSet> + <fileSet> + <directory>${project.basedir}/../target/site/apidocs</directory> + <outputDirectory>/apidocs</outputDirectory> + </fileSet> </fileSets> - <files> - <file> - <source>${project.basedir}/../LICENSE.mail</source> - <outputDirectory>lib</outputDirectory> - <destName>mail.LICENSE</destName> - </file> - <file> - <source>${project.basedir}/../LICENSE.activation</source> - <outputDirectory>lib</outputDirectory> - <destName>activation.LICENSE</destName> - </file> - <file> - <source>${project.basedir}/../LICENSE.txt</source> - <outputDirectory>lib</outputDirectory> - <destName>apache-mailet.LICENSE</destName> - </file> - <file> - <source>${project.basedir}/../LICENSE.txt</source> - <outputDirectory>lib</outputDirectory> - <destName>apache-mailet-base.LICENSE</destName> - </file> - <file> - <source>${project.basedir}/../LICENSE.txt</source> - <outputDirectory>lib</outputDirectory> - <destName>apache-mime4j.LICENSE</destName> - </file> - <file> - <source>${project.basedir}/../LICENSE.txt</source> - <outputDirectory>lib</outputDirectory> - <destName>commons-logging.LICENSE</destName> - </file> - </files> <dependencySets> <dependencySet> <outputDirectory>/lib/</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> <scope>runtime</scope> <excludes> - <exclude>apache-jsieve*</exclude> + <exclude>org.apache.james:apache-jsieve*</exclude> </excludes> </dependencySet> + <dependencySet> + <outputDirectory>/</outputDirectory> + <scope>runtime</scope> + <includes> + <include>org.apache.james:apache-jsieve*</include> + </includes> + </dependencySet> </dependencySets> </assembly> Modified: james/jsieve/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/core/pom.xml?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/core/pom.xml (original) +++ james/jsieve/trunk/core/pom.xml Wed Feb 22 12:38:56 2012 @@ -64,14 +64,14 @@ </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> + <groupId>${javax.mail.groupId}</groupId> + <artifactId>${javax.mail.artifactId}</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> <scope>test</scope> </dependency> </dependencies> @@ -121,6 +121,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> + <version>1.7</version> <executions> <execution> <id>add-source</id> Modified: james/jsieve/trunk/mailet/pom.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/pom.xml?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/mailet/pom.xml (original) +++ james/jsieve/trunk/mailet/pom.xml Wed Feb 22 12:38:56 2012 @@ -89,13 +89,13 @@ </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> + <groupId>${javax.mail.groupId}</groupId> + <artifactId>${javax.mail.artifactId}</artifactId> </dependency> <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> </dependency> <dependency> Modified: james/jsieve/trunk/manager/mailet/pom.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mailet/pom.xml?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/manager/mailet/pom.xml (original) +++ james/jsieve/trunk/manager/mailet/pom.xml Wed Feb 22 12:38:56 2012 @@ -41,14 +41,20 @@ <groupId>${project.groupId}</groupId> <artifactId>apache-mailet</artifactId> <version>${mailet.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> <version>${mailet-base.version}</version> - <scope>provided</scope> </dependency> + <dependency> + <groupId>${javax.mail.groupId}</groupId> + <artifactId>${javax.mail.artifactId}</artifactId> + </dependency> + <dependency> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-jsieve-manager-mock</artifactId> Modified: james/jsieve/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/pom.xml (original) +++ james/jsieve/trunk/pom.xml Wed Feb 22 12:38:56 2012 @@ -88,6 +88,17 @@ <james.www.id>jsieve-website</james.www.id> <target.jdk>1.5</target.jdk> <mime4j.version>0.7.2</mime4j.version> + + <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId> + <javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId> + <javax.activation.groupId>org.apache.geronimo.specs</javax.activation.groupId> + <javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId> + <!-- + <javax.activation.groupId>javax.activation</javax.activation.groupId> + <javax.activation.artifactId>activation</javax.activation.artifactId> + <javax.mail.groupId>javax.mail</javax.mail.groupId> + <javax.mail.artifactId>mail</javax.mail.artifactId> + --> </properties> <dependencyManagement> @@ -141,11 +152,27 @@ <groupId>org.apache.james</groupId> <artifactId>apache-mailet</artifactId> <version>2.4</version> + <exclusions> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> <version>1.0</version> + <exclusions> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.james</groupId> @@ -208,6 +235,16 @@ <artifactId>activation</artifactId> <version>1.1</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.javamail</groupId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> + <version>1.8.3</version> + </dependency> </dependencies> </dependencyManagement> Modified: james/jsieve/trunk/util/pom.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/util/pom.xml?rev=1292257&r1=1292256&r2=1292257&view=diff ============================================================================== --- james/jsieve/trunk/util/pom.xml (original) +++ james/jsieve/trunk/util/pom.xml Wed Feb 22 12:38:56 2012 @@ -69,13 +69,13 @@ </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> + <groupId>${javax.mail.groupId}</groupId> + <artifactId>${javax.mail.artifactId}</artifactId> </dependency> <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org