Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {

dependencies {
implementation 'commons-codec:commons-codec:1.7'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') {
exclude(module: 'xalan')
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repositories {

dependencies {
implementation 'commons-codec:commons-codec:1.7'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') {
exclude(module: 'xalan')
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

dependencies {
implementation group: 'commons-codec', name: 'commons-codec', version:'1.7'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version:'5.10.3'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version:'5.11.3'
providedCompile group: 'org.slf4j', name: 'slf4j-api', version:'1.6.1'
providedCompile(group: 'org.jboss.spec', name: 'jboss-javaee-web-6.0', version:'3.0.2.Final') {
exclude(module: 'xalan')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencyManagement {

dependencies {
implementation 'org.slf4j:slf4j-simple:1.7.5'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
implementation 'org.apache.deltaspike.core:deltaspike-core-api'
runtimeOnly 'org.apache.deltaspike.core:deltaspike-core-impl'
}
2 changes: 1 addition & 1 deletion gradle/impl-gradle/src/test/resources/simple/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ repositories {

dependencies {
implementation 'org.slf4j:slf4j-simple:1.7.5'
testCompileOnly 'org.junit.jupiter:junit-jupiter:5.10.3'
testCompileOnly 'org.junit.jupiter:junit-jupiter:5.11.3'
}
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void multipleArtifacts() {
.as(File.class);

@SuppressWarnings("unused")
final File[] analagous1 = Maven.resolver().resolve("org.jboss:jboss-something:1.0.0", "org.junit.jupiter:junit-jupiter:5.10.3")
final File[] analagous1 = Maven.resolver().resolve("org.jboss:jboss-something:1.0.0", "org.junit.jupiter:junit-jupiter:5.11.3")
.withoutTransitivity().as(File.class);

// DependencyResolvers.use(MavenDependencyResolver.class).artifact("G:A:V").artifact("G:B:V")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
}

dependencies {
testCompile 'org.junit.jupiter:junit-jupiter:5.10.3'
testCompile 'org.junit.jupiter:junit-jupiter:5.11.3'
testCompile 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:3.0.0-SNAPSHOT'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void cleanup() throws Exception {
@Test
void control1() {
// This should resolve from Maven Central
final File file = Maven.configureResolver().withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.10.3")
final File file = Maven.configureResolver().withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.11.3")
.withoutTransitivity().asSingle(File.class);
// Ensure we get JUnit
new ValidationUtil("junit-jupiter").validate(file);
Expand All @@ -69,7 +69,7 @@ void control1() {
void control2() {
Assertions.assertThrows(NoResolvedResultException.class, () -> {
final File file = Maven.configureResolver().withClassPathResolution(false).withMavenCentralRepo(false)
.resolve("org.junit.jupiter:junit-jupiter:5.10.3").withoutTransitivity().asSingle(File.class);
.resolve("org.junit.jupiter:junit-jupiter:5.11.3").withoutTransitivity().asSingle(File.class);
new ValidationUtil("junit-jupiter").validate(file);
final File localRepo = new File(FAKE_REPO);
Assertions.assertTrue(file.getAbsolutePath().contains(localRepo.getAbsolutePath()));
Expand Down Expand Up @@ -250,7 +250,7 @@ void shouldOverloadCentral() {
Assertions.assertThrows(NoResolvedResultException.class, () -> {
Maven.configureResolver()
.withRemoteRepo("central", "http://127.0.0.1", "default")
.withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.10.3")
.withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.11.3")
.withTransitivity().as(File.class);
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void shouldHaveCentralMavenRepositoryAndClassPathResolutionDisabled() {
Assertions.assertThrows(NoResolvedResultException.class, () -> {
// This should resolve neither from Maven Central nor from class path
Maven.configureResolver().withClassPathResolution(false).withMavenCentralRepo(false)
.resolve("org.junit.jupiter:junit-jupiter:5.10.3").withoutTransitivity().asSingle(File.class);
.resolve("org.junit.jupiter:junit-jupiter:5.11.3").withoutTransitivity().asSingle(File.class);
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class InvalidSettingsTestCase {
private static final String INVALID_SETTINGS = "target/settings/profiles/settings-invalid.xml";
private static final String CENTRAL_SETTINGS = "target/settings/profiles/settings-central.xml";
private static final String FROM_CLASSLOADER = "profiles/settings3-from-classpath.xml";
private static final String JUNIT_CANONICAL = "org.junit.jupiter:junit-jupiter:5.10.3";
private static final String JUNIT_CANONICAL = "org.junit.jupiter:junit-jupiter:5.11.3";
private static final File TEST_BOM = new File("target/poms/test-bom.xml");

@BeforeAll
Expand Down Expand Up @@ -101,7 +101,7 @@ void shouldNotLoadInvalidSettingsR() {

/**
* In this test the settings-invalid.xml should be loaded during the
* <code>resolve("org.junit.jupiter:junit-jupiter:5.10.3").withTransitivity()</code> phase,
* <code>resolve("org.junit.jupiter:junit-jupiter:5.11.3").withTransitivity()</code> phase,
* for this reason the InvalidConfigurationFileException should be thrown
* <br/>
* Uses method Maven.configureResolver()
Expand All @@ -115,7 +115,7 @@ void shouldLoadInvalidSettingsDueResolvingCR() {

/**
* In this test the settings-invalid.xml should be loaded during the
* <code>resolve("org.junit.jupiter:junit-jupiter:5.10.3").withTransitivity()</code> phase,
* <code>resolve("org.junit.jupiter:junit-jupiter:5.11.3").withTransitivity()</code> phase,
* for this reason the InvalidConfigurationFileException should be thrown
* <br/>
* Uses method Maven.resolver()
Expand Down
2 changes: 1 addition & 1 deletion maven/impl-maven/src/test/resources/poms/test-junit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.3</version>
<version>5.11.3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-maven-plugin-tests-dependency-tree-scoped:jar:1.0.0
+- org.junit.jupiter:junit-jupiter:jar:5.10.3 [test]
| +- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter:jar:5.11.3 [test]
| +- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
| | +- org.opentest4j:opentest4j:jar:1.3.0 [test]
| | +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
| | \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
| +- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
| \- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
| +- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
| \- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
| \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
+- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
| +- org.opentest4j:opentest4j:jar:1.3.0 [test]
| +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
| \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
+- org.opentest4j:opentest4j:jar:1.3.0 [test]
+- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
+- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
+- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
+- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
| \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
\- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-maven-plugin-tests-dependency-tree:jar:1.0.0
+- org.codehaus.groovy:groovy-all:jar:2.1.3 [compile]
+- org.junit.jupiter:junit-jupiter:jar:5.10.3 [test]
| +- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter:jar:5.11.3 [test]
| +- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
| | +- org.opentest4j:opentest4j:jar:1.3.0 [test]
| | +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
| | \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
| +- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
| \- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
| +- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
| \- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
| \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
+- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
| +- org.opentest4j:opentest4j:jar:1.3.0 [test]
| +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
| \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
+- org.opentest4j:opentest4j:jar:1.3.0 [test]
+- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
+- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
+- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
+- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
+- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
| \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
\- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
Loading