inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +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> <groupId>org.jibx</groupId>
<artifactId>jibx-run</artifactId> <artifactId>jibx-run</artifactId>
<version>1.4.2</version> <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>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <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/ libfreetype http://www.freetype.org/
PostgreSQL http://www.postgresql.org/ PostgreSQL http://www.postgresql.org/
PostgreSQL JDBC Driver http://www.postgresql.org/ PostgreSQL JDBC Driver http://www.postgresql.org/
kXML 2 http://kxml.sourceforge.net/
=== CDDL 1.0 === === CDDL 1.0 ===

1
pom.xml
View File

@@ -96,6 +96,7 @@
<dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version> <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
<dependency.jdom2.version>2.0.6.1</dependency.jdom2.version> <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
<dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.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-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> <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> </execution>
</executions> </executions>
<configuration> <configuration>
<complianceLevel>1.8</complianceLevel> <complianceLevel>17</complianceLevel>
<outxml>false</outxml> <outxml>false</outxml>
<verbose>true</verbose> <verbose>true</verbose>
<showWeaveInfo>true</showWeaveInfo> <showWeaveInfo>true</showWeaveInfo>
<source>1.8</source> <source>17</source>
<target>1.8</target> <target>17</target>
<additionalCompilerArgs> <additionalCompilerArgs>
<arg>-parameters</arg> <arg>-parameters</arg>
</additionalCompilerArgs> </additionalCompilerArgs>

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

@@ -1,136 +1,137 @@
/* /*
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2024 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms: * provided under the following open source license terms:
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.repo.site; package org.alfresco.repo.site;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import java.util.UUID; import java.util.UUID;
import org.alfresco.service.cmr.site.SiteInfo; import org.junit.Before;
import org.alfresco.service.cmr.site.SiteVisibility; import org.junit.Test;
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 /**
* * Test Membership constructor logs. Based on REPO-2520
* @author Alexandru Epure *
*/ * @author Alexandru Epure
public class SiteMembershipTest */
{ public class SiteMembershipTest
SiteInfo siteInfo; {
SiteMembership siteMember; SiteInfo siteInfo;
String personId = UUID.randomUUID().toString(); SiteMembership siteMember;
String firstName = UUID.randomUUID().toString(); String personId = UUID.randomUUID().toString();
String lastName = UUID.randomUUID().toString(); String firstName = UUID.randomUUID().toString();
String role = "Consumer"; String lastName = UUID.randomUUID().toString();
String role = "Consumer";
String idErrorMessage = "Id required building site membership";
String firstNameErrorMessage = "FirstName required building site membership of "; String idErrorMessage = "Id required building site membership";
String lastNameErrorMessage = "LastName required building site membership of "; String firstNameErrorMessage = "FirstName required building site membership of ";
String roleErrorMessage = "Role required building site membership"; String lastNameErrorMessage = "LastName required building site membership of ";
String roleErrorMessage = "Role required building site membership";
@Before
public void createSite() @Before
{ public void createSite()
String sitePreset = "testSiteMembershipPreset"; {
String shortName = "testSiteMembershipShortName"; var sitePreset = "testSiteMembershipPreset";
String title = "testSiteMembershipTile"; var shortName = "testSiteMembershipShortName";
String description = "testSiteMembershipDescription"; var title = "testSiteMembershipTile";
siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description, var description = "testSiteMembershipDescription";
SiteVisibility.PUBLIC, null); siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description,
} SiteVisibility.PUBLIC, null);
}
@Test
public void testNullpersonInfo() throws Exception @Test
{ public void testNullpersonInfo() throws Exception
try {
{ try
siteMember = new SiteMembership(siteInfo, null, firstName, lastName, role); {
} siteMember = new SiteMembership(siteInfo, null, firstName, lastName, role);
catch (IllegalArgumentException e) }
{ catch (IllegalArgumentException e)
assertEquals(idErrorMessage, e.getMessage()); {
} assertEquals(idErrorMessage, e.getMessage());
}
try
{ try
siteMember = new SiteMembership(siteInfo, null, role); {
} siteMember = new SiteMembership(siteInfo, null, role);
catch (IllegalArgumentException e) }
{ catch (IllegalArgumentException e)
assertEquals(idErrorMessage, e.getMessage()); {
} assertEquals(idErrorMessage, e.getMessage());
} }
}
@Test
public void testNullRole() throws Exception @Test
{ public void testNullRole() throws Exception
try {
{ try
siteMember = new SiteMembership(siteInfo, personId, firstName, lastName, null); {
} siteMember = new SiteMembership(siteInfo, personId, firstName, lastName, null);
catch (IllegalArgumentException e) }
{ catch (IllegalArgumentException e)
assertEquals(roleErrorMessage, e.getMessage()); {
} assertEquals(roleErrorMessage, e.getMessage());
}
try
{ try
siteMember = new SiteMembership(siteInfo, personId, null); {
} siteMember = new SiteMembership(siteInfo, personId, null);
catch (IllegalArgumentException e) }
{ catch (IllegalArgumentException e)
assertEquals(roleErrorMessage, e.getMessage()); {
} assertEquals(roleErrorMessage, e.getMessage());
} }
}
@Test
public void testNullFirstName() throws Exception @Test
{ public void testNullFirstName() throws Exception
try {
{ try
siteMember = new SiteMembership(siteInfo, personId, null, lastName, role); {
} siteMember = new SiteMembership(siteInfo, personId, null, lastName, role);
catch (IllegalArgumentException e) }
{ catch (IllegalArgumentException e)
assertEquals(firstNameErrorMessage + siteInfo.getShortName(), e.getMessage()); {
} assertEquals(firstNameErrorMessage + siteInfo.getShortName(), e.getMessage());
} }
}
@Test
public void testNullLastName() throws Exception @Test
{ public void testNullLastName() throws Exception
try {
{ try
siteMember = new SiteMembership(siteInfo, personId, firstName, null, role); {
} siteMember = new SiteMembership(siteInfo, personId, firstName, null, role);
catch (IllegalArgumentException e) }
{ catch (IllegalArgumentException e)
assertEquals(lastNameErrorMessage + siteInfo.getShortName(), e.getMessage()); {
} assertEquals(lastNameErrorMessage + siteInfo.getShortName(), e.getMessage());
} }
} }
}