inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2025-09-10 14:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-1146 Replace *javax* dependencies with *jakarta* libraries (#1222)

Browse Source 
- remove unnecessary dependency declarations & dependency excludes
This commit is contained in:
CezarLeahu
2021-01-26 15:43:38 +02:00
committed by GitHub
parent 080d7b3670
commit f6f6e0dd0d
4 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
distribution/pom.xml
View File

@@ -20,33 +20,6 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-data-model</artifactId>
<exclusions>
<!-- REPO-4998 - Exclusion due to classpath conflicts between org.codehaus.woodstox:woodstox-core-asl and com.fasterxml.woodstox:woodstox-core -->
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
<!-- REPO-5009 Excluded to avoid duplicated classes with javax.jws:javax.jws-api -->
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</exclusion>
<!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
<!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<!-- Duplicates classes from jakarta.annotation:jakarta.annotation-api -->
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>

4
pom.xml
View File

@@ -9,11 +9,11 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>8.375</version>
<version>8.377</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>8.375</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-repo.version>8.377</dependency.alfresco-community-repo.version>
<alfresco.share.version>7.0.0-M3</alfresco.share.version>
<alfresco.alfresco-share-services.version>${alfresco.share.version}</alfresco.alfresco-share-services.version>

9
tests/tas-integration/pom.xml
View File

@@ -24,7 +24,6 @@
<properties>
<suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
<dependency.groovy.version>2.5.14</dependency.groovy.version>
<dependency.javax.mail.version>1.6.2</dependency.javax.mail.version>
</properties>
<dependencies>
@@ -48,16 +47,14 @@
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>${dependency.javax.mail.version}</version>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${dependency.javax.mail.version}</version>
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>

2
tests/tas-restapi/pom.xml
View File

@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<artifactId>jakarta.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>