This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-jsieve.git
commit f755440fd428d4d8cb3934d47d6ba658c615b9c9 Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Fri Sep 6 15:30:42 2019 +0700 JSIEVE-111 Remove geronimo for javax.mail and javax.activation --- core/pom.xml | 8 ++++---- pom.xml | 17 ----------------- util/pom.xml | 8 ++++---- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 8dad0fa..c3952cf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -69,14 +69,14 @@ </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>${javax.activation.groupId}</groupId> - <artifactId>${javax.activation.artifactId}</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 0290d5b..40c633f 100644 --- a/pom.xml +++ b/pom.xml @@ -73,11 +73,6 @@ <!-- Overridding this value allows single set of loopback settings to be maintained --> <james.www.id>jsieve-website</james.www.id> - <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> - <target.jdk>1.6</target.jdk> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -86,8 +81,6 @@ <log4j.version>2.12.1</log4j.version> <mail.version>1.4.4</mail.version> <activation.version>1.1.1</activation.version> - <geronimo-activation.version>1.1</geronimo-activation.version> - <geronimo-javamail.version>1.8.3</geronimo-javamail.version> <commons-io.version>2.1</commons-io.version> <mockito-core.version>1.9.0</mockito-core.version> <assertj.version>1.7.1</assertj.version> @@ -184,16 +177,6 @@ <version>1</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> - <version>${geronimo-activation.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>${geronimo-javamail.version}</version> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>${mockito-core.version}</version> diff --git a/util/pom.xml b/util/pom.xml index f32749b..0d63d95 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -76,13 +76,13 @@ </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> </dependency> <dependency> - <groupId>${javax.activation.groupId}</groupId> - <artifactId>${javax.activation.artifactId}</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org