Skip to content

Commit

Permalink
Updated to bld 1.7.5.
Browse files Browse the repository at this point in the history 
Updated to latest RIFE2/core with updated dependencies.
Updated version to 1.7.5.
Updated RIFE2 project blueprint to use v1.7.3 and related dependencies.
  • Loading branch information
@gbevin
gbevin committed Oct 20, 2023
1 parent 84a2bb3 commit 942cd28
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 67 deletions.
4 changes: 2 additions & 2 deletions .idea/libraries/bld.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core
Submodule core updated 4 files
+2 −2 .idea/libraries/bld.xml
+ − lib/bld/bld-wrapper.jar
+3 −3 lib/bld/bld-wrapper.properties
+1 −1 src/main/resources/CORE_VERSION
Binary file modified lib/bld/bld-wrapper.jar
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions lib/bld/bld-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -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
bld.version=1.7.5
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 @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/BLD_VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.5-SNAPSHOT
1.7.5
120 changes: 64 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 @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 942cd28

Please sign in to comment.