diff --git a/core b/core index a8d2310..8da01bc 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a8d2310f8493200d7d776bc542fa0233a6eb4d0f +Subproject commit 8da01bc09c704aaeaa7c6ad1aa671dd4913c0276 diff --git a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java index 1cbf461..2149fdf 100644 --- a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java @@ -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; @@ -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); diff --git a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java index 37b143f..c2b51d5 100644 --- a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java +++ b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java @@ -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 @@ -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 @@ -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 @@ -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