rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 00:07:12 -07:00
Code Activity

Fixed RIFE2 project bld tests with jetty 12.0.9

Browse source
This commit is contained in:
Geert Bevin 2024-05-30 17:57:57 -04:00
parent abf84256a5
commit a30b290c0d
3 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core

@ -1 +1 @@
Subproject commit a8d2310f8493200d7d776bc542fa0233a6eb4d0f
Subproject commit 8da01bc09c704aaeaa7c6ad1aa671dd4913c0276

5
src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
View file

@ -33,6 +33,7 @@ public class Rife2ProjectBlueprint extends WebProject {
pkg = packageName;
name = projectName;
mainClass = packageName + "." + StringUtils.capitalize(projectName) + "Site";
uberJarMainClass = mainClass + "Uber";
version = versionNumber;
downloadSources = true;
@ -44,8 +45,8 @@ public class Rife2ProjectBlueprint extends WebProject {
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,2)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,2)));
scope(standalone)
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,6)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,6)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,9)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,9)))
.include(dependency("org.slf4j", "slf4j-simple", version(2,0,13)));
precompileOperation().templateTypes(TemplateType.HTML);

112
src/test/java/rife/bld/operations/TestCreateRife2Operation.java
View file

@ -107,20 +107,20 @@ public class TestCreateRife2Operation {
/myapp/lib/standalone
/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\\.6-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.9\\.jar
/myapp/lib/standalone/slf4j-api-2\\.0\\.13-sources\\.jar
/myapp/lib/standalone/slf4j-api-2\\.0\\.13\\.jar
/myapp/lib/standalone/slf4j-simple-2\\.0\\.13-sources\\.jar
@ -221,20 +221,20 @@ public class TestCreateRife2Operation {
/myapp/lib/standalone
/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\\.6-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.6-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.6\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.9\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.9-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.9\\.jar
/myapp/lib/standalone/slf4j-api-2\\.0\\.13-sources\\.jar
/myapp/lib/standalone/slf4j-api-2\\.0\\.13\\.jar
/myapp/lib/standalone/slf4j-simple-2\\.0\\.13-sources\\.jar
@ -473,20 +473,20 @@ public class TestCreateRife2Operation {
/myapp/lib/local/apiguardian-api-1\\.1\\.2\\.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\\.6-sources\\.jar
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.6\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.6-sources\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.6\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.6-sources\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.6\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.6-sources\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.6\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.6-sources\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.6\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.6-sources\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.6\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.6-sources\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.6\\.jar
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.9-sources\\.jar
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.9\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.9-sources\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.9\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.9-sources\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.9\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.9-sources\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.9\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.9-sources\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.9\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.9-sources\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.9\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.9-sources\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.9\\.jar
/myapp/lib/local/jsoup-1\\.17\\.2-sources\\.jar
/myapp/lib/local/jsoup-1\\.17\\.2\\.jar
/myapp/lib/local/junit-jupiter-5\\.10\\.2-sources\\.jar
@ -642,20 +642,20 @@ public class TestCreateRife2Operation {
/myapp/lib/local_standalone
/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\\.6-sources\\.jar
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.6\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.6-sources\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.6\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.6-sources\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.6\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.6-sources\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.6\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.6-sources\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.6\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.6-sources\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.6\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.6-sources\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.6\\.jar
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.9-sources\\.jar
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.9\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.9-sources\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.9\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.9-sources\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.9\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.9-sources\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.9\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.9-sources\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.9\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.9-sources\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.9\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.9-sources\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.9\\.jar
/myapp/lib/local_standalone/slf4j-api-2\\.0\\.13-sources\\.jar
/myapp/lib/local_standalone/slf4j-api-2\\.0\\.13\\.jar
/myapp/lib/local_standalone/slf4j-simple-2\\.0\\.13-sources\\.jar