Skip to content

Commit

Permalink
Updated project dependencies and blueprint dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
gbevin committed Aug 27, 2024
1 parent 5ab7719 commit 47d463e
Show file tree
Hide file tree
Showing 10 changed files with 385 additions and 385 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ public class MyappBuild extends Project {
scope(test)
.include(dependency("org.junit.jupiter",
"junit-jupiter",
version(5,10,3)))
version(5,11,0)))
.include(dependency("org.junit.platform",
"junit-platform-console-standalone",
version(1,10,3)));
version(1,11,0)));
}

public static void main(String[] args) {
Expand All @@ -73,8 +73,8 @@ public class MyappBuild extends Project {
```

> **NOTE:** `bld` supports different ways to describe dependencies,
> `dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3))` can for instance also
> be written as `dependency("org.junit.jupiter:junit-jupiter:5.10.3")`. Which format you use,
> `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,
> is a matter of personal taste.
# Where does `bld` fit?
Expand Down
2 changes: 1 addition & 1 deletion core
4 changes: 2 additions & 2 deletions src/main/java/rife/bld/blueprints/AppProjectBlueprint.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public AppProjectBlueprint(File work, String packageName, String projectName, Ve
downloadSources = true;
repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,3)));
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,0)));
}
}
4 changes: 2 additions & 2 deletions src/main/java/rife/bld/blueprints/LibProjectBlueprint.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public LibProjectBlueprint(File work, String packageName, String projectName, Ve
downloadSources = true;
repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,3)));
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,0)));
}
}
8 changes: 4 additions & 4 deletions src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName,
.include(dependency("com.uwyn.rife2", "rife2", version(1,8,0)));
scope(test)
.include(dependency("org.jsoup", "jsoup", version(1,18,1)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,3)));
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,0)));
scope(standalone)
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,11)))
.include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,11)))
.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)));

precompileOperation().templateTypes(TemplateType.HTML);
Expand Down
112 changes: 56 additions & 56 deletions src/test/java/rife/bld/operations/TestCreateAppOperation.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,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\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0\\.jar
/myapp/lib/test/modules
/myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down Expand Up @@ -187,20 +187,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\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0\\.jar
/myapp/lib/test/modules
/myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down Expand Up @@ -390,20 +390,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\\.3-sources\\.jar
/myapp/lib/local/junit-jupiter-5\\.10\\.3\\.jar
/myapp/lib/local/junit-jupiter-api-5\\.10\\.3-sources\\.jar
/myapp/lib/local/junit-jupiter-api-5\\.10\\.3\\.jar
/myapp/lib/local/junit-jupiter-engine-5\\.10\\.3-sources\\.jar
/myapp/lib/local/junit-jupiter-engine-5\\.10\\.3\\.jar
/myapp/lib/local/junit-jupiter-params-5\\.10\\.3-sources\\.jar
/myapp/lib/local/junit-jupiter-params-5\\.10\\.3\\.jar
/myapp/lib/local/junit-platform-commons-1\\.10\\.3-sources\\.jar
/myapp/lib/local/junit-platform-commons-1\\.10\\.3\\.jar
/myapp/lib/local/junit-platform-console-standalone-1\\.10\\.3-sources\\.jar
/myapp/lib/local/junit-platform-console-standalone-1\\.10\\.3\\.jar
/myapp/lib/local/junit-platform-engine-1\\.10\\.3-sources\\.jar
/myapp/lib/local/junit-platform-engine-1\\.10\\.3\\.jar
/myapp/lib/local/junit-jupiter-5\\.11\\.0-sources\\.jar
/myapp/lib/local/junit-jupiter-5\\.11\\.0\\.jar
/myapp/lib/local/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/myapp/lib/local/junit-jupiter-api-5\\.11\\.0\\.jar
/myapp/lib/local/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/myapp/lib/local/junit-jupiter-engine-5\\.11\\.0\\.jar
/myapp/lib/local/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/myapp/lib/local/junit-jupiter-params-5\\.11\\.0\\.jar
/myapp/lib/local/junit-platform-commons-1\\.11\\.0-sources\\.jar
/myapp/lib/local/junit-platform-commons-1\\.11\\.0\\.jar
/myapp/lib/local/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/myapp/lib/local/junit-platform-console-standalone-1\\.11\\.0\\.jar
/myapp/lib/local/junit-platform-engine-1\\.11\\.0-sources\\.jar
/myapp/lib/local/junit-platform-engine-1\\.11\\.0\\.jar
/myapp/lib/local/opentest4j-1\\.3\\.0-sources\\.jar
/myapp/lib/local/opentest4j-1\\.3\\.0\\.jar
/myapp/lib/provided
Expand Down Expand Up @@ -516,20 +516,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\\.3-sources\\.jar
/myapp/lib/local_test/junit-jupiter-5\\.10\\.3\\.jar
/myapp/lib/local_test/junit-jupiter-api-5\\.10\\.3-sources\\.jar
/myapp/lib/local_test/junit-jupiter-api-5\\.10\\.3\\.jar
/myapp/lib/local_test/junit-jupiter-engine-5\\.10\\.3-sources\\.jar
/myapp/lib/local_test/junit-jupiter-engine-5\\.10\\.3\\.jar
/myapp/lib/local_test/junit-jupiter-params-5\\.10\\.3-sources\\.jar
/myapp/lib/local_test/junit-jupiter-params-5\\.10\\.3\\.jar
/myapp/lib/local_test/junit-platform-commons-1\\.10\\.3-sources\\.jar
/myapp/lib/local_test/junit-platform-commons-1\\.10\\.3\\.jar
/myapp/lib/local_test/junit-platform-console-standalone-1\\.10\\.3-sources\\.jar
/myapp/lib/local_test/junit-platform-console-standalone-1\\.10\\.3\\.jar
/myapp/lib/local_test/junit-platform-engine-1\\.10\\.3-sources\\.jar
/myapp/lib/local_test/junit-platform-engine-1\\.10\\.3\\.jar
/myapp/lib/local_test/junit-jupiter-5\\.11\\.0-sources\\.jar
/myapp/lib/local_test/junit-jupiter-5\\.11\\.0\\.jar
/myapp/lib/local_test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/myapp/lib/local_test/junit-jupiter-api-5\\.11\\.0\\.jar
/myapp/lib/local_test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/myapp/lib/local_test/junit-jupiter-engine-5\\.11\\.0\\.jar
/myapp/lib/local_test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/myapp/lib/local_test/junit-jupiter-params-5\\.11\\.0\\.jar
/myapp/lib/local_test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/myapp/lib/local_test/junit-platform-commons-1\\.11\\.0\\.jar
/myapp/lib/local_test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/myapp/lib/local_test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/myapp/lib/local_test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/myapp/lib/local_test/junit-platform-engine-1\\.11\\.0\\.jar
/myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
/myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
/myapp/lib/provided
Expand Down
56 changes: 28 additions & 28 deletions src/test/java/rife/bld/operations/TestCreateLibOperation.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,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\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0\\.jar
/myapp/lib/test/modules
/myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down Expand Up @@ -178,20 +178,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\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-api-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-engine-5\\.11\\.0\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-jupiter-params-5\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-commons-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-console-standalone-1\\.11\\.0\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0-sources\\.jar
/myapp/lib/test/junit-platform-engine-1\\.11\\.0\\.jar
/myapp/lib/test/modules
/myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
/myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
Expand Down
Loading

0 comments on commit 47d463e

Please sign in to comment.