Skip to content

Commit

Permalink
Updated RIFE2 project creation to use RIFE2 v1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbevin
gbevin committed Jul 12, 2024
1 parent 5ced931 commit ad15ff5
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 59 deletions.
6 changes: 3 additions & 3 deletions src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,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,3)));
.include(dependency("com.uwyn.rife2", "rife2", version(1,8,0)));
scope(test)
.include(dependency("org.jsoup", "jsoup", version(1,17,2)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,3)));
scope(standalone)
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,10)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,10)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,11)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,11)))
.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\\.10-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.11\\.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\\.10-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.10-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.10\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-http-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-io-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-security-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-server-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-session-12\\.0\\.11\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.11-sources\\.jar
/myapp/lib/standalone/jetty-util-12\\.0\\.11\\.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\\.10-sources\\.jar
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.10\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.10-sources\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.10\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.10-sources\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.10\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.10-sources\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.10\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.10-sources\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.10\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.10-sources\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.10\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.10-sources\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.10\\.jar
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.11-sources\\.jar
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.11\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.11-sources\\.jar
/myapp/lib/local/jetty-http-12\\.0\\.11\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.11-sources\\.jar
/myapp/lib/local/jetty-io-12\\.0\\.11\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.11-sources\\.jar
/myapp/lib/local/jetty-security-12\\.0\\.11\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.11-sources\\.jar
/myapp/lib/local/jetty-server-12\\.0\\.11\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.11-sources\\.jar
/myapp/lib/local/jetty-session-12\\.0\\.11\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.11-sources\\.jar
/myapp/lib/local/jetty-util-12\\.0\\.11\\.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\\.3-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\\.10-sources\\.jar
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.10\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.10-sources\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.10\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.10-sources\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.10\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.10-sources\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.10\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.10-sources\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.10\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.10-sources\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.10\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.10-sources\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.10\\.jar
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.11-sources\\.jar
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.11\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.11-sources\\.jar
/myapp/lib/local_standalone/jetty-http-12\\.0\\.11\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.11-sources\\.jar
/myapp/lib/local_standalone/jetty-io-12\\.0\\.11\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.11-sources\\.jar
/myapp/lib/local_standalone/jetty-security-12\\.0\\.11\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.11-sources\\.jar
/myapp/lib/local_standalone/jetty-server-12\\.0\\.11\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.11-sources\\.jar
/myapp/lib/local_standalone/jetty-session-12\\.0\\.11\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.11-sources\\.jar
/myapp/lib/local_standalone/jetty-util-12\\.0\\.11\\.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 ad15ff5

Please sign in to comment.