[REPO-4993] activation class duplicates (#848)

* Exclusions of com.sun.activation:javax.activation and javax.activation:activation as they duplicate classes from com.sun.activation:jakarta.activation

* Exclusion of jakarta.activation:jakarta.activation-api as it duplicates classes from com.sun.activation:jakarta.activation
This commit is contained in:
evasques
2020-03-04 17:21:44 +00:00
committed by GitHub
parent 2127724306
commit ab706947b1

32
pom.xml
View File

@@ -181,6 +181,13 @@
<groupId>com.sun.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.6.2</version> <version>1.6.2</version>
<exclusions>
<!-- Duplicate classes from com.sun.activation:jakarta.activation-->
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@@ -313,6 +320,11 @@
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
</exclusion> </exclusion>
<!-- Duplicate classes from com.sun.activation:jakarta.activation-->
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@@ -857,6 +869,13 @@
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId> <artifactId>camel-jackson</artifactId>
<version>${dependency.camel.version}</version> <version>${dependency.camel.version}</version>
<exclusions>
<!-- Duplicate classes from com.sun.activation:jakarta.activation-->
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
@@ -976,6 +995,13 @@
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-data-model</artifactId> <artifactId>alfresco-data-model</artifactId>
<version>${dependency.alfresco-data-model.version}</version> <version>${dependency.alfresco-data-model.version}</version>
<exclusions>
<!-- Duplicate classes from com.sun.activation:jakarta.activation-->
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@@ -1060,6 +1086,12 @@
<artifactId>taglibs-standard-jstlel</artifactId> <artifactId>taglibs-standard-jstlel</artifactId>
<version>${dependency.apache.taglibs.version}</version> <version>${dependency.apache.taglibs.version}</version>
</dependency> </dependency>
<!-- Added to replace transitive dependencies com.sun.activation:javax.activation and javax.activation:activation -->
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>1.2.1</version>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>