move to geronimo / remove oracle dependencies and licensing stuff (JSIEVE-89)
Clean up build configuration, assembly, notice/license attachment, ant build (JSIEVE-90)
git-svn-id: https://svn.apache.org/repos/asf/james/jsieve/trunk@1292257 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
index 02c1448..a90b5c2 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -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/).
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 3b4893d..d7b014d 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -45,6 +45,8 @@
[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
-----------
diff --git a/all/src/assemble/bin.xml b/all/src/assemble/bin.xml
index 635b421..b38c93f 100644
--- a/all/src/assemble/bin.xml
+++ b/all/src/assemble/bin.xml
@@ -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>
diff --git a/core/pom.xml b/core/pom.xml
index 07c01ad..e86cc13 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 40fbe35..c594761 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -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>
diff --git a/manager/mailet/pom.xml b/manager/mailet/pom.xml
index eed8295..8e44440 100644
--- a/manager/mailet/pom.xml
+++ b/manager/mailet/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index a1787bf..285e746 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/util/pom.xml b/util/pom.xml
index f8bb1de..fed9942 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -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>
