diff --git a/README.md b/README.md index da9d781..cec704b 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ public class MyAppBuild extends Project { downloadSources = true; repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(6,1,2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(6,1,2))); } public static void main(String[] args) { @@ -69,8 +69,8 @@ public class MyAppBuild extends Project { ``` > **NOTE:** `bld` supports different ways to describe dependencies, -> `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))` can for instance also -> be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.4")`. Which format you use, +> `dependency("org.junit.jupiter", "junit-jupiter", version(6,1,2))` can for instance also +> be written as `dependency("org.junit.jupiter:junit-jupiter:6.1.2")`. Which format you use, > is a matter of personal taste. # Where does `bld` fit? diff --git a/core b/core index 1e916ab..51b3fa3 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 1e916abfd19354a433c7686672273af2e1b1c11d +Subproject commit 51b3fa3cb6f6cef2e705ee805f704c11c45e7c41 diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java index d3875e7..53e1b67 100644 --- a/src/bld/java/rife/BldBuild.java +++ b/src/bld/java/rife/BldBuild.java @@ -33,8 +33,6 @@ public class BldBuild extends AbstractRife2Build { version = VersionNumber.parse(FileUtils.readString(new File(srcMainResourcesDirectory(), "BLD_VERSION"))); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - scope(test) - .include(dependency("org.json", "json", version(20250517))); var core_dir = new File(workDirectory(), "core"); var core_src_dir = new File(core_dir, "src"); diff --git a/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java b/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java index 1c70122..4e8b550 100644 --- a/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java @@ -37,7 +37,7 @@ public class AppProjectBlueprint extends Project { downloadSources = true; repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(6,1,2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(6,1,2))); } } \ No newline at end of file diff --git a/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java b/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java index 1100e9f..87f6977 100644 --- a/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java @@ -37,7 +37,7 @@ public class LibProjectBlueprint extends Project { downloadSources = true; repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(6,1,2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(6,1,2))); } } \ No newline at end of file diff --git a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java index 92845de..3a1ea6d 100644 --- a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java @@ -41,13 +41,13 @@ public class Rife2ProjectBlueprint extends WebProject { scope(compile) .include(dependency("com.uwyn.rife2", "rife2", version(1,9,1))); scope(test) - .include(dependency("org.jsoup", "jsoup", version(1,18,3))) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4))); + .include(dependency("org.jsoup", "jsoup", version(1,22,2))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(6,1,2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(6,1,2))); scope(standalone) - .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,16))) - .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,16))) - .include(dependency("org.slf4j", "slf4j-simple", version(2,0,16))); + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,1,11))) + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,1,11))) + .include(dependency("org.slf4j", "slf4j-simple", version(2,0,18))); precompileOperation().templateTypes(TemplateType.HTML); } diff --git a/src/test/java/rife/bld/operations/TestCreateAppOperation.java b/src/test/java/rife/bld/operations/TestCreateAppOperation.java index 33c1c6a..6ab24ba 100644 --- a/src/test/java/rife/bld/operations/TestCreateAppOperation.java +++ b/src/test/java/rife/bld/operations/TestCreateAppOperation.java @@ -104,20 +104,22 @@ public class TestCreateAppOperation { /my-app/lib/test /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/test/modules /my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/test/opentest4j-1\\.3\\.0\\.jar @@ -188,20 +190,22 @@ public class TestCreateAppOperation { /my-app/lib/test /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/test/modules /my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/test/opentest4j-1\\.3\\.0\\.jar @@ -392,20 +396,22 @@ public class TestCreateAppOperation { /my-app/lib/local /my-app/lib/local/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/local/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/local/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/local/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/local/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/local/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/local/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/local/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/local/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/local/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/local/jspecify-1\\.0\\.0\\.jar + /my-app/lib/local/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/local/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/local/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/local/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/local/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/local/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/local/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/local/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/local/opentest4j-1\\.3\\.0\\.jar /my-app/lib/provided @@ -519,20 +525,22 @@ public class TestCreateAppOperation { /my-app/lib/local_test /my-app/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/local_test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/local_test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/local_test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/local_test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/local_test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/local_test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/local_test/opentest4j-1\\.3\\.0\\.jar /my-app/lib/provided diff --git a/src/test/java/rife/bld/operations/TestCreateLibOperation.java b/src/test/java/rife/bld/operations/TestCreateLibOperation.java index eb85036..24e02d1 100644 --- a/src/test/java/rife/bld/operations/TestCreateLibOperation.java +++ b/src/test/java/rife/bld/operations/TestCreateLibOperation.java @@ -96,20 +96,22 @@ public class TestCreateLibOperation { /my-app/lib/test /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/test/modules /my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/test/opentest4j-1\\.3\\.0\\.jar @@ -179,20 +181,22 @@ public class TestCreateLibOperation { /my-app/lib/test /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/test/modules /my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/test/opentest4j-1\\.3\\.0\\.jar diff --git a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java index 074865c..429b7f4 100644 --- a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java +++ b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java @@ -111,44 +111,46 @@ public class TestCreateRife2Operation { /my-app/lib/standalone /my-app/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar /my-app/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar - /my-app/lib/standalone/jetty-ee10-servlet-12.0.16-sources\\.jar - /my-app/lib/standalone/jetty-ee10-servlet-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-http-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-http-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-io-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-io-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-security-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-security-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-server-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-server-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-session-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-session-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-util-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-util-12\\.0\\.16\\.jar + /my-app/lib/standalone/jetty-ee10-servlet-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-ee10-servlet-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-http-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-http-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-io-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-io-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-security-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-security-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-server-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-server-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-session-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-session-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-util-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-util-12\\.1\\.11\\.jar /my-app/lib/standalone/modules - /my-app/lib/standalone/slf4j-api-2\\.0\\.16-sources\\.jar - /my-app/lib/standalone/slf4j-api-2\\.0\\.16\\.jar - /my-app/lib/standalone/slf4j-simple-2\\.0\\.16-sources\\.jar - /my-app/lib/standalone/slf4j-simple-2\\.0\\.16\\.jar + /my-app/lib/standalone/slf4j-api-2\\.0\\.18-sources\\.jar + /my-app/lib/standalone/slf4j-api-2\\.0\\.18\\.jar + /my-app/lib/standalone/slf4j-simple-2\\.0\\.18-sources\\.jar + /my-app/lib/standalone/slf4j-simple-2\\.0\\.18\\.jar /my-app/lib/test /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar - /my-app/lib/test/jsoup-1\\.18\\.3\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/test/jsoup-1\\.22\\.2-sources\\.jar + /my-app/lib/test/jsoup-1\\.22\\.2\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/test/modules /my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/test/opentest4j-1\\.3\\.0\\.jar @@ -230,44 +232,46 @@ public class TestCreateRife2Operation { /my-app/lib/standalone /my-app/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar /my-app/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar - /my-app/lib/standalone/jetty-ee10-servlet-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-ee10-servlet-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-http-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-http-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-io-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-io-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-security-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-security-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-server-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-server-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-session-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-session-12\\.0\\.16\\.jar - /my-app/lib/standalone/jetty-util-12\\.0\\.16-sources\\.jar - /my-app/lib/standalone/jetty-util-12\\.0\\.16\\.jar + /my-app/lib/standalone/jetty-ee10-servlet-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-ee10-servlet-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-http-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-http-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-io-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-io-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-security-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-security-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-server-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-server-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-session-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-session-12\\.1\\.11\\.jar + /my-app/lib/standalone/jetty-util-12\\.1\\.11-sources\\.jar + /my-app/lib/standalone/jetty-util-12\\.1\\.11\\.jar /my-app/lib/standalone/modules - /my-app/lib/standalone/slf4j-api-2\\.0\\.16-sources\\.jar - /my-app/lib/standalone/slf4j-api-2\\.0\\.16\\.jar - /my-app/lib/standalone/slf4j-simple-2\\.0\\.16-sources\\.jar - /my-app/lib/standalone/slf4j-simple-2\\.0\\.16\\.jar + /my-app/lib/standalone/slf4j-api-2\\.0\\.18-sources\\.jar + /my-app/lib/standalone/slf4j-api-2\\.0\\.18\\.jar + /my-app/lib/standalone/slf4j-simple-2\\.0\\.18-sources\\.jar + /my-app/lib/standalone/slf4j-simple-2\\.0\\.18\\.jar /my-app/lib/test /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar - /my-app/lib/test/jsoup-1\\.18\\.3\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/test/jsoup-1\\.22\\.2-sources\\.jar + /my-app/lib/test/jsoup-1\\.22\\.2\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/test/modules /my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/test/opentest4j-1\\.3\\.0\\.jar @@ -492,44 +496,46 @@ public class TestCreateRife2Operation { /my-app/lib/local/apiguardian-api-1\\.1\\.2\\.jar /my-app/lib/local/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar /my-app/lib/local/jakarta\\.servlet-api-6\\.0\\.0\\.jar - /my-app/lib/local/jetty-ee10-servlet-12\\.0\\.16-sources\\.jar - /my-app/lib/local/jetty-ee10-servlet-12\\.0\\.16\\.jar - /my-app/lib/local/jetty-http-12\\.0\\.16-sources\\.jar - /my-app/lib/local/jetty-http-12\\.0\\.16\\.jar - /my-app/lib/local/jetty-io-12\\.0\\.16-sources\\.jar - /my-app/lib/local/jetty-io-12\\.0\\.16\\.jar - /my-app/lib/local/jetty-security-12\\.0\\.16-sources\\.jar - /my-app/lib/local/jetty-security-12\\.0\\.16\\.jar - /my-app/lib/local/jetty-server-12\\.0\\.16-sources\\.jar - /my-app/lib/local/jetty-server-12\\.0\\.16\\.jar - /my-app/lib/local/jetty-session-12\\.0\\.16-sources\\.jar - /my-app/lib/local/jetty-session-12\\.0\\.16\\.jar - /my-app/lib/local/jetty-util-12\\.0\\.16-sources\\.jar - /my-app/lib/local/jetty-util-12\\.0\\.16\\.jar - /my-app/lib/local/jsoup-1\\.18\\.3-sources\\.jar - /my-app/lib/local/jsoup-1\\.18\\.3\\.jar - /my-app/lib/local/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/local/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/local/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/local/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/local/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/local/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/local/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/local/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/local/jetty-ee10-servlet-12\\.1\\.11-sources\\.jar + /my-app/lib/local/jetty-ee10-servlet-12\\.1\\.11\\.jar + /my-app/lib/local/jetty-http-12\\.1\\.11-sources\\.jar + /my-app/lib/local/jetty-http-12\\.1\\.11\\.jar + /my-app/lib/local/jetty-io-12\\.1\\.11-sources\\.jar + /my-app/lib/local/jetty-io-12\\.1\\.11\\.jar + /my-app/lib/local/jetty-security-12\\.1\\.11-sources\\.jar + /my-app/lib/local/jetty-security-12\\.1\\.11\\.jar + /my-app/lib/local/jetty-server-12\\.1\\.11-sources\\.jar + /my-app/lib/local/jetty-server-12\\.1\\.11\\.jar + /my-app/lib/local/jetty-session-12\\.1\\.11-sources\\.jar + /my-app/lib/local/jetty-session-12\\.1\\.11\\.jar + /my-app/lib/local/jetty-util-12\\.1\\.11-sources\\.jar + /my-app/lib/local/jetty-util-12\\.1\\.11\\.jar + /my-app/lib/local/jsoup-1\\.22\\.2-sources\\.jar + /my-app/lib/local/jsoup-1\\.22\\.2\\.jar + /my-app/lib/local/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/local/jspecify-1\\.0\\.0\\.jar + /my-app/lib/local/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/local/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/local/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/local/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/local/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/local/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/local/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/local/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/local/opentest4j-1\\.3\\.0\\.jar /my-app/lib/local/rife2-.*-sources\\.jar /my-app/lib/local/rife2-.*\\.jar - /my-app/lib/local/slf4j-api-2\\.0\\.16-sources\\.jar - /my-app/lib/local/slf4j-api-2\\.0\\.16\\.jar - /my-app/lib/local/slf4j-simple-2\\.0\\.16-sources\\.jar - /my-app/lib/local/slf4j-simple-2\\.0\\.16\\.jar + /my-app/lib/local/slf4j-api-2\\.0\\.18-sources\\.jar + /my-app/lib/local/slf4j-api-2\\.0\\.18\\.jar + /my-app/lib/local/slf4j-simple-2\\.0\\.18-sources\\.jar + /my-app/lib/local/slf4j-simple-2\\.0\\.18\\.jar /my-app/lib/provided /my-app/lib/provided/modules /my-app/lib/runtime @@ -667,43 +673,45 @@ public class TestCreateRife2Operation { /my-app/lib/local_standalone /my-app/lib/local_standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar /my-app/lib/local_standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar - /my-app/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.16\\.jar - /my-app/lib/local_standalone/jetty-http-12\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/jetty-http-12\\.0\\.16\\.jar - /my-app/lib/local_standalone/jetty-io-12\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/jetty-io-12\\.0\\.16\\.jar - /my-app/lib/local_standalone/jetty-security-12\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/jetty-security-12\\.0\\.16\\.jar - /my-app/lib/local_standalone/jetty-server-12\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/jetty-server-12\\.0\\.16\\.jar - /my-app/lib/local_standalone/jetty-session-12\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/jetty-session-12\\.0\\.16\\.jar - /my-app/lib/local_standalone/jetty-util-12\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/jetty-util-12\\.0\\.16\\.jar - /my-app/lib/local_standalone/slf4j-api-2\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/slf4j-api-2\\.0\\.16\\.jar - /my-app/lib/local_standalone/slf4j-simple-2\\.0\\.16-sources\\.jar - /my-app/lib/local_standalone/slf4j-simple-2\\.0\\.16\\.jar + /my-app/lib/local_standalone/jetty-ee10-servlet-12\\.1\\.11-sources\\.jar + /my-app/lib/local_standalone/jetty-ee10-servlet-12\\.1\\.11\\.jar + /my-app/lib/local_standalone/jetty-http-12\\.1\\.11-sources\\.jar + /my-app/lib/local_standalone/jetty-http-12\\.1\\.11\\.jar + /my-app/lib/local_standalone/jetty-io-12\\.1\\.11-sources\\.jar + /my-app/lib/local_standalone/jetty-io-12\\.1\\.11\\.jar + /my-app/lib/local_standalone/jetty-security-12\\.1\\.11-sources\\.jar + /my-app/lib/local_standalone/jetty-security-12\\.1\\.11\\.jar + /my-app/lib/local_standalone/jetty-server-12\\.1\\.11-sources\\.jar + /my-app/lib/local_standalone/jetty-server-12\\.1\\.11\\.jar + /my-app/lib/local_standalone/jetty-session-12\\.1\\.11-sources\\.jar + /my-app/lib/local_standalone/jetty-session-12\\.1\\.11\\.jar + /my-app/lib/local_standalone/jetty-util-12\\.1\\.11-sources\\.jar + /my-app/lib/local_standalone/jetty-util-12\\.1\\.11\\.jar + /my-app/lib/local_standalone/slf4j-api-2\\.0\\.18-sources\\.jar + /my-app/lib/local_standalone/slf4j-api-2\\.0\\.18\\.jar + /my-app/lib/local_standalone/slf4j-simple-2\\.0\\.18-sources\\.jar + /my-app/lib/local_standalone/slf4j-simple-2\\.0\\.18\\.jar /my-app/lib/local_test /my-app/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/local_test/apiguardian-api-1\\.1\\.2\\.jar - /my-app/lib/local_test/jsoup-1\\.18\\.3-sources\\.jar - /my-app/lib/local_test/jsoup-1\\.18\\.3\\.jar - /my-app/lib/local_test/junit-jupiter-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-jupiter-params-5\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-jupiter-params-5\\.11\\.4\\.jar - /my-app/lib/local_test/junit-platform-commons-1\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-platform-commons-1\\.11\\.4\\.jar - /my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.4\\.jar - /my-app/lib/local_test/junit-platform-engine-1\\.11\\.4-sources\\.jar - /my-app/lib/local_test/junit-platform-engine-1\\.11\\.4\\.jar + /my-app/lib/local_test/jsoup-1\\.22\\.2-sources\\.jar + /my-app/lib/local_test/jsoup-1\\.22\\.2\\.jar + /my-app/lib/local_test/jspecify-1\\.0\\.0-sources\\.jar + /my-app/lib/local_test/jspecify-1\\.0\\.0\\.jar + /my-app/lib/local_test/junit-jupiter-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-jupiter-api-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-api-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-jupiter-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-engine-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-jupiter-params-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-jupiter-params-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-platform-commons-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-platform-commons-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-platform-console-standalone-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-platform-console-standalone-6\\.1\\.2\\.jar + /my-app/lib/local_test/junit-platform-engine-6\\.1\\.2-sources\\.jar + /my-app/lib/local_test/junit-platform-engine-6\\.1\\.2\\.jar /my-app/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar /my-app/lib/local_test/opentest4j-1\\.3\\.0\\.jar /my-app/lib/provided diff --git a/src/test/java/rife/bld/operations/TestPublishOperation.java b/src/test/java/rife/bld/operations/TestPublishOperation.java index 707a874..8fe6e28 100644 --- a/src/test/java/rife/bld/operations/TestPublishOperation.java +++ b/src/test/java/rife/bld/operations/TestPublishOperation.java @@ -4,7 +4,7 @@ */ package rife.bld.operations; -import org.json.JSONObject; +import rife.json.Json; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -172,16 +172,16 @@ public class TestPublishOperation { .repositories(new Repository("http://localhost:8081/releases", "manager", "passwd")); publish_operation1.execute(); - var dir_json1 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); + var dir_json1 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); assertEquals("myapp", dir_json1.get("name")); - var dir_files_json1 = dir_json1.getJSONArray("files"); - assertEquals(6, dir_files_json1.length()); - assertEquals("0.0.1", dir_files_json1.getJSONObject(0).get("name")); - assertEquals("maven-metadata.xml.md5", dir_files_json1.getJSONObject(1).get("name")); - assertEquals("maven-metadata.xml.sha1", dir_files_json1.getJSONObject(2).get("name")); - assertEquals("maven-metadata.xml.sha256", dir_files_json1.getJSONObject(3).get("name")); - assertEquals("maven-metadata.xml.sha512", dir_files_json1.getJSONObject(4).get("name")); - assertEquals("maven-metadata.xml", dir_files_json1.getJSONObject(5).get("name")); + var dir_files_json1 = dir_json1.getArray("files"); + assertEquals(6, dir_files_json1.size()); + assertEquals("0.0.1", dir_files_json1.getObject(0).get("name")); + assertEquals("maven-metadata.xml.md5", dir_files_json1.getObject(1).get("name")); + assertEquals("maven-metadata.xml.sha1", dir_files_json1.getObject(2).get("name")); + assertEquals("maven-metadata.xml.sha256", dir_files_json1.getObject(3).get("name")); + assertEquals("maven-metadata.xml.sha512", dir_files_json1.getObject(4).get("name")); + assertEquals("maven-metadata.xml", dir_files_json1.getObject(5).get("name")); var maven_metadata1 = new Xml2MavenMetadata(); maven_metadata1.processXml(FileUtils.readString(new URL("http://localhost:8081/releases/test/pkg/myapp/maven-metadata.xml"))); @@ -193,20 +193,20 @@ public class TestPublishOperation { assertEquals(1, maven_metadata1.getVersions().size()); assertTrue(maven_metadata1.getVersions().contains(create_operation1.project().version())); - var version_json1 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/0.0.1"))); + var version_json1 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/0.0.1"))); assertEquals("0.0.1", version_json1.get("name")); - var version_files_json1 = version_json1.getJSONArray("files"); - assertEquals(10, version_files_json1.length()); - assertEquals("myapp-0.0.1.jar.md5", version_files_json1.getJSONObject(0).get("name")); - assertEquals("myapp-0.0.1.jar.sha1", version_files_json1.getJSONObject(1).get("name")); - assertEquals("myapp-0.0.1.jar.sha256", version_files_json1.getJSONObject(2).get("name")); - assertEquals("myapp-0.0.1.jar.sha512", version_files_json1.getJSONObject(3).get("name")); - assertEquals("myapp-0.0.1.jar", version_files_json1.getJSONObject(4).get("name")); - assertEquals("myapp-0.0.1.pom.md5", version_files_json1.getJSONObject(5).get("name")); - assertEquals("myapp-0.0.1.pom.sha1", version_files_json1.getJSONObject(6).get("name")); - assertEquals("myapp-0.0.1.pom.sha256", version_files_json1.getJSONObject(7).get("name")); - assertEquals("myapp-0.0.1.pom.sha512", version_files_json1.getJSONObject(8).get("name")); - assertEquals("myapp-0.0.1.pom", version_files_json1.getJSONObject(9).get("name")); + var version_files_json1 = version_json1.getArray("files"); + assertEquals(10, version_files_json1.size()); + assertEquals("myapp-0.0.1.jar.md5", version_files_json1.getObject(0).get("name")); + assertEquals("myapp-0.0.1.jar.sha1", version_files_json1.getObject(1).get("name")); + assertEquals("myapp-0.0.1.jar.sha256", version_files_json1.getObject(2).get("name")); + assertEquals("myapp-0.0.1.jar.sha512", version_files_json1.getObject(3).get("name")); + assertEquals("myapp-0.0.1.jar", version_files_json1.getObject(4).get("name")); + assertEquals("myapp-0.0.1.pom.md5", version_files_json1.getObject(5).get("name")); + assertEquals("myapp-0.0.1.pom.sha1", version_files_json1.getObject(6).get("name")); + assertEquals("myapp-0.0.1.pom.sha256", version_files_json1.getObject(7).get("name")); + assertEquals("myapp-0.0.1.pom.sha512", version_files_json1.getObject(8).get("name")); + assertEquals("myapp-0.0.1.pom", version_files_json1.getObject(9).get("name")); // created an updated publication var create_operation2 = new CreateAppOperation() { @@ -233,17 +233,17 @@ public class TestPublishOperation { .repositories(new Repository("http://localhost:8081/releases", "manager", "passwd")); publish_operation2.execute(); - var dir_json2 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); + var dir_json2 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); assertEquals("myapp", dir_json2.get("name")); - var dir_files_json2 = dir_json2.getJSONArray("files"); - assertEquals(7, dir_files_json2.length()); - assertEquals("0.0.1", dir_files_json2.getJSONObject(0).get("name")); - assertEquals("1.0.0", dir_files_json2.getJSONObject(1).get("name")); - assertEquals("maven-metadata.xml.md5", dir_files_json2.getJSONObject(2).get("name")); - assertEquals("maven-metadata.xml.sha1", dir_files_json2.getJSONObject(3).get("name")); - assertEquals("maven-metadata.xml.sha256", dir_files_json2.getJSONObject(4).get("name")); - assertEquals("maven-metadata.xml.sha512", dir_files_json2.getJSONObject(5).get("name")); - assertEquals("maven-metadata.xml", dir_files_json2.getJSONObject(6).get("name")); + var dir_files_json2 = dir_json2.getArray("files"); + assertEquals(7, dir_files_json2.size()); + assertEquals("0.0.1", dir_files_json2.getObject(0).get("name")); + assertEquals("1.0.0", dir_files_json2.getObject(1).get("name")); + assertEquals("maven-metadata.xml.md5", dir_files_json2.getObject(2).get("name")); + assertEquals("maven-metadata.xml.sha1", dir_files_json2.getObject(3).get("name")); + assertEquals("maven-metadata.xml.sha256", dir_files_json2.getObject(4).get("name")); + assertEquals("maven-metadata.xml.sha512", dir_files_json2.getObject(5).get("name")); + assertEquals("maven-metadata.xml", dir_files_json2.getObject(6).get("name")); var maven_metadata2 = new Xml2MavenMetadata(); maven_metadata2.processXml(FileUtils.readString(new URL("http://localhost:8081/releases/test/pkg/myapp/maven-metadata.xml"))); @@ -256,35 +256,35 @@ public class TestPublishOperation { assertTrue(maven_metadata2.getVersions().contains(create_operation1.project().version())); assertTrue(maven_metadata2.getVersions().contains(create_operation2.project().version())); - var version_json1b = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/0.0.1"))); + var version_json1b = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/0.0.1"))); assertEquals("0.0.1", version_json1b.get("name")); - var version_files_json1b = version_json1b.getJSONArray("files"); - assertEquals(10, version_files_json1b.length()); - assertEquals("myapp-0.0.1.jar.md5", version_files_json1b.getJSONObject(0).get("name")); - assertEquals("myapp-0.0.1.jar.sha1", version_files_json1b.getJSONObject(1).get("name")); - assertEquals("myapp-0.0.1.jar.sha256", version_files_json1b.getJSONObject(2).get("name")); - assertEquals("myapp-0.0.1.jar.sha512", version_files_json1b.getJSONObject(3).get("name")); - assertEquals("myapp-0.0.1.jar", version_files_json1b.getJSONObject(4).get("name")); - assertEquals("myapp-0.0.1.pom.md5", version_files_json1b.getJSONObject(5).get("name")); - assertEquals("myapp-0.0.1.pom.sha1", version_files_json1b.getJSONObject(6).get("name")); - assertEquals("myapp-0.0.1.pom.sha256", version_files_json1b.getJSONObject(7).get("name")); - assertEquals("myapp-0.0.1.pom.sha512", version_files_json1b.getJSONObject(8).get("name")); - assertEquals("myapp-0.0.1.pom", version_files_json1b.getJSONObject(9).get("name")); + var version_files_json1b = version_json1b.getArray("files"); + assertEquals(10, version_files_json1b.size()); + assertEquals("myapp-0.0.1.jar.md5", version_files_json1b.getObject(0).get("name")); + assertEquals("myapp-0.0.1.jar.sha1", version_files_json1b.getObject(1).get("name")); + assertEquals("myapp-0.0.1.jar.sha256", version_files_json1b.getObject(2).get("name")); + assertEquals("myapp-0.0.1.jar.sha512", version_files_json1b.getObject(3).get("name")); + assertEquals("myapp-0.0.1.jar", version_files_json1b.getObject(4).get("name")); + assertEquals("myapp-0.0.1.pom.md5", version_files_json1b.getObject(5).get("name")); + assertEquals("myapp-0.0.1.pom.sha1", version_files_json1b.getObject(6).get("name")); + assertEquals("myapp-0.0.1.pom.sha256", version_files_json1b.getObject(7).get("name")); + assertEquals("myapp-0.0.1.pom.sha512", version_files_json1b.getObject(8).get("name")); + assertEquals("myapp-0.0.1.pom", version_files_json1b.getObject(9).get("name")); - var version_json2 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/1.0.0"))); + var version_json2 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/1.0.0"))); assertEquals("1.0.0", version_json2.get("name")); - var version_files_json2 = version_json2.getJSONArray("files"); - assertEquals(10, version_files_json2.length()); - assertEquals("myapp-1.0.0.jar.md5", version_files_json2.getJSONObject(0).get("name")); - assertEquals("myapp-1.0.0.jar.sha1", version_files_json2.getJSONObject(1).get("name")); - assertEquals("myapp-1.0.0.jar.sha256", version_files_json2.getJSONObject(2).get("name")); - assertEquals("myapp-1.0.0.jar.sha512", version_files_json2.getJSONObject(3).get("name")); - assertEquals("myapp-1.0.0.jar", version_files_json2.getJSONObject(4).get("name")); - assertEquals("myapp-1.0.0.pom.md5", version_files_json2.getJSONObject(5).get("name")); - assertEquals("myapp-1.0.0.pom.sha1", version_files_json2.getJSONObject(6).get("name")); - assertEquals("myapp-1.0.0.pom.sha256", version_files_json2.getJSONObject(7).get("name")); - assertEquals("myapp-1.0.0.pom.sha512", version_files_json2.getJSONObject(8).get("name")); - assertEquals("myapp-1.0.0.pom", version_files_json2.getJSONObject(9).get("name")); + var version_files_json2 = version_json2.getArray("files"); + assertEquals(10, version_files_json2.size()); + assertEquals("myapp-1.0.0.jar.md5", version_files_json2.getObject(0).get("name")); + assertEquals("myapp-1.0.0.jar.sha1", version_files_json2.getObject(1).get("name")); + assertEquals("myapp-1.0.0.jar.sha256", version_files_json2.getObject(2).get("name")); + assertEquals("myapp-1.0.0.jar.sha512", version_files_json2.getObject(3).get("name")); + assertEquals("myapp-1.0.0.jar", version_files_json2.getObject(4).get("name")); + assertEquals("myapp-1.0.0.pom.md5", version_files_json2.getObject(5).get("name")); + assertEquals("myapp-1.0.0.pom.sha1", version_files_json2.getObject(6).get("name")); + assertEquals("myapp-1.0.0.pom.sha256", version_files_json2.getObject(7).get("name")); + assertEquals("myapp-1.0.0.pom.sha512", version_files_json2.getObject(8).get("name")); + assertEquals("myapp-1.0.0.pom", version_files_json2.getObject(9).get("name")); process.destroy(); } finally { @@ -444,16 +444,16 @@ public class TestPublishOperation { .repositories(new Repository("http://localhost:8081/releases", "manager", "passwd")); publish_operation1.execute(); - var dir_json1 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); + var dir_json1 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); assertEquals("myapp", dir_json1.get("name")); - var dir_files_json1 = dir_json1.getJSONArray("files"); - assertEquals(6, dir_files_json1.length()); - assertEquals("1.2.3-SNAPSHOT", dir_files_json1.getJSONObject(0).get("name")); - assertEquals("maven-metadata.xml.md5", dir_files_json1.getJSONObject(1).get("name")); - assertEquals("maven-metadata.xml.sha1", dir_files_json1.getJSONObject(2).get("name")); - assertEquals("maven-metadata.xml.sha256", dir_files_json1.getJSONObject(3).get("name")); - assertEquals("maven-metadata.xml.sha512", dir_files_json1.getJSONObject(4).get("name")); - assertEquals("maven-metadata.xml", dir_files_json1.getJSONObject(5).get("name")); + var dir_files_json1 = dir_json1.getArray("files"); + assertEquals(6, dir_files_json1.size()); + assertEquals("1.2.3-SNAPSHOT", dir_files_json1.getObject(0).get("name")); + assertEquals("maven-metadata.xml.md5", dir_files_json1.getObject(1).get("name")); + assertEquals("maven-metadata.xml.sha1", dir_files_json1.getObject(2).get("name")); + assertEquals("maven-metadata.xml.sha256", dir_files_json1.getObject(3).get("name")); + assertEquals("maven-metadata.xml.sha512", dir_files_json1.getObject(4).get("name")); + assertEquals("maven-metadata.xml", dir_files_json1.getObject(5).get("name")); var maven_metadata1 = new Xml2MavenMetadata(); maven_metadata1.processXml(FileUtils.readString(new URL("http://localhost:8081/releases/test/pkg/myapp/maven-metadata.xml"))); @@ -465,25 +465,25 @@ public class TestPublishOperation { assertEquals(1, maven_metadata1.getVersions().size()); assertTrue(maven_metadata1.getVersions().contains(create_operation1.project().version())); - var version_json1 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/1.2.3-SNAPSHOT"))); + var version_json1 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/1.2.3-SNAPSHOT"))); assertEquals("1.2.3-SNAPSHOT", version_json1.get("name")); - var version_files_json1 = version_json1.getJSONArray("files"); - assertEquals(15, version_files_json1.length()); - assertEquals("maven-metadata.xml.md5", version_files_json1.getJSONObject(0).get("name")); - assertEquals("maven-metadata.xml.sha1", version_files_json1.getJSONObject(1).get("name")); - assertEquals("maven-metadata.xml.sha256", version_files_json1.getJSONObject(2).get("name")); - assertEquals("maven-metadata.xml.sha512", version_files_json1.getJSONObject(3).get("name")); - assertEquals("maven-metadata.xml", version_files_json1.getJSONObject(4).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.jar.md5", version_files_json1.getJSONObject(5).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.jar.sha1", version_files_json1.getJSONObject(6).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.jar.sha256", version_files_json1.getJSONObject(7).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.jar.sha512", version_files_json1.getJSONObject(8).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.jar", version_files_json1.getJSONObject(9).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.pom.md5", version_files_json1.getJSONObject(10).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.pom.sha1", version_files_json1.getJSONObject(11).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.pom.sha256", version_files_json1.getJSONObject(12).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.pom.sha512", version_files_json1.getJSONObject(13).get("name")); - assertEquals("myapp-1.2.3-20230329.225432-1.pom", version_files_json1.getJSONObject(14).get("name")); + var version_files_json1 = version_json1.getArray("files"); + assertEquals(15, version_files_json1.size()); + assertEquals("maven-metadata.xml.md5", version_files_json1.getObject(0).get("name")); + assertEquals("maven-metadata.xml.sha1", version_files_json1.getObject(1).get("name")); + assertEquals("maven-metadata.xml.sha256", version_files_json1.getObject(2).get("name")); + assertEquals("maven-metadata.xml.sha512", version_files_json1.getObject(3).get("name")); + assertEquals("maven-metadata.xml", version_files_json1.getObject(4).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.jar.md5", version_files_json1.getObject(5).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.jar.sha1", version_files_json1.getObject(6).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.jar.sha256", version_files_json1.getObject(7).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.jar.sha512", version_files_json1.getObject(8).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.jar", version_files_json1.getObject(9).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.pom.md5", version_files_json1.getObject(10).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.pom.sha1", version_files_json1.getObject(11).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.pom.sha256", version_files_json1.getObject(12).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.pom.sha512", version_files_json1.getObject(13).get("name")); + assertEquals("myapp-1.2.3-20230329.225432-1.pom", version_files_json1.getObject(14).get("name")); var maven_snapshot_metadata1 = new Xml2MavenMetadata(); maven_snapshot_metadata1.processXml(FileUtils.readString(new URL("http://localhost:8081/releases/test/pkg/myapp/1.2.3-SNAPSHOT/maven-metadata.xml"))); @@ -521,16 +521,16 @@ public class TestPublishOperation { .repositories(new Repository("http://localhost:8081/releases", "manager", "passwd")); publish_operation2.execute(); - var dir_json2 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); + var dir_json2 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp"))); assertEquals("myapp", dir_json2.get("name")); - var dir_files_json2 = dir_json2.getJSONArray("files"); - assertEquals(6, dir_files_json2.length()); - assertEquals("1.2.3-SNAPSHOT", dir_files_json2.getJSONObject(0).get("name")); - assertEquals("maven-metadata.xml.md5", dir_files_json2.getJSONObject(1).get("name")); - assertEquals("maven-metadata.xml.sha1", dir_files_json2.getJSONObject(2).get("name")); - assertEquals("maven-metadata.xml.sha256", dir_files_json2.getJSONObject(3).get("name")); - assertEquals("maven-metadata.xml.sha512", dir_files_json2.getJSONObject(4).get("name")); - assertEquals("maven-metadata.xml", dir_files_json2.getJSONObject(5).get("name")); + var dir_files_json2 = dir_json2.getArray("files"); + assertEquals(6, dir_files_json2.size()); + assertEquals("1.2.3-SNAPSHOT", dir_files_json2.getObject(0).get("name")); + assertEquals("maven-metadata.xml.md5", dir_files_json2.getObject(1).get("name")); + assertEquals("maven-metadata.xml.sha1", dir_files_json2.getObject(2).get("name")); + assertEquals("maven-metadata.xml.sha256", dir_files_json2.getObject(3).get("name")); + assertEquals("maven-metadata.xml.sha512", dir_files_json2.getObject(4).get("name")); + assertEquals("maven-metadata.xml", dir_files_json2.getObject(5).get("name")); var maven_metadata2 = new Xml2MavenMetadata(); maven_metadata2.processXml(FileUtils.readString(new URL("http://localhost:8081/releases/test/pkg/myapp/maven-metadata.xml"))); @@ -543,25 +543,25 @@ public class TestPublishOperation { assertTrue(maven_metadata2.getVersions().contains(create_operation1.project().version())); assertTrue(maven_metadata2.getVersions().contains(create_operation2.project().version())); - var version_json2 = new JSONObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/1.2.3-SNAPSHOT"))); + var version_json2 = Json.parseObject(FileUtils.readString(new URL("http://localhost:8081/api/maven/details/releases/test/pkg/myapp/1.2.3-SNAPSHOT"))); assertEquals("1.2.3-SNAPSHOT", version_json2.get("name")); - var version_files_json2 = version_json2.getJSONArray("files"); - assertEquals(15, version_files_json2.length()); - assertEquals("maven-metadata.xml.md5", version_files_json2.getJSONObject(0).get("name")); - assertEquals("maven-metadata.xml.sha1", version_files_json2.getJSONObject(1).get("name")); - assertEquals("maven-metadata.xml.sha256", version_files_json2.getJSONObject(2).get("name")); - assertEquals("maven-metadata.xml.sha512", version_files_json2.getJSONObject(3).get("name")); - assertEquals("maven-metadata.xml", version_files_json2.getJSONObject(4).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.jar.md5", version_files_json2.getJSONObject(5).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.jar.sha1", version_files_json2.getJSONObject(6).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.jar.sha256", version_files_json2.getJSONObject(7).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.jar.sha512", version_files_json2.getJSONObject(8).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.jar", version_files_json2.getJSONObject(9).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.pom.md5", version_files_json2.getJSONObject(10).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.pom.sha1", version_files_json2.getJSONObject(11).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.pom.sha256", version_files_json2.getJSONObject(12).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.pom.sha512", version_files_json2.getJSONObject(13).get("name")); - assertEquals("myapp-1.2.3-20230330.171729-2.pom", version_files_json2.getJSONObject(14).get("name")); + var version_files_json2 = version_json2.getArray("files"); + assertEquals(15, version_files_json2.size()); + assertEquals("maven-metadata.xml.md5", version_files_json2.getObject(0).get("name")); + assertEquals("maven-metadata.xml.sha1", version_files_json2.getObject(1).get("name")); + assertEquals("maven-metadata.xml.sha256", version_files_json2.getObject(2).get("name")); + assertEquals("maven-metadata.xml.sha512", version_files_json2.getObject(3).get("name")); + assertEquals("maven-metadata.xml", version_files_json2.getObject(4).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.jar.md5", version_files_json2.getObject(5).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.jar.sha1", version_files_json2.getObject(6).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.jar.sha256", version_files_json2.getObject(7).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.jar.sha512", version_files_json2.getObject(8).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.jar", version_files_json2.getObject(9).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.pom.md5", version_files_json2.getObject(10).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.pom.sha1", version_files_json2.getObject(11).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.pom.sha256", version_files_json2.getObject(12).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.pom.sha512", version_files_json2.getObject(13).get("name")); + assertEquals("myapp-1.2.3-20230330.171729-2.pom", version_files_json2.getObject(14).get("name")); var maven_snapshot_metadata2 = new Xml2MavenMetadata(); maven_snapshot_metadata2.processXml(FileUtils.readString(new URL("http://localhost:8081/releases/test/pkg/myapp/1.2.3-SNAPSHOT/maven-metadata.xml")));