From 375a48f5cd600e87d51e5d4bf5c1ead6c17b218e Mon Sep 17 00:00:00 2001 From: raduking Date: Fri, 30 Oct 2026 16:20:16 +0200 Subject: [PATCH 1/4] Update JDT and formatter version. --- README.md | 10 +++++----- pom.xml | 8 ++++---- src/main/resources/java-code-style.xml | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a2eab8e..10e4616 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ A collection of opinionated code formatting configurations for Java development ## Releases -Current release `1.0.0` +Current release `1.1.0` ## Contents @@ -62,7 +62,7 @@ IntelliJ IDEA: io.github.raduking code-format - 1.0.0 + 1.1.0 ``` @@ -70,10 +70,10 @@ IntelliJ IDEA: ```xml - 3.1.0 - 3.44.0 + 3.10.4 + 3.47.0 4.38 - 1.0.0 + 1.1.0 diff --git a/pom.xml b/pom.xml index b7cabe5..cf1b549 100644 --- a/pom.xml +++ b/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 3.5.9 + 4.1.2 io.github.raduking code-format - 1.0.0 + 1.1.0 jar ${project.groupId}:${project.artifactId} @@ -51,7 +51,7 @@ 3.2.8 - 0.9.0 + 0.12.0 21 @@ -59,7 +59,7 @@ ${java.version} - 3.44.0 + 3.47.0 diff --git a/src/main/resources/java-code-style.xml b/src/main/resources/java-code-style.xml index f0f6dc9..b29ba38 100644 --- a/src/main/resources/java-code-style.xml +++ b/src/main/resources/java-code-style.xml @@ -278,6 +278,7 @@ + @@ -329,6 +330,7 @@ + From 3ecb4d51c65a37b5f2389f00481fc418f21ad532 Mon Sep 17 00:00:00 2001 From: raduking Date: Fri, 30 Oct 2026 16:34:43 +0200 Subject: [PATCH 2/4] Update GitHub build pipeline. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cd83fc..34d21c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: temurin java-version: 21 From 4aa21a6f3eb9cedb5d5dec76b15a15e272f75cb2 Mon Sep 17 00:00:00 2001 From: raduking Date: Fri, 30 Oct 2026 16:44:12 +0200 Subject: [PATCH 3/4] Format `pom.xml`. --- pom.xml | 409 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 204 insertions(+), 205 deletions(-) diff --git a/pom.xml b/pom.xml index cf1b549..f98dd09 100644 --- a/pom.xml +++ b/pom.xml @@ -1,221 +1,220 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - - org.springframework.boot - spring-boot-starter-parent - 4.1.2 - - - - io.github.raduking - code-format - 1.1.0 - jar - - ${project.groupId}:${project.artifactId} - Code formatter files for Java projects - https://github.com/raduking/code-format - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - raduking - Radu Sebastian LAZIN - raduking@gmail.com - - - - - scm:git:git://github.com/raduking/code-format.git - scm:git:ssh://github.com:raduking/code-format.git - https://github.com/raduking/code-format/tree/master - - - - UTF-8 - - - 3.2.8 + + org.springframework.boot + spring-boot-starter-parent + 4.1.2 + + + + io.github.raduking + code-format + 1.1.0 + jar + + ${project.groupId}:${project.artifactId} + Code formatter files for Java projects + https://github.com/raduking/code-format + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + raduking + Radu Sebastian LAZIN + raduking@gmail.com + + + + + scm:git:git://github.com/raduking/code-format.git + scm:git:ssh://github.com:raduking/code-format.git + https://github.com/raduking/code-format/tree/master + + + + UTF-8 + + + 3.2.8 0.12.0 - - 21 - ${java.version} - ${java.version} - - - 3.47.0 - - - - - - - - - - ch.qos.logback - logback-classic - test - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - test - - - - - org.eclipse.jdt - org.eclipse.jdt.core - ${org.eclipse.jdt.core.version} - test - - - - - org.hamcrest - hamcrest - test - - - - org.junit.jupiter - junit-jupiter-api - test - - - - org.junit.jupiter - junit-jupiter-params - test - - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - - - - src/main/resources - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - + 21 + ${java.version} + ${java.version} + + + 3.47.0 + + + + + + + + + + ch.qos.logback + logback-classic + test + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + test + + + + + org.eclipse.jdt + org.eclipse.jdt.core + ${org.eclipse.jdt.core.version} + test + + + + + org.hamcrest + hamcrest + test + + + + org.junit.jupiter + junit-jupiter-api + test + + + + org.junit.jupiter + junit-jupiter-params + test + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + + + + src/main/resources + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + - - active-on-property-environment-release - - - release - true - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - sign-artifacts - verify - - sign - - - - - ${env.MAVEN_GPG_PLUGIN_KEY} - - --pinentry-mode - loopback - - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + verify + + sign + + + + + ${env.MAVEN_GPG_PLUGIN_KEY} + + --pinentry-mode + loopback + + + + + + - - org.sonatype.central - central-publishing-maven-plugin - ${central.publishing.maven.plugin.version} - true - - true - release-${project.artifactId}-${project.version} - central - - - - - - - - - - - central - Central Repository Snapshots - https://central.sonatype.com/repository/maven-snapshots - - true - - - - central - Central Repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} + true + + true + release-${project.artifactId}-${project.version} + central + + + + + + + + + + + central + Central Repository Snapshots + https://central.sonatype.com/repository/maven-snapshots + + true + + + + central + Central Repository + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + From 587814024e6b8bc2cda346f74f8c50715ef7a507 Mon Sep 17 00:00:00 2001 From: Radu Sebastian LAZIN Date: Fri, 30 Oct 2026 22:46:48 +0200 Subject: [PATCH 4/4] Added deploy script. --- maven-deploy.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 maven-deploy.sh diff --git a/maven-deploy.sh b/maven-deploy.sh new file mode 100755 index 0000000..2cd665c --- /dev/null +++ b/maven-deploy.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# Exit immediately if a command exits with a non-zero status +set -e + +# Set the Maven binary folder, defaulting to the directory of the 'mvn' command if not already set +MAVEN_BIN_FOLDER="${MAVEN_BIN_FOLDER:-$(dirname "$(which mvn)")}" + +"$MAVEN_BIN_FOLDER/mvn" deploy -Drelease=true + +echo "Deployment completed successfully."