This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new a6caf10 Upgrade JavaMail (now Jakarta Mail) to version 1.6.4 new 9259802 Merge pull request #3133 from PascalSchumacher/java_mail_1_6_4 a6caf10 is described below commit a6caf108839543ba892eab3277736097a6878736 Author: Pascal Schumacher <pascalschumac...@gmx.net> AuthorDate: Thu Aug 29 07:26:19 2019 +0200 Upgrade JavaMail (now Jakarta Mail) to version 1.6.4 --- components/camel-aws-ses/pom.xml | 4 +-- components/camel-google-mail/pom.xml | 8 ++--- components/camel-mail/pom.xml | 12 +++---- parent/pom.xml | 2 +- .../karaf/features/src/main/resources/features.xml | 40 +++++++++++----------- tests/test-bundles/mock-javamail_1.7/pom.xml | 4 +-- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/components/camel-aws-ses/pom.xml b/components/camel-aws-ses/pom.xml index ad17e8c..a4142b1 100644 --- a/components/camel-aws-ses/pom.xml +++ b/components/camel-aws-ses/pom.xml @@ -48,8 +48,8 @@ </dependency> <dependency> <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - <version>${javax-mail-version}</version> + <artifactId>jakarta.mail</artifactId> + <version>${jakarta-mail-version}</version> </dependency> <!-- for testing --> diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml index 15b6653..c0312b0 100644 --- a/components/camel-google-mail/pom.xml +++ b/components/camel-google-mail/pom.xml @@ -75,13 +75,13 @@ <dependency> <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - <version>${javax-mail-version}</version> + <artifactId>jakarta.mail</artifactId> + <version>${jakarta-mail-version}</version> <exclusions> <!-- javax activation is part of the JDK now --> <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> </exclusion> </exclusions> </dependency> diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index ac4353c..5b62831 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -49,13 +49,13 @@ </dependency> <dependency> <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - <version>${javax-mail-version}</version> + <artifactId>jakarta.mail</artifactId> + <version>${jakarta-mail-version}</version> <exclusions> <!-- javax activation is part of the JDK now --> <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> </exclusion> </exclusions> </dependency> @@ -142,12 +142,12 @@ <configuration> <artifactSet> <includes> - <include>com.sun.mail:javax.mail</include> + <include>com.sun.mail:jakarta.mail</include> </includes> </artifactSet> <filters> <filter> - <artifact>com.sun.mail:javax.mail</artifact> + <artifact>com.sun.mail:jakarta.mail</artifact> <includes> <include>META-INF/javamail.default.address.map</include> <include>META-INF/javamail.default.providers</include> diff --git a/parent/pom.xml b/parent/pom.xml index cd2013f..33b0308 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -319,7 +319,7 @@ <javax-activation-version>1.2.0</javax-activation-version> <javax-annotation-api-version>1.3.2</javax-annotation-api-version> <javax-inject-bundle-version>1_2</javax-inject-bundle-version> - <javax-mail-version>1.6.1</javax-mail-version> + <jakarta-mail-version>1.6.4</jakarta-mail-version> <javax-servlet-api-version>3.1.0</javax-servlet-api-version> <jaxb-bundle-version>2.3.1_1</jaxb-bundle-version> <jakarta-api-version>2.1.5</jakarta-api-version> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 8c0e9d1..3a8d123 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -210,7 +210,7 @@ </feature> <feature name='camel-atom' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:org.apache.abdera/abdera-core/${abdera-version}</bundle> <bundle dependency='true'>mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}</bundle> <bundle dependency='true'>mvn:org.apache.abdera/abdera-i18n/${abdera-version}</bundle> @@ -269,7 +269,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -284,7 +284,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -299,7 +299,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -314,7 +314,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -329,7 +329,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -344,7 +344,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -359,7 +359,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -374,7 +374,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -389,7 +389,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -404,7 +404,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -419,7 +419,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -434,7 +434,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -449,7 +449,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -464,7 +464,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -479,7 +479,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -494,7 +494,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -509,7 +509,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -1104,7 +1104,7 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-gmail/${google-api-services-mail-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-api-client-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-api-client-version}</bundle> @@ -1720,7 +1720,7 @@ </feature> <feature name='camel-mail' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle> + <bundle dependency='true'>mvn:com.sun.mail/jakarta.mail/${jakarta-mail-version}</bundle> <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-mail/${project.version}</bundle> </feature> diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml index 99bba85..0bf5aa0 100644 --- a/tests/test-bundles/mock-javamail_1.7/pom.xml +++ b/tests/test-bundles/mock-javamail_1.7/pom.xml @@ -70,8 +70,8 @@ </dependency> <dependency> <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - <version>${javax-mail-version}</version> + <artifactId>jakarta.mail</artifactId> + <version>${jakarta-mail-version}</version> </dependency> </dependencies>