diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 3e5e13c..cf75013 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,11 @@ - + - + diff --git a/core b/core index e6b9a55..c43ee03 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit e6b9a55e2e98a2889229fb9c030fc7a35bf682f4 +Subproject commit c43ee03d3e3d1eb8fe0fdb6beb49d71e89eb65b2 diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index fe3f4e7..4eca521 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 43bf8f3..e645d2b 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,9 +1,9 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.2.4 -bld.extension-archive=com.uwyn.rife2:bld-archive:0.4.4 -bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.4 +bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.2.5 +bld.extension-archive=com.uwyn.rife2:bld-archive:0.4.5 +bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.5 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories=core/src/bld/java -bld.version=1.7.4 \ No newline at end of file +bld.version=1.7.5 \ 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 a7da02c..cb03bd5 100644 --- a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java @@ -38,14 +38,14 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName, downloadSources = true; repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); scope(compile) - .include(dependency("com.uwyn.rife2", "rife2", version(1,7,2))); + .include(dependency("com.uwyn.rife2", "rife2", version(1,7,3))); scope(test) .include(dependency("org.jsoup", "jsoup", version(1,16,2))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,0))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,0))); scope(standalone) - .include(dependency("org.eclipse.jetty", "jetty-server", version(11,0,15))) - .include(dependency("org.eclipse.jetty", "jetty-servlet", version(11,0,15))) + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,2))) + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,2))) .include(dependency("org.slf4j", "slf4j-simple", version(2,0,9))); precompileOperation().templateTypes(TemplateType.HTML); diff --git a/src/main/resources/BLD_VERSION b/src/main/resources/BLD_VERSION index fc42daf..5849151 100644 --- a/src/main/resources/BLD_VERSION +++ b/src/main/resources/BLD_VERSION @@ -1 +1 @@ -1.7.5-SNAPSHOT \ No newline at end of file +1.7.5 \ No newline at end of file diff --git a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java index 5ef45de..4d258c7 100644 --- a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java +++ b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java @@ -104,20 +104,22 @@ void testExecute() /myapp/lib/compile/rife2-.+\\.jar /myapp/lib/runtime /myapp/lib/standalone - /myapp/lib/standalone/jetty-http-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-http-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-io-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-io-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar - /myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar - /myapp/lib/standalone/jetty-security-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-security-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-server-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-server-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-servlet-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-servlet-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-util-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-util-11\\.0\\.15\\.jar + /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar + /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.2\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.9-sources\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.9\\.jar /myapp/lib/standalone/slf4j-simple-2\\.0\\.9-sources\\.jar @@ -215,20 +217,22 @@ void testExecute() /myapp/lib/compile/rife2-.+\\.jar /myapp/lib/runtime /myapp/lib/standalone - /myapp/lib/standalone/jetty-http-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-http-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-io-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-io-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar - /myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar - /myapp/lib/standalone/jetty-security-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-security-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-server-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-server-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-servlet-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-servlet-11\\.0\\.15\\.jar - /myapp/lib/standalone/jetty-util-11\\.0\\.15-sources\\.jar - /myapp/lib/standalone/jetty-util-11\\.0\\.15\\.jar + /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar + /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.2\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.2-sources\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.2\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.9-sources\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.9\\.jar /myapp/lib/standalone/slf4j-simple-2\\.0\\.9-sources\\.jar @@ -464,20 +468,22 @@ void testExecuteLocalDependencies() /myapp/lib/local /myapp/lib/local/apiguardian-api-1\\.1\\.2-sources\\.jar /myapp/lib/local/apiguardian-api-1\\.1\\.2\\.jar - /myapp/lib/local/jetty-http-11\\.0\\.15-sources\\.jar - /myapp/lib/local/jetty-http-11\\.0\\.15\\.jar - /myapp/lib/local/jetty-io-11\\.0\\.15-sources\\.jar - /myapp/lib/local/jetty-io-11\\.0\\.15\\.jar - /myapp/lib/local/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar - /myapp/lib/local/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar - /myapp/lib/local/jetty-security-11\\.0\\.15-sources\\.jar - /myapp/lib/local/jetty-security-11\\.0\\.15\\.jar - /myapp/lib/local/jetty-server-11\\.0\\.15-sources\\.jar - /myapp/lib/local/jetty-server-11\\.0\\.15\\.jar - /myapp/lib/local/jetty-servlet-11\\.0\\.15-sources\\.jar - /myapp/lib/local/jetty-servlet-11\\.0\\.15\\.jar - /myapp/lib/local/jetty-util-11\\.0\\.15-sources\\.jar - /myapp/lib/local/jetty-util-11\\.0\\.15\\.jar + /myapp/lib/local/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar + /myapp/lib/local/jakarta\\.servlet-api-6\\.0\\.0\\.jar + /myapp/lib/local/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar + /myapp/lib/local/jetty-ee10-servlet-12\\.0\\.2\\.jar + /myapp/lib/local/jetty-http-12\\.0\\.2-sources\\.jar + /myapp/lib/local/jetty-http-12\\.0\\.2\\.jar + /myapp/lib/local/jetty-io-12\\.0\\.2-sources\\.jar + /myapp/lib/local/jetty-io-12\\.0\\.2\\.jar + /myapp/lib/local/jetty-security-12\\.0\\.2-sources\\.jar + /myapp/lib/local/jetty-security-12\\.0\\.2\\.jar + /myapp/lib/local/jetty-server-12\\.0\\.2-sources\\.jar + /myapp/lib/local/jetty-server-12\\.0\\.2\\.jar + /myapp/lib/local/jetty-session-12\\.0\\.2-sources\\.jar + /myapp/lib/local/jetty-session-12\\.0\\.2\\.jar + /myapp/lib/local/jetty-util-12\\.0\\.2-sources\\.jar + /myapp/lib/local/jetty-util-12\\.0\\.2\\.jar /myapp/lib/local/jsoup-1\\.16\\.2-sources\\.jar /myapp/lib/local/jsoup-1\\.16\\.2\\.jar /myapp/lib/local/junit-jupiter-5\\.10\\.0-sources\\.jar @@ -630,20 +636,22 @@ void testExecuteLocalDependenciesFolders() /myapp/lib/local_compile/rife2-.*-sources\\.jar /myapp/lib/local_compile/rife2-.*\\.jar /myapp/lib/local_standalone - /myapp/lib/local_standalone/jetty-http-11\\.0\\.15-sources\\.jar - /myapp/lib/local_standalone/jetty-http-11\\.0\\.15\\.jar - /myapp/lib/local_standalone/jetty-io-11\\.0\\.15-sources\\.jar - /myapp/lib/local_standalone/jetty-io-11\\.0\\.15\\.jar - /myapp/lib/local_standalone/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar - /myapp/lib/local_standalone/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar - /myapp/lib/local_standalone/jetty-security-11\\.0\\.15-sources\\.jar - /myapp/lib/local_standalone/jetty-security-11\\.0\\.15\\.jar - /myapp/lib/local_standalone/jetty-server-11\\.0\\.15-sources\\.jar - /myapp/lib/local_standalone/jetty-server-11\\.0\\.15\\.jar - /myapp/lib/local_standalone/jetty-servlet-11\\.0\\.15-sources\\.jar - /myapp/lib/local_standalone/jetty-servlet-11\\.0\\.15\\.jar - /myapp/lib/local_standalone/jetty-util-11\\.0\\.15-sources\\.jar - /myapp/lib/local_standalone/jetty-util-11\\.0\\.15\\.jar + /myapp/lib/local_standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar + /myapp/lib/local_standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar + /myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar + /myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.2\\.jar + /myapp/lib/local_standalone/jetty-http-12\\.0\\.2-sources\\.jar + /myapp/lib/local_standalone/jetty-http-12\\.0\\.2\\.jar + /myapp/lib/local_standalone/jetty-io-12\\.0\\.2-sources\\.jar + /myapp/lib/local_standalone/jetty-io-12\\.0\\.2\\.jar + /myapp/lib/local_standalone/jetty-security-12\\.0\\.2-sources\\.jar + /myapp/lib/local_standalone/jetty-security-12\\.0\\.2\\.jar + /myapp/lib/local_standalone/jetty-server-12\\.0\\.2-sources\\.jar + /myapp/lib/local_standalone/jetty-server-12\\.0\\.2\\.jar + /myapp/lib/local_standalone/jetty-session-12\\.0\\.2-sources\\.jar + /myapp/lib/local_standalone/jetty-session-12\\.0\\.2\\.jar + /myapp/lib/local_standalone/jetty-util-12\\.0\\.2-sources\\.jar + /myapp/lib/local_standalone/jetty-util-12\\.0\\.2\\.jar /myapp/lib/local_standalone/slf4j-api-2\\.0\\.9-sources\\.jar /myapp/lib/local_standalone/slf4j-api-2\\.0\\.9\\.jar /myapp/lib/local_standalone/slf4j-simple-2\\.0\\.9-sources\\.jar