Author: veithen
Date: Tue Jan 3 21:13:23 2017
New Revision: 1777222
URL: http://svn.apache.org/viewvc?rev=1777222&view=rev
Log:
Use the latest javax.mail version from Oracle (which is now an OSGi bundle) and
use it instead of the Geronimo implementation.
Added:
axis/axis2/java/core/trunk/legal/javax.mail-LICENSE.txt
- copied unchanged from r1777221,
axis/axis2/java/core/trunk/legal/mail-LICENSE.txt
Removed:
axis/axis2/java/core/trunk/legal/mail-LICENSE.txt
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
axis/axis2/java/core/trunk/modules/adb/pom.xml
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
axis/axis2/java/core/trunk/modules/transport/mail/pom.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml Tue Jan
3 21:13:23 2017
@@ -68,8 +68,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Tue Jan 3 21:13:23
2017
@@ -65,8 +65,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: axis/axis2/java/core/trunk/modules/adb/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb/pom.xml Tue Jan 3 21:13:23 2017
@@ -64,8 +64,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Tue Jan 3 21:13:23
2017
@@ -245,21 +245,6 @@
</exclusions>
</dependency>
- <!-- Axis2 has always been shipped with Sun's implementations of
- JavaMail and JAF, although Axiom depends on (and has been tested
- with) Geronimo's implementations. This should probably
reevaluated. -->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.mail.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Jalopy is used by the PrettyPrinter class in the kernel,
but it is invoked using reflection (and only if it is
found on the classpath). Therefore it is not automatically
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Tue Jan 3 21:13:23 2017
@@ -174,7 +174,6 @@
<include>*:*:jar</include>
</includes>
<excludes>
-
<exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar</exclude>
<exclude>org.springframework:spring-beans:jar</exclude>
<exclude>org.springframework:spring-context:jar</exclude>
<exclude>org.springframework:spring-core:jar</exclude>
Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Tue Jan 3 21:13:23 2017
@@ -54,8 +54,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Tue Jan 3 21:13:23 2017
@@ -101,8 +101,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml Tue Jan 3 21:13:23
2017
@@ -51,8 +51,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java
(original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java
Tue Jan 3 21:13:23 2017
@@ -62,7 +62,7 @@ public class OSGiTest {
url("link:classpath:org.apache.servicemix.bundles.wsdl4j.link"),
url("link:classpath:org.apache.geronimo.specs.geronimo-jms_1.1_spec.link"), //
TODO: why the heck is this required???
url("link:classpath:org.apache.geronimo.specs.geronimo-ws-metadata_2.0_spec.link"),
-
url("link:classpath:org.apache.geronimo.specs.geronimo-javamail_1.4_spec.link"),
// TODO: should no longer be necessary
+ url("link:classpath:com.sun.mail.javax.mail.link"), // TODO:
should no longer be necessary
url("link:classpath:org.apache.geronimo.specs.geronimo-servlet_2.5_spec.link"),
url("link:classpath:org.apache.geronimo.specs.geronimo-jaxrs_1.1_spec.link"),
// TODO: shouldn't this be optional???
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Tue Jan 3
21:13:23 2017
@@ -80,8 +80,8 @@
<artifactId>xmlschema-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
Tue Jan 3 21:13:23 2017
@@ -186,7 +186,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<!-- Embed all dependencies, except those which are
provided by the Eclipse runtime -->
-
<Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|woodstox-core-asl|geronimo-javamail_1.4_spec|ant*</Embed-Dependency>
+
<Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|woodstox-core-asl|ant*</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>true</Embed-Transitive>
<!-- Exclude imports that are actually not used -->
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
Tue Jan 3 21:13:23 2017
@@ -163,7 +163,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<!-- Embed all dependencies, except those which are
provided by the Eclipse runtime -->
-
<Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|woodstox-core-asl|geronimo-javamail_1.4_spec|ant*</Embed-Dependency>
+
<Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|woodstox-core-asl|ant*</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>true</Embed-Transitive>
<!-- Exclude imports that are actually not used -->
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml Tue Jan
3 21:13:23 2017
@@ -85,8 +85,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
Modified: axis/axis2/java/core/trunk/modules/transport/mail/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/mail/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/mail/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/mail/pom.xml Tue Jan 3
21:13:23 2017
@@ -109,49 +109,26 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-base</artifactId>
<version>${project.version}</version>
- <exclusions>
- <!-- We want to choose the JavaMail implementation ourselves -->
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
-
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-testkit</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- <exclusions>
- <!-- We want to choose the JavaMail implementation ourselves -->
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
<version>1.3</version>
<scope>test</scope>
- <exclusions>
- <!-- We want to choose the JavaMail implementation ourselves -->
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Tue Jan 3 21:13:23 2017
@@ -154,15 +154,6 @@
<version>${project.version}</version>
<type>mar</type>
</dependency>
-
- <!-- Axis2 has always been shipped with Sun's implementations of
- JavaMail and JAF, although Axiom depends on (and has been tested
- with) Geronimo's implementations. This should probably
reevaluated. -->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.mail.version}</version>
- </dependency>
</dependencies>
<build>
<finalName>axis2-${project.version}</finalName>
@@ -276,7 +267,6 @@
<webXml>conf/web.xml</webXml>
<!-- This is basically the same list as in
modules/distribution/src/main/assembly/bin-assembly.xml -->
<packagingExcludes>
- WEB-INF/lib/geronimo-javamail_1.4_spec-*.jar,
WEB-INF/lib/spring-beans-*.jar,
WEB-INF/lib/spring-context-*.jar,
WEB-INF/lib/spring-core-*.jar,
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1777222&r1=1777221&r2=1777222&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Tue Jan 3 21:13:23 2017
@@ -516,7 +516,6 @@
<commons.logging.version>1.1.1</commons.logging.version>
<fi.version>1.2.7</fi.version>
<geronimo.spec.annotation.version>1.1</geronimo.spec.annotation.version>
- <geronimo.spec.javamail.version>1.6</geronimo.spec.javamail.version>
<geronimo.spec.metadata.version>1.1.2</geronimo.spec.metadata.version>
<geronimo.spec.jaxws.version>1.0</geronimo.spec.jaxws.version>
<google.gson.version>2.1</google.gson.version>
@@ -546,7 +545,6 @@
<xml_resolver.version>1.2</xml_resolver.version>
<xmlunit.version>1.3</xmlunit.version>
<commons.lang.version>2.3</commons.lang.version>
- <javax.mail.version>1.4</javax.mail.version>
<commons.cli.version>1.2</commons.cli.version>
<!-- The build failing if tests are skipped is very annoying -->
<failIfNoTests>false</failIfNoTests>
@@ -788,9 +786,15 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>${geronimo.spec.javamail.version}</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
