This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 30b7cd2e4e810a31158d868ca49f2c7516f18dc1 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Fri Feb 14 10:48:37 2020 +0100 [CAMEL-14444] Build speed: Use dependency extract instead of shade plugin to grab javamail providers --- components/camel-mail/pom.xml | 49 +++++++++++----------- .../META-INF/javamail.default.address.map | 1 + .../resources/META-INF/javamail.default.providers | 9 ++++ 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 634f766..42f4040 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -123,42 +123,41 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- required to make MailMimeDecodeHeadersTest work on operating systems with a different default encoding --> - <argLine>-Dfile.encoding=UTF-8</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.1.1</version> <executions> <execution> - <phase>package</phase> + <id>unpack</id> + <phase>generate-resources</phase> <goals> - <goal>shade</goal> + <goal>unpack</goal> </goals> <configuration> - <artifactSet> - <includes> - <include>com.sun.mail:jakarta.mail</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>com.sun.mail:jakarta.mail</artifact> + <artifactItems> + <artifactItem> + <groupId>com.sun.mail</groupId> + <artifactId>jakarta.mail</artifactId> + <version>${jakarta-mail-version}</version> + <type>jar</type> + <outputDirectory>${project.basedir}/src/generated/resources</outputDirectory> <includes> - <include>META-INF/javamail.default.address.map</include> - <include>META-INF/javamail.default.providers</include> + META-INF/javamail.default.address.map, + META-INF/javamail.default.providers </includes> - </filter> - </filters> - <minimizeJar>true</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> + </artifactItem> + </artifactItems> </configuration> </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <!-- required to make MailMimeDecodeHeadersTest work on operating systems with a different default encoding --> + <argLine>-Dfile.encoding=UTF-8</argLine> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/components/camel-mail/src/generated/resources/META-INF/javamail.default.address.map b/components/camel-mail/src/generated/resources/META-INF/javamail.default.address.map new file mode 100644 index 0000000..4ab5572 --- /dev/null +++ b/components/camel-mail/src/generated/resources/META-INF/javamail.default.address.map @@ -0,0 +1 @@ +rfc822=smtp diff --git a/components/camel-mail/src/generated/resources/META-INF/javamail.default.providers b/components/camel-mail/src/generated/resources/META-INF/javamail.default.providers new file mode 100644 index 0000000..e8461a7 --- /dev/null +++ b/components/camel-mail/src/generated/resources/META-INF/javamail.default.providers @@ -0,0 +1,9 @@ +# Jakarta Mail IMAP provider Oracle +protocol=imap; type=store; class=com.sun.mail.imap.IMAPStore; vendor=Oracle; +protocol=imaps; type=store; class=com.sun.mail.imap.IMAPSSLStore; vendor=Oracle; +# Jakarta Mail SMTP provider Oracle +protocol=smtp; type=transport; class=com.sun.mail.smtp.SMTPTransport; vendor=Oracle; +protocol=smtps; type=transport; class=com.sun.mail.smtp.SMTPSSLTransport; vendor=Oracle; +# Jakarta Mail POP3 provider Oracle +protocol=pop3; type=store; class=com.sun.mail.pop3.POP3Store; vendor=Oracle; +protocol=pop3s; type=store; class=com.sun.mail.pop3.POP3SSLStore; vendor=Oracle;