From 9fc422da21ec7af62998d1383602188ebdf9de99 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Wed, 31 Jan 2024 21:18:20 -0500 Subject: [PATCH] RIFE2 blueprint dependency updates --- .../bld/blueprints/Rife2ProjectBlueprint.java | 6 +- .../operations/TestCreateRife2Operation.java | 128 +++++++++--------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java index 6519596..3371278 100644 --- a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java @@ -40,12 +40,12 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName, scope(compile) .include(dependency("com.uwyn.rife2", "rife2", version(1,7,3))); scope(test) - .include(dependency("org.jsoup", "jsoup", version(1,16,2))) + .include(dependency("org.jsoup", "jsoup", version(1,17,2))) .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,5))) - .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,5))) + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,6))) + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,6))) .include(dependency("org.slf4j", "slf4j-simple", version(2,0,11))); precompileOperation().templateTypes(TemplateType.HTML); diff --git a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java index cd8b3eb..b96f785 100644 --- a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java +++ b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java @@ -107,20 +107,20 @@ void testExecute() /myapp/lib/standalone /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\\.5-sources\\.jar - /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-http-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-http-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-io-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-io-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-security-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-security-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-server-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-server-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-session-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-session-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-util-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-util-12\\.0\\.5\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.6\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.11-sources\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.11\\.jar /myapp/lib/standalone/slf4j-simple-2\\.0\\.11-sources\\.jar @@ -128,8 +128,8 @@ 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/jsoup-1\\.16\\.2-sources\\.jar - /myapp/lib/test/jsoup-1\\.16\\.2\\.jar + /myapp/lib/test/jsoup-1\\.17\\.2-sources\\.jar + /myapp/lib/test/jsoup-1\\.17\\.2\\.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 @@ -221,20 +221,20 @@ void testExecute() /myapp/lib/standalone /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\\.5-sources\\.jar - /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-http-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-http-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-io-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-io-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-security-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-security-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-server-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-server-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-session-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-session-12\\.0\\.5\\.jar - /myapp/lib/standalone/jetty-util-12\\.0\\.5-sources\\.jar - /myapp/lib/standalone/jetty-util-12\\.0\\.5\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-ee10-servlet-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-http-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-io-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-security-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-server-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-session-12\\.0\\.6\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.6-sources\\.jar + /myapp/lib/standalone/jetty-util-12\\.0\\.6\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.11-sources\\.jar /myapp/lib/standalone/slf4j-api-2\\.0\\.11\\.jar /myapp/lib/standalone/slf4j-simple-2\\.0\\.11-sources\\.jar @@ -242,8 +242,8 @@ 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/jsoup-1\\.16\\.2-sources\\.jar - /myapp/lib/test/jsoup-1\\.16\\.2\\.jar + /myapp/lib/test/jsoup-1\\.17\\.2-sources\\.jar + /myapp/lib/test/jsoup-1\\.17\\.2\\.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 @@ -473,22 +473,22 @@ void testExecuteLocalDependencies() /myapp/lib/local/apiguardian-api-1\\.1\\.2\\.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\\.5-sources\\.jar - /myapp/lib/local/jetty-ee10-servlet-12\\.0\\.5\\.jar - /myapp/lib/local/jetty-http-12\\.0\\.5-sources\\.jar - /myapp/lib/local/jetty-http-12\\.0\\.5\\.jar - /myapp/lib/local/jetty-io-12\\.0\\.5-sources\\.jar - /myapp/lib/local/jetty-io-12\\.0\\.5\\.jar - /myapp/lib/local/jetty-security-12\\.0\\.5-sources\\.jar - /myapp/lib/local/jetty-security-12\\.0\\.5\\.jar - /myapp/lib/local/jetty-server-12\\.0\\.5-sources\\.jar - /myapp/lib/local/jetty-server-12\\.0\\.5\\.jar - /myapp/lib/local/jetty-session-12\\.0\\.5-sources\\.jar - /myapp/lib/local/jetty-session-12\\.0\\.5\\.jar - /myapp/lib/local/jetty-util-12\\.0\\.5-sources\\.jar - /myapp/lib/local/jetty-util-12\\.0\\.5\\.jar - /myapp/lib/local/jsoup-1\\.16\\.2-sources\\.jar - /myapp/lib/local/jsoup-1\\.16\\.2\\.jar + /myapp/lib/local/jetty-ee10-servlet-12\\.0\\.6-sources\\.jar + /myapp/lib/local/jetty-ee10-servlet-12\\.0\\.6\\.jar + /myapp/lib/local/jetty-http-12\\.0\\.6-sources\\.jar + /myapp/lib/local/jetty-http-12\\.0\\.6\\.jar + /myapp/lib/local/jetty-io-12\\.0\\.6-sources\\.jar + /myapp/lib/local/jetty-io-12\\.0\\.6\\.jar + /myapp/lib/local/jetty-security-12\\.0\\.6-sources\\.jar + /myapp/lib/local/jetty-security-12\\.0\\.6\\.jar + /myapp/lib/local/jetty-server-12\\.0\\.6-sources\\.jar + /myapp/lib/local/jetty-server-12\\.0\\.6\\.jar + /myapp/lib/local/jetty-session-12\\.0\\.6-sources\\.jar + /myapp/lib/local/jetty-session-12\\.0\\.6\\.jar + /myapp/lib/local/jetty-util-12\\.0\\.6-sources\\.jar + /myapp/lib/local/jetty-util-12\\.0\\.6\\.jar + /myapp/lib/local/jsoup-1\\.17\\.2-sources\\.jar + /myapp/lib/local/jsoup-1\\.17\\.2\\.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 @@ -642,20 +642,20 @@ void testExecuteLocalDependenciesFolders() /myapp/lib/local_standalone /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\\.5-sources\\.jar - /myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.5\\.jar - /myapp/lib/local_standalone/jetty-http-12\\.0\\.5-sources\\.jar - /myapp/lib/local_standalone/jetty-http-12\\.0\\.5\\.jar - /myapp/lib/local_standalone/jetty-io-12\\.0\\.5-sources\\.jar - /myapp/lib/local_standalone/jetty-io-12\\.0\\.5\\.jar - /myapp/lib/local_standalone/jetty-security-12\\.0\\.5-sources\\.jar - /myapp/lib/local_standalone/jetty-security-12\\.0\\.5\\.jar - /myapp/lib/local_standalone/jetty-server-12\\.0\\.5-sources\\.jar - /myapp/lib/local_standalone/jetty-server-12\\.0\\.5\\.jar - /myapp/lib/local_standalone/jetty-session-12\\.0\\.5-sources\\.jar - /myapp/lib/local_standalone/jetty-session-12\\.0\\.5\\.jar - /myapp/lib/local_standalone/jetty-util-12\\.0\\.5-sources\\.jar - /myapp/lib/local_standalone/jetty-util-12\\.0\\.5\\.jar + /myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.6-sources\\.jar + /myapp/lib/local_standalone/jetty-ee10-servlet-12\\.0\\.6\\.jar + /myapp/lib/local_standalone/jetty-http-12\\.0\\.6-sources\\.jar + /myapp/lib/local_standalone/jetty-http-12\\.0\\.6\\.jar + /myapp/lib/local_standalone/jetty-io-12\\.0\\.6-sources\\.jar + /myapp/lib/local_standalone/jetty-io-12\\.0\\.6\\.jar + /myapp/lib/local_standalone/jetty-security-12\\.0\\.6-sources\\.jar + /myapp/lib/local_standalone/jetty-security-12\\.0\\.6\\.jar + /myapp/lib/local_standalone/jetty-server-12\\.0\\.6-sources\\.jar + /myapp/lib/local_standalone/jetty-server-12\\.0\\.6\\.jar + /myapp/lib/local_standalone/jetty-session-12\\.0\\.6-sources\\.jar + /myapp/lib/local_standalone/jetty-session-12\\.0\\.6\\.jar + /myapp/lib/local_standalone/jetty-util-12\\.0\\.6-sources\\.jar + /myapp/lib/local_standalone/jetty-util-12\\.0\\.6\\.jar /myapp/lib/local_standalone/slf4j-api-2\\.0\\.11-sources\\.jar /myapp/lib/local_standalone/slf4j-api-2\\.0\\.11\\.jar /myapp/lib/local_standalone/slf4j-simple-2\\.0\\.11-sources\\.jar @@ -663,8 +663,8 @@ 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/jsoup-1\\.16\\.2-sources\\.jar - /myapp/lib/local_test/jsoup-1\\.16\\.2\\.jar + /myapp/lib/local_test/jsoup-1\\.17\\.2-sources\\.jar + /myapp/lib/local_test/jsoup-1\\.17\\.2\\.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