Updated version to 2.2.0.

Updated versions for RIFE2 project creation.
Updated RIFE2/core.

README.md

@@ -1,6 +1,6 @@
 [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/2.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://img.shields.io/github/release/rife2/bld.svg)](https://github.com/rife2/bld/releases/latest)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld/badge.svg?color=blue)](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld)
 [![Nexus Snapshot](https://img.shields.io/nexus/s/com.uwyn.rife2/bld?server=https%3A%2F%2Fs01.oss.sonatype.org%2F)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/bld/)
@@ -48,33 +48,29 @@ import java.util.List;
 import static rife.bld.dependencies.Repository.*;
 import static rife.bld.dependencies.Scope.*;
 
-public class MyappBuild extends Project {
-    public MyappBuild() {
+public class MyAppBuild extends Project {
+    public MyAppBuild() {
         pkg = "com.example";
-        name = "Myapp";
-        mainClass = "com.example.MyappMain";
+        name = "my-app";
+        mainClass = "com.example.MyApp";
         version = version(0,1,0);
 
         downloadSources = true;
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
         scope(test)
-            .include(dependency("org.junit.jupiter",
-                                "junit-jupiter",
-                                version(5,11,0)))
-            .include(dependency("org.junit.platform",
-                                "junit-platform-console-standalone",
-                                version(1,11,0)));
+            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4)))
+            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4)));
     }
 
     public static void main(String[] args) {
-        new MyappBuild().start(args);
+        new MyAppBuild().start(args);
     }
 }
 ```
 
 > **NOTE:** `bld` supports different ways to describe dependencies,
-> `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0))` can for instance also
-> be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.0")`. Which format you use,
+> `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))` can for instance also
+> be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.4")`. Which format you use,
 > is a matter of personal taste.
 
 # Where does `bld` fit?

lib/bld/bld-wrapper.properties

@@ -1,11 +1,11 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.0
-bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.0
-bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.0
+bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.1
+bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.1
+bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.1
 bld.javaOptions=
 bld.javacOptions=
 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
 bld.sourceDirectories=core/src/bld/java
-bld.version=2.1.0
+bld.version=2.2.0

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

@@ -39,9 +39,9 @@ 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,9,0)));
+            .include(dependency("com.uwyn.rife2", "rife2", version(1,9,1)));
         scope(test)
-            .include(dependency("org.jsoup", "jsoup", version(1,18,1)))
+            .include(dependency("org.jsoup", "jsoup", version(1,18,3)))
             .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4)))
             .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4)));
         scope(standalone)

src/main/resources/BLD_VERSION

@@ -1 +1 @@
-2.2.0-SNAPSHOT
+2.2.0

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

@@ -133,8 +133,8 @@ void testExecute()
                     /my-app/lib/test
                     /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                     /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar
-                    /my-app/lib/test/jsoup-1\\.18\\.1-sources\\.jar
-                    /my-app/lib/test/jsoup-1\\.18\\.1\\.jar
+                    /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar
+                    /my-app/lib/test/jsoup-1\\.18\\.3\\.jar
                     /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar
                     /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar
                     /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -252,8 +252,8 @@ void testExecute()
                     /my-app/lib/test
                     /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                     /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar
-                    /my-app/lib/test/jsoup-1\\.18\\.1-sources\\.jar
-                    /my-app/lib/test/jsoup-1\\.18\\.1\\.jar
+                    /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar
+                    /my-app/lib/test/jsoup-1\\.18\\.3\\.jar
                     /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar
                     /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar
                     /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -314,7 +314,7 @@ void testExecute()
             assertThrows(ExitStatusException.class, run_operation::execute);
             Thread.sleep(2000);
 
-            assertTrue(check_result.toString().contains("<p>Hello World My-app</p>"));
+            assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"));
         } finally {
             FileUtils.deleteDirectory(tmp);
         }
@@ -506,8 +506,8 @@ void testExecuteLocalDependencies()
                 /my-app/lib/local/jetty-session-12\\.0\\.16\\.jar
                 /my-app/lib/local/jetty-util-12\\.0\\.16-sources\\.jar
                 /my-app/lib/local/jetty-util-12\\.0\\.16\\.jar
-                /my-app/lib/local/jsoup-1\\.18\\.1-sources\\.jar
-                /my-app/lib/local/jsoup-1\\.18\\.1\\.jar
+                /my-app/lib/local/jsoup-1\\.18\\.3-sources\\.jar
+                /my-app/lib/local/jsoup-1\\.18\\.3\\.jar
                 /my-app/lib/local/junit-jupiter-5\\.11\\.4-sources\\.jar
                 /my-app/lib/local/junit-jupiter-5\\.11\\.4\\.jar
                 /my-app/lib/local/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -581,7 +581,7 @@ void testExecuteLocalDependencies()
             assertThrows(ExitStatusException.class, run_operation::execute);
             Thread.sleep(2000);
 
-            assertTrue(check_result.toString().contains("<p>Hello World My-app</p>"), check_result.toString());
+            assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"), check_result.toString());
         } finally {
             FileUtils.deleteDirectory(tmp);
         }
@@ -688,8 +688,8 @@ void testExecuteLocalDependenciesFolders()
                 /my-app/lib/local_test
                 /my-app/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar
                 /my-app/lib/local_test/apiguardian-api-1\\.1\\.2\\.jar
-                /my-app/lib/local_test/jsoup-1\\.18\\.1-sources\\.jar
-                /my-app/lib/local_test/jsoup-1\\.18\\.1\\.jar
+                /my-app/lib/local_test/jsoup-1\\.18\\.3-sources\\.jar
+                /my-app/lib/local_test/jsoup-1\\.18\\.3\\.jar
                 /my-app/lib/local_test/junit-jupiter-5\\.11\\.4-sources\\.jar
                 /my-app/lib/local_test/junit-jupiter-5\\.11\\.4\\.jar
                 /my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -757,7 +757,7 @@ void testExecuteLocalDependenciesFolders()
             assertThrows(ExitStatusException.class, run_operation::execute);
             Thread.sleep(2000);
 
-            assertTrue(check_result.toString().contains("<p>Hello World My-app</p>"));
+            assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"));
         } finally {
             FileUtils.deleteDirectory(tmp);
         }

src/test/java/rife/bld/operations/TestUberJarOperation.java

@@ -174,7 +174,7 @@ void testFromProjectWeb()
             assertThrows(ExitStatusException.class, run_operation::execute);
             Thread.sleep(2000);
 
-            assertTrue(check_result.toString().contains("<p>Hello World App</p>"));
+            assertTrue(check_result.toString().contains("<p>Hello World app</p>"));
         } finally {
             FileUtils.deleteDirectory(tmp);
         }