Skip to content

Commit

Permalink
Updated blueprint dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbevin
gbevin committed Dec 26, 2024
1 parent 34667b5 commit 92fc85b
Show file tree
Hide file tree
Showing 9 changed files with 400 additions and 400 deletions.
4 changes: 2 additions & 2 deletions src/main/java/rife/bld/blueprints/AppProjectBlueprint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public AppProjectBlueprint(File work, String packageName, String projectName, St
downloadSources = true;
repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
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)));
}
}
4 changes: 2 additions & 2 deletions src/main/java/rife/bld/blueprints/LibProjectBlueprint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public LibProjectBlueprint(File work, String packageName, String projectName, St
downloadSources = true;
repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
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)));
}
}
12 changes: 6 additions & 6 deletions src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ 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,8,0)));
.include(dependency("com.uwyn.rife2", "rife2", version(1,9,0)));
scope(test)
.include(dependency("org.jsoup", "jsoup", version(1,18,1)))
.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)));
scope(standalone)
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,12)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,12)))
.include(dependency("org.slf4j", "slf4j-simple", version(2,0,13)));
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,16)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,16)))
.include(dependency("org.slf4j", "slf4j-simple", version(2,0,16)));

precompileOperation().templateTypes(TemplateType.HTML);
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/rife/bld/dependencies/TestDependencyResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void testGetCompileDependenciesAssertJ() {

@Test
void testGetCompileDependenciesJettyOverride1() {
var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.13")),
var resolver = new DependencyResolver(new VersionResolution(new HierarchicalProperties().put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.16")),
ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
var dependencies = resolver.getDirectDependencies(compile);
assertNotNull(dependencies);
Expand All @@ -178,7 +178,7 @@ void testGetCompileDependenciesJettyOverride1() {
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2
org.eclipse.jetty:jetty-http:11.0.14
org.eclipse.jetty:jetty-io:11.0.14
org.slf4j:slf4j-api:2.0.13""", StringUtils.join(dependencies, "\n"));
org.slf4j:slf4j-api:2.0.16""", StringUtils.join(dependencies, "\n"));
}

@Test
Expand Down
112 changes: 56 additions & 56 deletions src/test/java/rife/bld/operations/TestCreateAppOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,20 @@ 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/junit-jupiter-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0\\.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
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar
/my-app/lib/test/modules
/my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/my-app/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down Expand Up @@ -188,20 +188,20 @@ 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/junit-jupiter-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0\\.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
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar
/my-app/lib/test/modules
/my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/my-app/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down Expand Up @@ -392,20 +392,20 @@ void testExecuteLocalDependencies()
/my-app/lib/local
/my-app/lib/local/apiguardian-api-1\\.1\\.2-sources\\.jar
/my-app/lib/local/apiguardian-api-1\\.1\\.2\\.jar
/my-app/lib/local/junit-jupiter-5\\.11\\.0-sources\\.jar
/my-app/lib/local/junit-jupiter-5\\.11\\.0\\.jar
/my-app/lib/local/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/my-app/lib/local/junit-jupiter-api-5\\.11\\.0\\.jar
/my-app/lib/local/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/my-app/lib/local/junit-jupiter-engine-5\\.11\\.0\\.jar
/my-app/lib/local/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/my-app/lib/local/junit-jupiter-params-5\\.11\\.0\\.jar
/my-app/lib/local/junit-platform-commons-1\\.11\\.0-sources\\.jar
/my-app/lib/local/junit-platform-commons-1\\.11\\.0\\.jar
/my-app/lib/local/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/my-app/lib/local/junit-platform-console-standalone-1\\.11\\.0\\.jar
/my-app/lib/local/junit-platform-engine-1\\.11\\.0-sources\\.jar
/my-app/lib/local/junit-platform-engine-1\\.11\\.0\\.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
/my-app/lib/local/junit-jupiter-api-5\\.11\\.4\\.jar
/my-app/lib/local/junit-jupiter-engine-5\\.11\\.4-sources\\.jar
/my-app/lib/local/junit-jupiter-engine-5\\.11\\.4\\.jar
/my-app/lib/local/junit-jupiter-params-5\\.11\\.4-sources\\.jar
/my-app/lib/local/junit-jupiter-params-5\\.11\\.4\\.jar
/my-app/lib/local/junit-platform-commons-1\\.11\\.4-sources\\.jar
/my-app/lib/local/junit-platform-commons-1\\.11\\.4\\.jar
/my-app/lib/local/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar
/my-app/lib/local/junit-platform-console-standalone-1\\.11\\.4\\.jar
/my-app/lib/local/junit-platform-engine-1\\.11\\.4-sources\\.jar
/my-app/lib/local/junit-platform-engine-1\\.11\\.4\\.jar
/my-app/lib/local/opentest4j-1\\.3\\.0-sources\\.jar
/my-app/lib/local/opentest4j-1\\.3\\.0\\.jar
/my-app/lib/provided
Expand Down Expand Up @@ -519,20 +519,20 @@ 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/junit-jupiter-5\\.11\\.0-sources\\.jar
/my-app/lib/local_test/junit-jupiter-5\\.11\\.0\\.jar
/my-app/lib/local_test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/my-app/lib/local_test/junit-jupiter-api-5\\.11\\.0\\.jar
/my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.0\\.jar
/my-app/lib/local_test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/my-app/lib/local_test/junit-jupiter-params-5\\.11\\.0\\.jar
/my-app/lib/local_test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/my-app/lib/local_test/junit-platform-commons-1\\.11\\.0\\.jar
/my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/my-app/lib/local_test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/my-app/lib/local_test/junit-platform-engine-1\\.11\\.0\\.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
/my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4\\.jar
/my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar
/my-app/lib/local_test/junit-jupiter-engine-5\\.11\\.4\\.jar
/my-app/lib/local_test/junit-jupiter-params-5\\.11\\.4-sources\\.jar
/my-app/lib/local_test/junit-jupiter-params-5\\.11\\.4\\.jar
/my-app/lib/local_test/junit-platform-commons-1\\.11\\.4-sources\\.jar
/my-app/lib/local_test/junit-platform-commons-1\\.11\\.4\\.jar
/my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar
/my-app/lib/local_test/junit-platform-console-standalone-1\\.11\\.4\\.jar
/my-app/lib/local_test/junit-platform-engine-1\\.11\\.4-sources\\.jar
/my-app/lib/local_test/junit-platform-engine-1\\.11\\.4\\.jar
/my-app/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
/my-app/lib/local_test/opentest4j-1\\.3\\.0\\.jar
/my-app/lib/provided
Expand Down
56 changes: 28 additions & 28 deletions src/test/java/rife/bld/operations/TestCreateLibOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,20 @@ 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/junit-jupiter-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0\\.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
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar
/my-app/lib/test/modules
/my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/my-app/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down Expand Up @@ -179,20 +179,20 @@ 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/junit-jupiter-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.0\\.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
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-engine-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-params-5\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-commons-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-console-standalone-1\\.11\\.4\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-platform-engine-1\\.11\\.4\\.jar
/my-app/lib/test/modules
/my-app/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/my-app/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down
Loading

0 comments on commit 92fc85b

Please sign in to comment.