Skip to content

Commit 942cd28

Browse files
gbevingbevin
committed
Updated to bld 1.7.5.
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.
1 parent 84a2bb3 commit 942cd28

File tree

7 files changed

+75
-67
lines changed

7 files changed

+75
-67
lines changed

‎.idea/libraries/bld.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core

‎lib/bld/bld-wrapper.jar

0 Bytes
Binary file not shown.

‎lib/bld/bld-wrapper.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
bld.downloadExtensionJavadoc=false
22
bld.downloadExtensionSources=true
3-
bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.2.4
4-
bld.extension-archive=com.uwyn.rife2:bld-archive:0.4.4
5-
bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.4
3+
bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.2.5
4+
bld.extension-archive=com.uwyn.rife2:bld-archive:0.4.5
5+
bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.5
66
bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
77
bld.downloadLocation=
88
bld.sourceDirectories=core/src/bld/java
9-
bld.version=1.7.4
9+
bld.version=1.7.5

‎src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName,
3838
downloadSources = true;
3939
repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
4040
scope(compile)
41-
.include(dependency("com.uwyn.rife2", "rife2", version(1,7,2)));
41+
.include(dependency("com.uwyn.rife2", "rife2", version(1,7,3)));
4242
scope(test)
4343
.include(dependency("org.jsoup", "jsoup", version(1,16,2)))
4444
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,0)))
4545
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,0)));
4646
scope(standalone)
47-
.include(dependency("org.eclipse.jetty", "jetty-server", version(11,0,15)))
48-
.include(dependency("org.eclipse.jetty", "jetty-servlet", version(11,0,15)))
47+
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,2)))
48+
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,2)))
4949
.include(dependency("org.slf4j", "slf4j-simple", version(2,0,9)));
5050

5151
precompileOperation().templateTypes(TemplateType.HTML);

‎src/main/resources/BLD_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.5-SNAPSHOT
1+
1.7.5

‎src/test/java/rife/bld/operations/TestCreateRife2Operation.java

Lines changed: 64 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,22 @@ void testExecute()
104104
/myapp/lib/compile/rife2-.+\\.jar
105105
/myapp/lib/runtime
106106
/myapp/lib/standalone
107-
/myapp/lib/standalone/jetty-http-11\\.0\\.15-sources\\.jar
108-
/myapp/lib/standalone/jetty-http-11\\.0\\.15\\.jar
109-
/myapp/lib/standalone/jetty-io-11\\.0\\.15-sources\\.jar
110-
/myapp/lib/standalone/jetty-io-11\\.0\\.15\\.jar
111-
/myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar
112-
/myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar
113-
/myapp/lib/standalone/jetty-security-11\\.0\\.15-sources\\.jar
114-
/myapp/lib/standalone/jetty-security-11\\.0\\.15\\.jar
115-
/myapp/lib/standalone/jetty-server-11\\.0\\.15-sources\\.jar
116-
/myapp/lib/standalone/jetty-server-11\\.0\\.15\\.jar
117-
/myapp/lib/standalone/jetty-servlet-11\\.0\\.15-sources\\.jar
118-
/myapp/lib/standalone/jetty-servlet-11\\.0\\.15\\.jar
119-
/myapp/lib/standalone/jetty-util-11\\.0\\.15-sources\\.jar
120-
/myapp/lib/standalone/jetty-util-11\\.0\\.15\\.jar
107+
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
108+
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar
109+
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar
110+
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2\\.jar
111+
/myapp/lib/standalone/jetty-http-12\\.0\\.2-sources\\.jar
112+
/myapp/lib/standalone/jetty-http-12\\.0\\.2\\.jar
113+
/myapp/lib/standalone/jetty-io-12\\.0\\.2-sources\\.jar
114+
/myapp/lib/standalone/jetty-io-12\\.0\\.2\\.jar
115+
/myapp/lib/standalone/jetty-security-12\\.0\\.2-sources\\.jar
116+
/myapp/lib/standalone/jetty-security-12\\.0\\.2\\.jar
117+
/myapp/lib/standalone/jetty-server-12\\.0\\.2-sources\\.jar
118+
/myapp/lib/standalone/jetty-server-12\\.0\\.2\\.jar
119+
/myapp/lib/standalone/jetty-session-12\\.0\\.2-sources\\.jar
120+
/myapp/lib/standalone/jetty-session-12\\.0\\.2\\.jar
121+
/myapp/lib/standalone/jetty-util-12\\.0\\.2-sources\\.jar
122+
/myapp/lib/standalone/jetty-util-12\\.0\\.2\\.jar
121123
/myapp/lib/standalone/slf4j-api-2\\.0\\.9-sources\\.jar
122124
/myapp/lib/standalone/slf4j-api-2\\.0\\.9\\.jar
123125
/myapp/lib/standalone/slf4j-simple-2\\.0\\.9-sources\\.jar
@@ -215,20 +217,22 @@ void testExecute()
215217
/myapp/lib/compile/rife2-.+\\.jar
216218
/myapp/lib/runtime
217219
/myapp/lib/standalone
218-
/myapp/lib/standalone/jetty-http-11\\.0\\.15-sources\\.jar
219-
/myapp/lib/standalone/jetty-http-11\\.0\\.15\\.jar
220-
/myapp/lib/standalone/jetty-io-11\\.0\\.15-sources\\.jar
221-
/myapp/lib/standalone/jetty-io-11\\.0\\.15\\.jar
222-
/myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar
223-
/myapp/lib/standalone/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar
224-
/myapp/lib/standalone/jetty-security-11\\.0\\.15-sources\\.jar
225-
/myapp/lib/standalone/jetty-security-11\\.0\\.15\\.jar
226-
/myapp/lib/standalone/jetty-server-11\\.0\\.15-sources\\.jar
227-
/myapp/lib/standalone/jetty-server-11\\.0\\.15\\.jar
228-
/myapp/lib/standalone/jetty-servlet-11\\.0\\.15-sources\\.jar
229-
/myapp/lib/standalone/jetty-servlet-11\\.0\\.15\\.jar
230-
/myapp/lib/standalone/jetty-util-11\\.0\\.15-sources\\.jar
231-
/myapp/lib/standalone/jetty-util-11\\.0\\.15\\.jar
220+
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
221+
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar
222+
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar
223+
/myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.2\\.jar
224+
/myapp/lib/standalone/jetty-http-12\\.0\\.2-sources\\.jar
225+
/myapp/lib/standalone/jetty-http-12\\.0\\.2\\.jar
226+
/myapp/lib/standalone/jetty-io-12\\.0\\.2-sources\\.jar
227+
/myapp/lib/standalone/jetty-io-12\\.0\\.2\\.jar
228+
/myapp/lib/standalone/jetty-security-12\\.0\\.2-sources\\.jar
229+
/myapp/lib/standalone/jetty-security-12\\.0\\.2\\.jar
230+
/myapp/lib/standalone/jetty-server-12\\.0\\.2-sources\\.jar
231+
/myapp/lib/standalone/jetty-server-12\\.0\\.2\\.jar
232+
/myapp/lib/standalone/jetty-session-12\\.0\\.2-sources\\.jar
233+
/myapp/lib/standalone/jetty-session-12\\.0\\.2\\.jar
234+
/myapp/lib/standalone/jetty-util-12\\.0\\.2-sources\\.jar
235+
/myapp/lib/standalone/jetty-util-12\\.0\\.2\\.jar
232236
/myapp/lib/standalone/slf4j-api-2\\.0\\.9-sources\\.jar
233237
/myapp/lib/standalone/slf4j-api-2\\.0\\.9\\.jar
234238
/myapp/lib/standalone/slf4j-simple-2\\.0\\.9-sources\\.jar
@@ -464,20 +468,22 @@ void testExecuteLocalDependencies()
464468
/myapp/lib/local
465469
/myapp/lib/local/apiguardian-api-1\\.1\\.2-sources\\.jar
466470
/myapp/lib/local/apiguardian-api-1\\.1\\.2\\.jar
467-
/myapp/lib/local/jetty-http-11\\.0\\.15-sources\\.jar
468-
/myapp/lib/local/jetty-http-11\\.0\\.15\\.jar
469-
/myapp/lib/local/jetty-io-11\\.0\\.15-sources\\.jar
470-
/myapp/lib/local/jetty-io-11\\.0\\.15\\.jar
471-
/myapp/lib/local/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar
472-
/myapp/lib/local/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar
473-
/myapp/lib/local/jetty-security-11\\.0\\.15-sources\\.jar
474-
/myapp/lib/local/jetty-security-11\\.0\\.15\\.jar
475-
/myapp/lib/local/jetty-server-11\\.0\\.15-sources\\.jar
476-
/myapp/lib/local/jetty-server-11\\.0\\.15\\.jar
477-
/myapp/lib/local/jetty-servlet-11\\.0\\.15-sources\\.jar
478-
/myapp/lib/local/jetty-servlet-11\\.0\\.15\\.jar
479-
/myapp/lib/local/jetty-util-11\\.0\\.15-sources\\.jar
480-
/myapp/lib/local/jetty-util-11\\.0\\.15\\.jar
471+
/myapp/lib/local/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
472+
/myapp/lib/local/jakarta\\.servlet-api-6\\.0\\.0\\.jar
473+
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar
474+
/myapp/lib/local/jetty-ee10-servlet-12\\.0\\.2\\.jar
475+
/myapp/lib/local/jetty-http-12\\.0\\.2-sources\\.jar
476+
/myapp/lib/local/jetty-http-12\\.0\\.2\\.jar
477+
/myapp/lib/local/jetty-io-12\\.0\\.2-sources\\.jar
478+
/myapp/lib/local/jetty-io-12\\.0\\.2\\.jar
479+
/myapp/lib/local/jetty-security-12\\.0\\.2-sources\\.jar
480+
/myapp/lib/local/jetty-security-12\\.0\\.2\\.jar
481+
/myapp/lib/local/jetty-server-12\\.0\\.2-sources\\.jar
482+
/myapp/lib/local/jetty-server-12\\.0\\.2\\.jar
483+
/myapp/lib/local/jetty-session-12\\.0\\.2-sources\\.jar
484+
/myapp/lib/local/jetty-session-12\\.0\\.2\\.jar
485+
/myapp/lib/local/jetty-util-12\\.0\\.2-sources\\.jar
486+
/myapp/lib/local/jetty-util-12\\.0\\.2\\.jar
481487
/myapp/lib/local/jsoup-1\\.16\\.2-sources\\.jar
482488
/myapp/lib/local/jsoup-1\\.16\\.2\\.jar
483489
/myapp/lib/local/junit-jupiter-5\\.10\\.0-sources\\.jar
@@ -630,20 +636,22 @@ void testExecuteLocalDependenciesFolders()
630636
/myapp/lib/local_compile/rife2-.*-sources\\.jar
631637
/myapp/lib/local_compile/rife2-.*\\.jar
632638
/myapp/lib/local_standalone
633-
/myapp/lib/local_standalone/jetty-http-11\\.0\\.15-sources\\.jar
634-
/myapp/lib/local_standalone/jetty-http-11\\.0\\.15\\.jar
635-
/myapp/lib/local_standalone/jetty-io-11\\.0\\.15-sources\\.jar
636-
/myapp/lib/local_standalone/jetty-io-11\\.0\\.15\\.jar
637-
/myapp/lib/local_standalone/jetty-jakarta-servlet-api-5\\.0\\.2-sources\\.jar
638-
/myapp/lib/local_standalone/jetty-jakarta-servlet-api-5\\.0\\.2\\.jar
639-
/myapp/lib/local_standalone/jetty-security-11\\.0\\.15-sources\\.jar
640-
/myapp/lib/local_standalone/jetty-security-11\\.0\\.15\\.jar
641-
/myapp/lib/local_standalone/jetty-server-11\\.0\\.15-sources\\.jar
642-
/myapp/lib/local_standalone/jetty-server-11\\.0\\.15\\.jar
643-
/myapp/lib/local_standalone/jetty-servlet-11\\.0\\.15-sources\\.jar
644-
/myapp/lib/local_standalone/jetty-servlet-11\\.0\\.15\\.jar
645-
/myapp/lib/local_standalone/jetty-util-11\\.0\\.15-sources\\.jar
646-
/myapp/lib/local_standalone/jetty-util-11\\.0\\.15\\.jar
639+
/myapp/lib/local_standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
640+
/myapp/lib/local_standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar
641+
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.2-sources\\.jar
642+
/myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.2\\.jar
643+
/myapp/lib/local_standalone/jetty-http-12\\.0\\.2-sources\\.jar
644+
/myapp/lib/local_standalone/jetty-http-12\\.0\\.2\\.jar
645+
/myapp/lib/local_standalone/jetty-io-12\\.0\\.2-sources\\.jar
646+
/myapp/lib/local_standalone/jetty-io-12\\.0\\.2\\.jar
647+
/myapp/lib/local_standalone/jetty-security-12\\.0\\.2-sources\\.jar
648+
/myapp/lib/local_standalone/jetty-security-12\\.0\\.2\\.jar
649+
/myapp/lib/local_standalone/jetty-server-12\\.0\\.2-sources\\.jar
650+
/myapp/lib/local_standalone/jetty-server-12\\.0\\.2\\.jar
651+
/myapp/lib/local_standalone/jetty-session-12\\.0\\.2-sources\\.jar
652+
/myapp/lib/local_standalone/jetty-session-12\\.0\\.2\\.jar
653+
/myapp/lib/local_standalone/jetty-util-12\\.0\\.2-sources\\.jar
654+
/myapp/lib/local_standalone/jetty-util-12\\.0\\.2\\.jar
647655
/myapp/lib/local_standalone/slf4j-api-2\\.0\\.9-sources\\.jar
648656
/myapp/lib/local_standalone/slf4j-api-2\\.0\\.9\\.jar
649657
/myapp/lib/local_standalone/slf4j-simple-2\\.0\\.9-sources\\.jar

0 commit comments

Comments
 (0)