Skip to content

Commit

Permalink
Fixed RIFE2 project bld tests with jetty 12.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbevin
gbevin committed May 30, 2024
1 parent abf8425 commit a30b290
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 59 deletions.
2 changes: 1 addition & 1 deletion core
Submodule core updated 1 files
+2 −2 src/bld/java/rife/AbstractRife2Build.java
5 changes: 3 additions & 2 deletions src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName,
pkg = packageName;
name = projectName;
mainClass = packageName + "." + StringUtils.capitalize(projectName) + "Site";
uberJarMainClass = mainClass + "Uber";
version = versionNumber;

downloadSources = true;
Expand All @@ -44,8 +45,8 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName,
.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);
Expand Down
112 changes: 56 additions & 56 deletions src/test/java/rife/bld/operations/TestCreateRife2Operation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,20 @@ void testExecute()
/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
Expand Down Expand Up @@ -221,20 +221,20 @@ void testExecute()
/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
Expand Down Expand Up @@ -473,20 +473,20 @@ void testExecuteLocalDependencies()
/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
Expand Down Expand Up @@ -642,20 +642,20 @@ void testExecuteLocalDependenciesFolders()
/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
Expand Down

0 comments on commit a30b290

Please sign in to comment.