inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-5371 Exclude xpp3 dependency to avoid conflict in JDK9+ (#3049)

Browse Source 
* ACS-5371 Exclude xpp3 dependency

* ACS-5371 Set compiler compliance to 17

* ACS-5371 Update xmlpull version

* ACS-5371 Update xmlpull version

* ACS-5371 Use kxml2

* ACS-5371 Refactor
This commit is contained in:
Damian Ujma
2024-11-25 09:49:47 +01:00
committed by GitHub
parent b6fb8725ce
commit 4a91132226
5 changed files with 154 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data-model/pom.xml
View File

@@ -118,6 +118,18 @@
<groupId>org.jibx</groupId>
<artifactId>jibx-run</artifactId>
<version>1.4.2</version>
<exclusions>
<!-- [ACS-5371] Excluded to avoid conflict in JDK9+ as it includes javax.xml-->
<exclusion>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
<version>${dependency.kxml2.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>

1
packaging/distribution/src/main/resources/licenses/notice.txt
View File

@@ -146,6 +146,7 @@ libgif http://giflib.sourceforge.net/
libfreetype http://www.freetype.org/
PostgreSQL http://www.postgresql.org/
PostgreSQL JDBC Driver http://www.postgresql.org/
kXML 2 http://kxml.sourceforge.net/
=== CDDL 1.0 ===

1
pom.xml
View File

@@ -96,6 +96,7 @@
<dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
<dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
<dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.version>
<dependency.kxml2.version>2.3.0</dependency.kxml2.version>
<dependency.jakarta-ee-jaxb-api.version>4.0.2</dependency.jakarta-ee-jaxb-api.version>
<dependency.jakarta-ee-jaxb-impl.version>4.0.5</dependency.jakarta-ee-jaxb-impl.version>

6
repository/pom.xml
View File

@@ -850,12 +850,12 @@
</execution>
</executions>
<configuration>
<complianceLevel>1.8</complianceLevel>
<complianceLevel>17</complianceLevel>
<outxml>false</outxml>
<verbose>true</verbose>
<showWeaveInfo>true</showWeaveInfo>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
<additionalCompilerArgs>
<arg>-parameters</arg>
</additionalCompilerArgs>

15
repository/src/test/java/org/alfresco/repo/site/SiteMembershipTest.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -29,11 +29,12 @@ import static org.junit.Assert.assertEquals;
import java.util.UUID;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.junit.Before;
import org.junit.Test;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteVisibility;
/**
* Test Membership constructor logs. Based on REPO-2520
*
@@ -56,10 +57,10 @@ public class SiteMembershipTest
@Before
public void createSite()
{
String sitePreset = "testSiteMembershipPreset";
String shortName = "testSiteMembershipShortName";
String title = "testSiteMembershipTile";
String description = "testSiteMembershipDescription";
var sitePreset = "testSiteMembershipPreset";
var shortName = "testSiteMembershipShortName";
var title = "testSiteMembershipTile";
var description = "testSiteMembershipDescription";
siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description,
SiteVisibility.PUBLIC, null);
}