JDKIM-32 Upgraded to apache mailet 2.5.0
git-svn-id: https://svn.apache.org/repos/asf/james/jdkim/trunk@1426171 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f83e8cf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.idea
+target
+*.iml
diff --git a/assemble/pom.xml b/assemble/pom.xml
index eacb4ae..a6d4742 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -17,10 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -33,7 +31,7 @@
<artifactId>apache-jdkim</artifactId>
<packaging>pom</packaging>
- <name>Apache JAMES jDKIM Assembly</name>
+ <name>Apache James :: jDKIM :: Assembly</name>
<description>A Java implementation for the DKIM specification.</description>
<dependencies>
@@ -103,7 +101,7 @@
<generateReports>false</generateReports>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
</build>
</profile>
diff --git a/mailets/pom.xml b/mailets/pom.xml
index c70bfd1..7481030 100644
--- a/mailets/pom.xml
+++ b/mailets/pom.xml
@@ -17,10 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,23 +28,18 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.james.jdkim</groupId>
<artifactId>apache-jdkim-mailets</artifactId>
+ <packaging>bundle</packaging>
- <name>jDKIM Mailets for Apache James</name>
+ <name>Apache James :: jDKIM :: Mailets</name>
<description>Mailets integrating DKIM functions</description>
<url>http://james.apache.org/jdkim/mailets/</url>
- <distributionManagement>
- <site>
- <id>jdkim-website-mailets</id>
- <url>scpexe://people.apache.org/www/james.apache.org/jdkim/mailets/</url>
- </site>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james.jdkim</groupId>
@@ -117,7 +110,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
</dependency>
</dependencies>
</project>
diff --git a/main/pom.xml b/main/pom.xml
index eea4d5b..a748c27 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -18,9 +18,9 @@
under the License.
-->
<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -31,20 +31,13 @@
</parent>
<artifactId>apache-jdkim-library</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
- <name>Apache JAMES jDKIM</name>
+ <name>Apache James :: jDKIM</name>
<description>A Java implementation for the DKIM specification.</description>
<url>http://james.apache.org/jdkim/main/</url>
<inceptionYear>2008</inceptionYear>
- <distributionManagement>
- <site>
- <id>jdkim-website-main</id>
- <url>scpexe://people.apache.org/www/james.apache.org/jdkim/main/</url>
- </site>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -74,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -98,31 +91,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Specification-Title>Apache jdkim</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Implementation-Title>Apache jdkim</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${project.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<inherited>true</inherited>
@@ -170,79 +138,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.jdkim.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <executions>
- <execution>
- <id>site</id>
- <phase>site</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doapOptions>
- <programmingLanguage>java</programmingLanguage>
- <category>mail</category>
- <downloadPage>http://james.apache.org/download.cgi</downloadPage>
- </doapOptions>
- <asfExtOptions>
- <included>true</included>
- <pmc>http://james.apache.org</pmc>
- <name>Apache JAMES</name>
- <standards>
- <standard>
- <id>DKIM</id>
- <title>DomainKeys Identified Mail (DKIM) Signatures</title>
- <body>IEFT</body>
- <url>http://www.ietf.org/rfc/rfc4871.txt</url>
- </standard>
- <standard>
- <id>DKIM</id>
- <title>DomainKeys Identified Mail (DKIM) Signatures - - Update</title>
- <body>IEFT</body>
- <url>http://www.ietf.org/rfc/rfc5672.txt</url>
- </standard>
- </standards>
- </asfExtOptions>
- </configuration>
- </plugin>
- -->
<!-- Shading commons-codec Base64 class so that we don't have one more dependency -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -280,7 +175,8 @@
</relocation>
</relocations>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
</transformers>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index 25f74f0..9fbe676 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,17 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.8</version>
- <relativePath></relativePath>
+ <version>1.8.1</version>
+ <relativePath/>
</parent>
<groupId>org.apache.james.jdkim</groupId>
@@ -35,7 +33,7 @@
<version>0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache James DomainKey Project (jDKIM)</name>
+ <name>Apache James :: jDKIM :: DomainKey Project</name>
<description>DomainKeys Identified Mail (DKIM) Signatures</description>
<url>http://james.apache.org/jdkim/</url>
<inceptionYear>2009</inceptionYear>
@@ -63,33 +61,46 @@
</site>
</distributionManagement>
+ <properties>
+ <junit.version>4.10</junit.version>
+ <geronimo-activation.version>1.0.2</geronimo-activation.version>
+ <geronimo-javamail.version>1.8.3</geronimo-javamail.version>
+ <commons-codec.version>1.5</commons-codec.version>
+ <commons-logging.version>1.1.1</commons-logging.version>
+ <apache-mailet.version>2.5.0-SNAPSHOT</apache-mailet.version>
+ <dnsjava.version>2.1.1</dnsjava.version>
+ <not-yet-commons-ssl.version>0.3.11</not-yet-commons-ssl.version>
+ <apache-mime4j.version>0.7.1</apache-mime4j.version>
+ <log4j.version>1.2.16</log4j.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.2</version>
+ <version>${geronimo-activation.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.3</version>
+ <version>${geronimo-javamail.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
@@ -112,7 +123,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
- <version>1.1</version>
+ <version>${apache-mailet.version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -127,7 +138,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
- <version>1.1</version>
+ <version>${apache-mailet.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
<exclusions>
@@ -144,7 +155,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
- <version>1.1</version>
+ <version>${apache-mailet.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
@@ -160,8 +171,8 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- <version>2.4</version>
+ <artifactId>apache-mailet-api</artifactId>
+ <version>${apache-mailet.version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -177,86 +188,56 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
- <version>1.2.16</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.1.1</version>
+ <version>${dnsjava.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james.jdkim</groupId>
<artifactId>apache-jdkim-library</artifactId>
- <version>0.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james.jdkim</groupId>
<artifactId>apache-jdkim-library</artifactId>
- <version>0.3-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james.jdkim</groupId>
<artifactId>apache-jdkim-mailets</artifactId>
- <version>0.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.juliusdavies</groupId>
<artifactId>not-yet-commons-ssl</artifactId>
- <version>0.3.11</version>
+ <version>${not-yet-commons-ssl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
- <version>0.7.1</version>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
- <version>0.7.1</version>
+ <version>${apache-mime4j.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <configuration>
- <doapOptions>
- <programmingLanguage>java</programmingLanguage>
- <downloadPage>http://james.apache.org/download.cgi</downloadPage>
- </doapOptions>
- <asfExtOptions>
- <included>true</included>
- <name>Apache JAMES</name>
- <pmc>http://james.apache.org</pmc>
- <chair>Norman Maurer</chair>
- <charter>Apache JAMES is dedicated to email related code in Java</charter>
- <standards>
- <standard>
- <title>DomainKeys Identified Mail (DKIM) Signatures</title>
- <url>http://www.ietf.org/rfc/rfc4871.txt</url>
- <id>RFC 4871</id>
- <body>IETF</body>
- </standard>
- </standards>
- </asfExtOptions>
- </configuration>
- <executions>
- <execution>
- <id>site</id>
- <phase>site</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.3.7</version>
+ </plugin>
</plugins>
</build>
</project>
