This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 82e2bf9fb7cdee4088aac954a856216c160ea033 Author: Rémi Kowalski <[email protected]> AuthorDate: Thu Jul 11 17:34:08 2019 +0200 JAMES-2827 remove geronimo library --- pom.xml | 4 ---- .../appended-resources/supplemental-models.xml | 25 ---------------------- server/app/src/main/licensing/app/licensing.xml | 7 ------ server/app/src/main/licensing/war/licensing.xml | 7 ------ .../appended-resources/supplemental-models.xml | 25 ---------------------- server/mailet/dkim/pom.xml | 8 ------- .../appended-resources/supplemental-models.xml | 24 --------------------- 7 files changed, 100 deletions(-) diff --git a/pom.xml b/pom.xml index 5235cf9..3076c2a 100644 --- a/pom.xml +++ b/pom.xml @@ -597,13 +597,10 @@ <jackrabbit.version>2.17.5</jackrabbit.version> <jsieve.version>0.7</jsieve.version> <spring.version>3.2.18.RELEASE</spring.version> - <geronimo-jms-spec.version>1.1.1</geronimo-jms-spec.version> <activmq-artemis.version>2.9.0</activmq-artemis.version> <apache-jspf-resolver.version>1.0.1</apache-jspf-resolver.version> <javamail.version>1.5.4</javamail.version> <javax-activation.version>1.1.1</javax-activation.version> - <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version> - <geronimo-javamail.version>1.8.3</geronimo-javamail.version> <slf4j.version>1.7.25</slf4j.version> <servlet-api.version>2.4</servlet-api.version> <commons-logging.version>1.1.1</commons-logging.version> @@ -657,7 +654,6 @@ <lucene.version>3.6.2</lucene.version> <xercesImpl.version>2.12.0</xercesImpl.version> <xml-apis.version>1.4.01</xml-apis.version> - <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version> <jasypt.version>1.9.2</jasypt.version> <guice.version>4.2.0</guice.version> <jackrabbit-core.version>2.5.2</jackrabbit-core.version> diff --git a/server/app/src/main/appended-resources/supplemental-models.xml b/server/app/src/main/appended-resources/supplemental-models.xml index e030a8b..c7f37fc 100644 --- a/server/app/src/main/appended-resources/supplemental-models.xml +++ b/server/app/src/main/appended-resources/supplemental-models.xml @@ -451,30 +451,5 @@ Serp </organization> </project> </supplement> - -<!-- - -============================================================== -Geronimo - --> - <supplement> - <project> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - <comments>Distributed within spring-framework-3.0.5.RELEASE</comments> - </license> - </licenses> - </project> - </supplement> - </supplementalDataModels> diff --git a/server/app/src/main/licensing/app/licensing.xml b/server/app/src/main/licensing/app/licensing.xml index 04f71a6..27ac4b9 100644 --- a/server/app/src/main/licensing/app/licensing.xml +++ b/server/app/src/main/licensing/app/licensing.xml @@ -1317,13 +1317,6 @@ All rights reserved. <resource name='commons-logging-api-1.1.jar'/> <resource name='commons-pool-1.5.5.jar'/> <resource name='derby-10.14.2.0.jar'/> - <resource name='geronimo-annotation_1.0_spec-1.1.1.jar'/> - <resource name='geronimo-annotation_1.1_spec-1.0.1.jar'/> - <resource name='geronimo-j2ee-management_1.1_spec-1.0.1.jar'/> - <resource name='geronimo-jms_1.1_spec-1.0.jar'/> - <resource name='geronimo-jpa_2.0_spec-1.0.jar'/> - <resource name='geronimo-jta_1.1_spec-1.1.1.jar'/> - <resource name='geronimo-stax-api_1.0_spec-1.0.1.jar'/> <resource name='jackrabbit-api-2.2.5.jar'/> <resource name='jackrabbit-core-2.2.5.jar'/> <resource name='jackrabbit-spi-2.2.5.jar'/> diff --git a/server/app/src/main/licensing/war/licensing.xml b/server/app/src/main/licensing/war/licensing.xml index 2a92e9d..ae20dc7 100644 --- a/server/app/src/main/licensing/war/licensing.xml +++ b/server/app/src/main/licensing/war/licensing.xml @@ -1266,13 +1266,6 @@ All rights reserved. <resource name='commons-logging-api-1.1.jar'/> <resource name='commons-pool-1.5.5.jar'/> <resource name='derby-10.14.2.0.jar'/> - <resource name='geronimo-annotation_1.0_spec-1.1.1.jar'/> - <resource name='geronimo-annotation_1.1_spec-1.0.1.jar'/> - <resource name='geronimo-j2ee-management_1.1_spec-1.0.1.jar'/> - <resource name='geronimo-jms_1.1_spec-1.0.jar'/> - <resource name='geronimo-jpa_2.0_spec-1.0.jar'/> - <resource name='geronimo-jta_1.1_spec-1.1.1.jar'/> - <resource name='geronimo-stax-api_1.0_spec-1.0.1.jar'/> <resource name='jackrabbit-api-2.2.5.jar'/> <resource name='jackrabbit-core-2.2.5.jar'/> <resource name='jackrabbit-spi-2.2.5.jar'/> diff --git a/server/container/spring/src/main/appended-resources/supplemental-models.xml b/server/container/spring/src/main/appended-resources/supplemental-models.xml index e030a8b..8769115 100644 --- a/server/container/spring/src/main/appended-resources/supplemental-models.xml +++ b/server/container/spring/src/main/appended-resources/supplemental-models.xml @@ -450,31 +450,6 @@ Serp <url>http://serp.sourceforge.net</url> </organization> </project> - </supplement> - -<!-- - - -============================================================== -Geronimo - --> - <supplement> - <project> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - <comments>Distributed within spring-framework-3.0.5.RELEASE</comments> - </license> - </licenses> - </project> </supplement> </supplementalDataModels> diff --git a/server/mailet/dkim/pom.xml b/server/mailet/dkim/pom.xml index afeeaca..e021de0 100644 --- a/server/mailet/dkim/pom.xml +++ b/server/mailet/dkim/pom.xml @@ -68,10 +68,6 @@ <artifactId>apache-mime4j-dom</artifactId> </exclusion> <exclusion> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> - </exclusion> - <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> @@ -97,10 +93,6 @@ <artifactId>apache-mime4j-dom</artifactId> </exclusion> <exclusion> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> - </exclusion> - <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> diff --git a/server/src/main/appended-resources/supplemental-models.xml b/server/src/main/appended-resources/supplemental-models.xml index e030a8b..43af795 100644 --- a/server/src/main/appended-resources/supplemental-models.xml +++ b/server/src/main/appended-resources/supplemental-models.xml @@ -451,30 +451,6 @@ Serp </organization> </project> </supplement> - -<!-- - -============================================================== -Geronimo - --> - <supplement> - <project> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - <comments>Distributed within spring-framework-3.0.5.RELEASE</comments> - </license> - </licenses> - </project> - </supplement> </supplementalDataModels> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
