Skip to content

Update dependencies used in test to more recent ones with less CVE #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2023
Merged

Update dependencies used in test to more recent ones with less CVE #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,17 @@
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.0</version>
<version>1.10.13</version>
</artifactItem>
<artifactItem>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.20.0</version>
</artifactItem>
<artifactItem>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.02</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
Expand Down
9 changes: 6 additions & 3 deletions src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,14 @@ void testConfigure_Valid()

assertSame( null, antRealm.getImportClassLoader( "org.apache.tools.Ant" ) );

assertSame( xmlRealm, antRealm.getImportClassLoader( "org.xml.sax.SAXException" ) );
// Ant has dependency to xerces:xercesImpl (test)
assertSame( null, antRealm.getImportClassLoader( "org.xml.sax.SAXException" ) );

assertSame( xmlRealm, antRealm.getImportClassLoader( "jakarta.xml.bind.JAXBException" ) );

assertSame( null, mavenRealm.getImportClassLoader( "org.apache.maven.app.App" ) );

assertSame( xmlRealm, mavenRealm.getImportClassLoader( "org.xml.sax.SAXException" ) );
assertSame( xmlRealm, mavenRealm.getImportClassLoader( "jakarta.xml.bind.JAXBException" ) );

URL[] urls = globRealm.getURLs();

Expand Down Expand Up @@ -233,7 +236,7 @@ void testConfigure_Optionally_Existent()

assertEquals( 1, urls.length , "one url");

assertSame( null, optRealm.getImportClassLoader( "org.xml.sax.SAXException" ) );
assertSame( null, optRealm.getImportClassLoader( "jakarta.xml.bind.JAXBException" ) );
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/test-data/optionally-existent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ main is org.apache.maven.app.App from opt
# ------------------------------------------------------------

[opt]
optionally ${basedir}/target/test-lib/xml-apis-1.3.02.jar
optionally ${basedir}/target/test-lib/jakarta.xml.bind-api-4.0.0.jar

10 changes: 5 additions & 5 deletions src/test/test-data/valid.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ main is org.apache.maven.app.App from maven
# ------------------------------------------------------------

[xml]
load ${basedir}/target/test-lib/xml-apis-1.3.02.jar
load ${basedir}/target/test-lib/jakarta.xml.bind-api-4.0.0.jar

[ant]
import org.xml.sax from xml
load ${basedir}/target/test-lib/ant-1.9.0.jar
import jakarta.xml.bind from xml
load ${basedir}/target/test-lib/ant-1.10.13.jar

[maven]
import org.xml.sax from xml
load ${basedir}/target/test-lib/commons-logging-1.0.3.jar
import jakarta.xml.bind from xml
load ${basedir}/target/test-lib/log4j-api-2.20.0.jar

[glob]
load ${basedir}/src/test/test-data/*.jar