Compare commits

..

33 commits
1.0.2 ... main

Author SHA1 Message Date
6bec436b11
1.0.4-SNAPSHOT 2025-04-24 11:24:42 -07:00
fc8304ccde
Bump Spring Boot to version 3.4.5 2025-04-24 11:24:02 -07:00
36aa281834
Bump Mockito to version 5.17.0 2025-04-12 20:59:16 -07:00
b74d366255
Bump JUnit to version 5.12.2 2025-04-12 20:58:33 -07:00
5bac33d622
Version 1.0.3 2025-03-28 12:53:06 -07:00
a38a51c68f
Bump PMD extension from 1.2.1 to 1.2.2 2025-03-28 12:39:54 -07:00
1058f7719e
Add steps for boot JAR and WAR creation 2025-03-25 21:24:45 -07:00
4ac16ecaa4
Add OS matrix for Ubuntu, Windows and macOS 2025-03-25 21:18:38 -07:00
a4c47eee81
Bump Spring Boot Loader example to version 3.4.4 2025-03-20 21:07:56 -07:00
00df6edbc2
Bump to Spring Boot 3.4.4 2025-03-20 21:05:22 -07:00
e67cb22884
Added Java options for tests under JDK 24 2025-03-19 01:07:09 -07:00
11970069df
Added Mockito dependency for JDK 24 compatibility 2025-03-19 00:39:42 -07:00
86d113fe31
JDK 24 2025-03-18 23:41:28 -07:00
548612df7b
Added required dependency section 2025-03-18 20:10:49 -07:00
5316279412
Add generic installation instructions 2025-03-18 13:15:27 -07:00
1a2ea9edb0
Bump JUnit to version 5.12.1 2025-03-18 13:12:40 -07:00
5a99244158
Bump PMD extension to version 1.2.1 2025-03-18 13:12:18 -07:00
f1bff720e0
Bump bld to version 2.2.1 2025-02-24 23:07:16 -08:00
ffee594e32
Bump JUnit to version 5.12.0 2025-02-24 22:51:45 -08:00
11ff9c0afc
Updated copyright 2025-02-20 10:01:56 -08:00
0b1fc2e3d9
Bump Spring Boot to version 3.4.3 2025-02-20 09:59:08 -08:00
6f0e912bcb
Bump PMD extension to version 1.2.0 2025-02-20 09:58:42 -08:00
0d60e91f11
Updated deprecated artifact actions 2025-01-23 10:23:30 -08:00
98dbf61eb1
Version 1.0.3-SNAPSHOT 2025-01-23 10:12:19 -08:00
f8db36b235
Bumped Spring Boot to version 3.4.2 2025-01-23 09:20:09 -08:00
ffb8a706d3
Bumped AssertJ to version 3.27.3 2025-01-23 08:56:24 -08:00
040a4681e5
Version 1.0.2 2025-01-14 12:21:24 -08:00
a3217e271b
Updated copyright for 2025 2025-01-14 12:21:23 -08:00
5ad38d14ec
Bumped bld to version 2.2.0 2025-01-14 12:21:23 -08:00
772bc63bb2
Bumped AssertJ to version 3.27.2 2025-01-14 12:21:23 -08:00
2962797f94
Bumped PMD extension to version 1.1.10 2025-01-14 12:21:23 -08:00
c232d50d8f
Update README.md 2025-01-11 13:46:12 -05:00
08c527f6e6
Bumped AssertJ to version 3.27.0 2024-12-28 18:11:44 -08:00
20 changed files with 81 additions and 44 deletions

View file

@ -4,11 +4,13 @@ on: [ push, pull_request, workflow_dispatch ]
jobs: jobs:
build-bld-project: build-bld-project:
runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java-version: [ 17, 21, 23 ] java-version: [ 17, 21, 24 ]
kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ]
os: [ ubuntu-latest, windows-latest, macos-latest ]
runs-on: ${{ matrix.os }}
steps: steps:
- name: Checkout source repository - name: Checkout source repository
@ -22,12 +24,24 @@ jobs:
distribution: "zulu" distribution: "zulu"
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
- name: Download dependencies
run: ./bld download
- name: Download dependencies [examples] - name: Download dependencies [examples]
working-directory: examples working-directory: examples
run: ./bld download run: ./bld download
- name: Run tests - name: Run tests [examples]
working-directory: examples
run: ./bld compile test run: ./bld compile test
- name: Compile and create the JAR [examples]
working-directory: examples
run: ./bld compile bootjar
- name: Compile and create the WAR [examples]
working-directory: examples
run: ./bld compile bootwar
- name: Download dependencies
run: ./bld download
- name: Run tests
run: ./bld compile test

View file

@ -47,11 +47,11 @@ jobs:
uses: actions/configure-pages@v3 uses: actions/configure-pages@v3
- name: Upload artifact - name: Upload artifact
uses: actions/upload-pages-artifact@v1 uses: actions/upload-pages-artifact@v3
with: with:
# Upload generated Javadocs repository # Upload generated Javadocs repository
path: "build/javadoc/" path: "build/javadoc/"
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
id: deployment id: deployment
uses: actions/deploy-pages@v1 uses: actions/deploy-pages@v4

View file

@ -1,6 +1,6 @@
<component name="CopyrightManager"> <component name="CopyrightManager">
<copyright> <copyright>
<option name="notice" value="Copyright 2023-Copyright &amp;#36;today.yearamp;#36;today.year the original author or authors.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10; https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." /> <option name="notice" value="Copyright 2023-&amp;#36;today.year the original author or authors.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10; https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
<option name="myName" value="Apache License" /> <option name="myName" value="Apache License" />
</copyright> </copyright>
</component> </component>

View file

@ -2,12 +2,12 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

View file

@ -9,7 +9,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-2.2.0.jar", "${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar" "lib/**/*.jar"
] ]
} }

View file

@ -2,12 +2,20 @@
[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![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) [![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.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
[![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-spring-boot) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-spring-boot)
[![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-spring-boot) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-spring-boot)
[![GitHub CI](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml) [![GitHub CI](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml)
To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions). To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file:
```properties
bld.extension-spring-boot=com.uwyn.rife2:bld-spring-boot
```
For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation.
## Create an Executable JAR
To create a [Spring Boot executable Java Archive](https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html) To create a [Spring Boot executable Java Archive](https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html)
(JAR) from the current project: (JAR) from the current project:
@ -27,6 +35,8 @@ public void bootjar() throws Exception {
- [View Examples Project](https://github.com/rife2/bld-spring-boot/tree/main/examples) - [View Examples Project](https://github.com/rife2/bld-spring-boot/tree/main/examples)
## Create an Executable WAR
To create a [Spring Boot executable Web Archive](https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html#appendix.executable-jar.nested-jars.war-structure) To create a [Spring Boot executable Web Archive](https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html#appendix.executable-jar.nested-jars.war-structure)
(WAR) from the current project: (WAR) from the current project:
@ -45,11 +55,13 @@ public void bootwar() throws Exception {
- [View Examples Project](https://github.com/rife2/bld-spring-boot/tree/main/examples) - [View Examples Project](https://github.com/rife2/bld-spring-boot/tree/main/examples)
## Required Dependency
Don't forget to include the _Spring Boot Loader_ dependency to your project: Don't forget to include the _Spring Boot Loader_ dependency to your project:
```java ```java
scope(standalone) scope(standalone)
.include(dependency("org.springframeworkboot:spring-boot-loader:3.4.1")); .include(dependency("org.springframework.boot:spring-boot-loader:3.4.4"));
``` ```
Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary)

6
examples/.idea/bld.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BldConfiguration">
<events />
</component>
</project>

View file

@ -2,12 +2,12 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0-sources.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

View file

@ -9,7 +9,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-2.2.0.jar", "${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar" "lib/**/*.jar"
], ],
"java.compile.nullAnalysis.mode": "automatic" "java.compile.nullAnalysis.mode": "automatic"

Binary file not shown.

View file

@ -1,7 +1,7 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-boot=com.uwyn.rife2:bld-spring-boot:1.0.2 bld.extension-boot=com.uwyn.rife2:bld-spring-boot:1.0.3
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories= bld.sourceDirectories=
bld.version=2.2.0 bld.version=2.2.1

View file

@ -26,16 +26,21 @@ public class DemoApplicationBuild extends WebProject {
repositories = List.of(MAVEN_CENTRAL); repositories = List.of(MAVEN_CENTRAL);
var boot = version(3, 4, 5);
scope(compile) scope(compile)
.include(dependency("org.springframework.boot:spring-boot-starter:3.4.1")) .include(dependency("org.springframework.boot", "spring-boot-starter", boot))
.include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.4.1")) .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot))
.include(dependency("org.springframework.boot:spring-boot-starter-web:3.4.1")); .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot))
.include(dependency("org.mockito:mockito-core:5.17.0"));
scope(test) scope(test)
.include(dependency("org.springframework.boot:spring-boot-starter-test:3.4.1")) .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot))
.include(dependency("org.junit.jupiter:junit-jupiter:5.11.4")) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2)))
.include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.4")); .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 2)));
scope(standalone) scope(standalone)
.include(dependency("org.springframework.boot:spring-boot-loader:3.4.1")); .include(dependency("org.springframework.boot", "spring-boot-loader", boot));
testOperation().javaOptions(List.of("-XX:+EnableDynamicAgentLoading"))
.javaOptions().enableNativeAccess("ALL-UNNAMED");
} }
public static void main(String[] args) { public static void main(String[] args) {

Binary file not shown.

View file

@ -1,7 +1,7 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.10 bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES
bld.sourceDirectories= bld.sourceDirectories=
bld.version=2.2.0 bld.version=2.2.1

View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,7 +33,7 @@ public class SpringBootBuild extends Project {
public SpringBootBuild() { public SpringBootBuild() {
pkg = "rife.bld.extension"; pkg = "rife.bld.extension";
name = "bld-spring-boot"; name = "bld-spring-boot";
version = version(1, 0, 2); version = version(1, 0, 4, "SNAPSHOT");
javaRelease = 17; javaRelease = 17;
@ -43,11 +43,11 @@ public class SpringBootBuild extends Project {
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0))); .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
scope(test) scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 2)))
.include(dependency("org.assertj", "assertj-core", version(3, 27, 2))); .include(dependency("org.assertj", "assertj-core", version(3, 27, 3)));
javadocOperation() javadocOperation()
.javadocOptions() .javadocOptions()

View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,8 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatCode;
class BootJarOperationTest { class BootJarOperationTest {
private static final String BLD = "bld-2.2.0.jar"; private static final String BLD = "bld-2.2.1.jar";
private static final String BOOT_VERSION = "3.4.1"; private static final String BOOT_VERSION = "3.4.5";
private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/";
private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/";
private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/";