Updated to latest dependencies in blueprints, updated to latest RIFE2…

…/core
rife2 · Jan 31, 2024 · c9bcbc0 · c9bcbc0
1 parent f6d2265
commit c9bcbc0
Show file tree

Hide file tree

Showing 5 changed files with 192 additions and 192 deletions.
diff --git a/core b/core
diff --git a/src/main/java/rife/bld/blueprints/BlankProjectBlueprint.java b/src/main/java/rife/bld/blueprints/BlankProjectBlueprint.java
@@ -37,7 +37,7 @@ public BlankProjectBlueprint(File work, String packageName, String projectName,
         downloadSources = true;
         repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
         scope(test)
-            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,0)))
-            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,0)));
+            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,1)))
+            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,1)));
     }
 }
diff --git a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
@@ -41,12 +41,12 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName,
             .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)));
+            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,1)))
+            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,1)));
         scope(standalone)
-            .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)));
+            .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,5)))
+            .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,5)))
+            .include(dependency("org.slf4j", "slf4j-simple", version(2,0,11)));
 
         precompileOperation().templateTypes(TemplateType.HTML);
     }

diff --git a/src/test/java/rife/bld/operations/TestCreateBlankOperation.java b/src/test/java/rife/bld/operations/TestCreateBlankOperation.java
@@ -100,20 +100,20 @@ void testExecute()
                     /myapp/lib/test
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2\\.jar
-                    /myapp/lib/test/junit-jupiter-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-platform-commons-1\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-platform-commons-1\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-platform-engine-1\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-platform-engine-1\\.10\\.0\\.jar
+                    /myapp/lib/test/junit-jupiter-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-platform-commons-1\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-platform-commons-1\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-platform-engine-1\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-platform-engine-1\\.10\\.1\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                     /myapp/src
@@ -180,20 +180,20 @@ void testExecute()
                     /myapp/lib/test
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2\\.jar
-                    /myapp/lib/test/junit-jupiter-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-platform-commons-1\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-platform-commons-1\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.0\\.jar
-                    /myapp/lib/test/junit-platform-engine-1\\.10\\.0-sources\\.jar
-                    /myapp/lib/test/junit-platform-engine-1\\.10\\.0\\.jar
+                    /myapp/lib/test/junit-jupiter-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-api-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-engine-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-jupiter-params-5\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-platform-commons-1\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-platform-commons-1\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.1\\.jar
+                    /myapp/lib/test/junit-platform-engine-1\\.10\\.1-sources\\.jar
+                    /myapp/lib/test/junit-platform-engine-1\\.10\\.1\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                     /myapp/src
@@ -377,20 +377,20 @@ 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/junit-jupiter-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local/junit-jupiter-5\\.10\\.0\\.jar
-                /myapp/lib/local/junit-jupiter-api-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local/junit-jupiter-api-5\\.10\\.0\\.jar
-                /myapp/lib/local/junit-jupiter-engine-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local/junit-jupiter-engine-5\\.10\\.0\\.jar
-                /myapp/lib/local/junit-jupiter-params-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local/junit-jupiter-params-5\\.10\\.0\\.jar
-                /myapp/lib/local/junit-platform-commons-1\\.10\\.0-sources\\.jar
-                /myapp/lib/local/junit-platform-commons-1\\.10\\.0\\.jar
-                /myapp/lib/local/junit-platform-console-standalone-1\\.10\\.0-sources\\.jar
-                /myapp/lib/local/junit-platform-console-standalone-1\\.10\\.0\\.jar
-                /myapp/lib/local/junit-platform-engine-1\\.10\\.0-sources\\.jar
-                /myapp/lib/local/junit-platform-engine-1\\.10\\.0\\.jar
+                /myapp/lib/local/junit-jupiter-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local/junit-jupiter-5\\.10\\.1\\.jar
+                /myapp/lib/local/junit-jupiter-api-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local/junit-jupiter-api-5\\.10\\.1\\.jar
+                /myapp/lib/local/junit-jupiter-engine-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local/junit-jupiter-engine-5\\.10\\.1\\.jar
+                /myapp/lib/local/junit-jupiter-params-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local/junit-jupiter-params-5\\.10\\.1\\.jar
+                /myapp/lib/local/junit-platform-commons-1\\.10\\.1-sources\\.jar
+                /myapp/lib/local/junit-platform-commons-1\\.10\\.1\\.jar
+                /myapp/lib/local/junit-platform-console-standalone-1\\.10\\.1-sources\\.jar
+                /myapp/lib/local/junit-platform-console-standalone-1\\.10\\.1\\.jar
+                /myapp/lib/local/junit-platform-engine-1\\.10\\.1-sources\\.jar
+                /myapp/lib/local/junit-platform-engine-1\\.10\\.1\\.jar
                 /myapp/lib/local/opentest4j-1\\.3\\.0-sources\\.jar
                 /myapp/lib/local/opentest4j-1\\.3\\.0\\.jar
                 /myapp/lib/provided
@@ -499,20 +499,20 @@ void testExecuteLocalDependenciesFolders()
                 /myapp/lib/local_test
                 /myapp/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar
                 /myapp/lib/local_test/apiguardian-api-1\\.1\\.2\\.jar
-                /myapp/lib/local_test/junit-jupiter-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local_test/junit-jupiter-5\\.10\\.0\\.jar
-                /myapp/lib/local_test/junit-jupiter-api-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local_test/junit-jupiter-api-5\\.10\\.0\\.jar
-                /myapp/lib/local_test/junit-jupiter-engine-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local_test/junit-jupiter-engine-5\\.10\\.0\\.jar
-                /myapp/lib/local_test/junit-jupiter-params-5\\.10\\.0-sources\\.jar
-                /myapp/lib/local_test/junit-jupiter-params-5\\.10\\.0\\.jar
-                /myapp/lib/local_test/junit-platform-commons-1\\.10\\.0-sources\\.jar
-                /myapp/lib/local_test/junit-platform-commons-1\\.10\\.0\\.jar
-                /myapp/lib/local_test/junit-platform-console-standalone-1\\.10\\.0-sources\\.jar
-                /myapp/lib/local_test/junit-platform-console-standalone-1\\.10\\.0\\.jar
-                /myapp/lib/local_test/junit-platform-engine-1\\.10\\.0-sources\\.jar
-                /myapp/lib/local_test/junit-platform-engine-1\\.10\\.0\\.jar
+                /myapp/lib/local_test/junit-jupiter-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local_test/junit-jupiter-5\\.10\\.1\\.jar
+                /myapp/lib/local_test/junit-jupiter-api-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local_test/junit-jupiter-api-5\\.10\\.1\\.jar
+                /myapp/lib/local_test/junit-jupiter-engine-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local_test/junit-jupiter-engine-5\\.10\\.1\\.jar
+                /myapp/lib/local_test/junit-jupiter-params-5\\.10\\.1-sources\\.jar
+                /myapp/lib/local_test/junit-jupiter-params-5\\.10\\.1\\.jar
+                /myapp/lib/local_test/junit-platform-commons-1\\.10\\.1-sources\\.jar
+                /myapp/lib/local_test/junit-platform-commons-1\\.10\\.1\\.jar
+                /myapp/lib/local_test/junit-platform-console-standalone-1\\.10\\.1-sources\\.jar
+                /myapp/lib/local_test/junit-platform-console-standalone-1\\.10\\.1\\.jar
+                /myapp/lib/local_test/junit-platform-engine-1\\.10\\.1-sources\\.jar
+                /myapp/lib/local_test/junit-platform-engine-1\\.10\\.1\\.jar
                 /myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
                 /myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
                 /myapp/lib/provided
+6 −6		src/bld/java/rife/AbstractRife2Build.java
+1 −1		src/main/java/rife/asm/AnnotationVisitor.java
+8 −8		src/main/java/rife/asm/AnnotationWriter.java
+1 −1		src/main/java/rife/asm/Attribute.java
+67 −69		src/main/java/rife/asm/ClassReader.java
+2 −2		src/main/java/rife/asm/ClassVisitor.java
+3 −2		src/main/java/rife/asm/ClassWriter.java
+1 −1		src/main/java/rife/asm/Context.java
+1 −1		src/main/java/rife/asm/FieldVisitor.java
+1 −1		src/main/java/rife/asm/FieldWriter.java
+45 −28		src/main/java/rife/asm/Frame.java
+31 −3		src/main/java/rife/asm/Label.java
+4 −4		src/main/java/rife/asm/MethodVisitor.java
+16 −16		src/main/java/rife/asm/MethodWriter.java
+3 −0		src/main/java/rife/asm/Opcodes.java
+1 −1		src/main/java/rife/asm/RecordComponentVisitor.java
+1 −1		src/main/java/rife/asm/RecordComponentWriter.java
+20 −4		src/main/java/rife/asm/Symbol.java
+153 −12		src/main/java/rife/asm/SymbolTable.java
+43 −18		src/main/java/rife/asm/Type.java
+5 −5		src/main/java/rife/asm/signature/SignatureReader.java
+9 −9		src/main/java/rife/asm/signature/SignatureVisitor.java
+1 −1		src/main/resources/CORE_VERSION
+7 −0		src/test/java/rife/tools/TestConvert.java
+0 −12		src/test/resources/templates/authentication/login.html
+0 −13		src/test/resources/templates/authentication/loginRemember.html
+0 −5		src/test/resources/templates/authentication/logout.html
+0 −11		src/test/resources/templates/engine_continuation_conditional.html
+0 −10		src/test/resources/templates/engine_continuation_form_submission.html
+0 −10		src/test/resources/templates/engine_continuation_throw.html
+0 −10		src/test/resources/templates/engine_continuation_trycatch.html
+0 −2		src/test/resources/templates/filtered_tags_attribute.html
+0 −2		src/test/resources/templates/filtered_tags_attribute.txt
+0 −14		src/test/resources/templates/filtered_tags_auth.html
+0 −2		src/test/resources/templates/filtered_tags_config.html
+0 −2		src/test/resources/templates/filtered_tags_config.txt
+0 −2		src/test/resources/templates/filtered_tags_property.html
+0 −2		src/test/resources/templates/filtered_tags_property.txt
+0 −4		src/test/resources/templates/form_url_generation.html
+0 −14		src/test/resources/templates/numberguess.html
+0 −8		src/test/resources/templates/numberguess_success.html
+0 −11		src/test/resources/templates/paged_navigation.html
+0 −2		src/test/resources/templates/paged_navigation_norangecount.html
+0 −1		src/test/resources/templates/url_generation.html
+0 −1		src/test/resources/templates/url_generation2.html