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

Updated to bld 1.7.5.

Browse source 
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.
This commit is contained in:
Geert Bevin 2023-10-20 17:24:28 -04:00
parent 84a2bb337d
commit 942cd28468
7 changed files with 75 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.idea/libraries/bld.xml generated
View file

@ -2,11 +2,11 @@
<library name="bld">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.4.jar!/" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.4-sources.jar!/" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.5-sources.jar!/" />
</SOURCES>
<excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

2
core

@ -1 +1 @@
Subproject commit e6b9a55e2e98a2889229fb9c030fc7a35bf682f4
Subproject commit c43ee03d3e3d1eb8fe0fdb6beb49d71e89eb65b2

BIN
lib/bld/bld-wrapper.jar
View file

Binary file not shown.

8
lib/bld/bld-wrapper.properties
View file

@ -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
src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
View file

@ -38,14 +38,14 @@ public class Rife2ProjectBlueprint extends WebProject {
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);

2
src/main/resources/BLD_VERSION
View file

@ -1 +1 @@
1.7.5-SNAPSHOT
1.7.5

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

@ -104,20 +104,22 @@ public class TestCreateRife2Operation {
/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
@ -215,20 +217,22 @@ public class TestCreateRife2Operation {
/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
@ -464,20 +468,22 @@ public class TestCreateRife2Operation {
/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
@ -630,20 +636,22 @@ public class TestCreateRife2Operation {
/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