Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
5ad5a73
Merge pull request #266 from xdev-software/master
AB-xdev May 20, 2025
307e818
Improve bug report template
AB-xdev May 21, 2025
4efdbac
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 22, 2025
2e6baf7
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 22, 2025
0f72ad3
Update dependency com.puppycrawl.tools:checkstyle to v10.24.0
xdev-renovate May 22, 2025
3967f51
Merge pull request #157 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev May 22, 2025
57fa575
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 26, 2025
709995c
Update net.sourceforge.pmd to v7.14.0
xdev-renovate May 31, 2025
4a35b83
Update dependency com.puppycrawl.tools:checkstyle to v10.25.0
xdev-renovate Jun 1, 2025
ba44b1f
Merge pull request #158 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Jun 2, 2025
883fc4c
Merge pull request #159 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Jun 2, 2025
7b2210a
Move PMD to java subfolder
AB-xdev Jun 3, 2025
788923c
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 3, 2025
9c3732a
Update pmd location
AB-xdev Jun 3, 2025
ff7d918
Fix maven wrapper not working correctly on Windows Docker in non root…
AB-xdev Jun 5, 2025
c5ee7c7
Update dependency maven to v3.9.10
xdev-renovate Jun 6, 2025
0c2ce02
Merge pull request #161 from xdev-software/renovate/maven-3.x
AB-xdev Jun 6, 2025
1038c78
Correct pmd ruleset location
AB-xdev Jun 10, 2025
a830f31
Update shogo82148/actions-create-release digest to 4661dc5
xdev-renovate Jun 12, 2025
7ad06ee
Merge pull request #162 from xdev-software/renovate/shogo82148-action…
AB-xdev Jun 12, 2025
53b2d99
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jun 16, 2025
762cb36
Update dependency org.sonatype.central:central-publishing-maven-plugi…
xdev-renovate Jun 18, 2025
88bc24f
Cleanup .gitignore
AB-xdev Jun 18, 2025
f673c24
Merge pull request #163 from xdev-software/renovate/org.sonatype.cent…
AB-xdev Jun 18, 2025
015131b
Update .gitignore
AB-xdev Jun 18, 2025
67c2816
Update dependency com.puppycrawl.tools:checkstyle to v10.25.1
xdev-renovate Jun 22, 2025
861794f
Update dependency org.codehaus.mojo:flatten-maven-plugin to v1.7.1
xdev-renovate Jun 22, 2025
1d4cb6f
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jun 23, 2025
754718d
Merge pull request #165 from xdev-software/renovate/org.codehaus.mojo…
AB-xdev Jun 23, 2025
3083100
Merge pull request #164 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Jun 23, 2025
f7426d2
Update dependency com.puppycrawl.tools:checkstyle to v10.26.0
xdev-renovate Jun 25, 2025
9d8d2de
Update dependency org.apache.maven.plugins:maven-pmd-plugin to v3.27.0
xdev-renovate Jun 26, 2025
b73f417
Merge pull request #166 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Jun 26, 2025
3ba1bca
Merge pull request #167 from xdev-software/renovate/org.apache.maven.…
AB-xdev Jun 26, 2025
d38b73d
Sync naming
AB-xdev Jun 26, 2025
08be521
Update net.sourceforge.pmd to v7.15.0
xdev-renovate Jun 28, 2025
a72e889
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jun 30, 2025
a166186
Update dependency com.puppycrawl.tools:checkstyle to v10.26.1
xdev-renovate Jun 30, 2025
fd4350a
Merge pull request #168 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Jun 30, 2025
c0c6db8
Merge pull request #169 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Jun 30, 2025
c6e807f
Simplify: Use ``processAllModules`` flag
AB-xdev Jul 1, 2025
48f59e6
Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.8
xdev-renovate Jul 3, 2025
23eab49
Implement dual publishing to GitHub packages
AB-xdev Jul 3, 2025
1f69b6d
Merge pull request #172 from xdev-software/renovate/org.apache.maven.…
AB-xdev Jul 3, 2025
0749318
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jul 7, 2025
7da11ab
Update dependency maven to v3.9.11
xdev-renovate Jul 16, 2025
e404ff8
Merge pull request #173 from xdev-software/renovate/maven-3.x
AB-xdev Jul 16, 2025
a65a863
Remove Sonar
AB-xdev Jul 16, 2025
b5ca8b5
Publish to our GitHub Central "repo"
AB-xdev Jul 17, 2025
02651ce
Remove not needed permissions
AB-xdev Jul 17, 2025
d628049
Fix link checker not creating issues
AB-xdev Jul 17, 2025
14f6d8f
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 17, 2025
3476732
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 17, 2025
45e3f51
Fix typo
AB-xdev Jul 17, 2025
f503c60
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 17, 2025
062dd73
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 17, 2025
5d77f6f
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Jul 18, 2025
3c2cd9f
Update dependency org.glassfish.expressly:expressly to v6.0.0
xdev-renovate Jul 18, 2025
28df0f7
Update dependency software.xdev:micro-migration to v3.0.2
xdev-renovate Jul 18, 2025
87a07a0
Update org.eclipse.store-serializer to v2.1.3
xdev-renovate Jul 18, 2025
71661ae
Update org.springframework.boot.version to v3.5.3
xdev-renovate Jul 18, 2025
551e60c
Update dependency org.hibernate.validator:hibernate-validator to v9
xdev-renovate Jul 18, 2025
1dc6275
Update dependency org.hibernate.orm:hibernate-core to v6.6.22.Final
xdev-renovate Jul 20, 2025
de45743
Update dependency org.hibernate.orm:hibernate-core to v7
xdev-renovate Jul 24, 2025
7c7c2e5
Merge pull request #269 from xdev-software/renovate/major-hibernate-v…
JohannesRabauer Jul 24, 2025
5f06e75
Merge pull request #268 from xdev-software/renovate/micro-migration.v…
JohannesRabauer Jul 24, 2025
52a11fb
Merge pull request #267 from xdev-software/renovate/expressly.version
JohannesRabauer Jul 24, 2025
fd4ba6b
Merge branch 'develop' into renovate/major-hibernate-core.version
JohannesRabauer Jul 24, 2025
4739448
Merge pull request #263 from xdev-software/renovate/major-hibernate-c…
JohannesRabauer Jul 24, 2025
83b30f6
Merge pull request #241 from xdev-software/renovate/org.springframewo…
JohannesRabauer Jul 24, 2025
ecdc355
Merge branch 'develop' into renovate/org.eclipse.store-serializer
JohannesRabauer Jul 24, 2025
4e46e06
Merge pull request #240 from xdev-software/renovate/org.eclipse.store…
JohannesRabauer Jul 24, 2025
4a25de7
Merge branch 'develop' into renovate/hibernate-core.version
JohannesRabauer Jul 24, 2025
c26986a
Merge pull request #237 from xdev-software/renovate/hibernate-core.ve…
JohannesRabauer Jul 24, 2025
cf29b97
Prepare for next release
JohannesRabauer Jul 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

# Force MVN Wrapper Linux files LF
mvnw text eol=lf
.mvn/wrapper/maven-wrapper.properties text eol=lf
maven-wrapper.properties text eol=lf
23 changes: 9 additions & 14 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ body:
validations:
required: true

- type: textarea
id: description
attributes:
label: Description of the problem
description: |
Describe as exactly as possible what is not working.
validations:
required: true

- type: textarea
id: steps-to-reproduce
attributes:
Expand All @@ -47,20 +56,6 @@ body:
validations:
required: true

- type: textarea
id: expected-behavior
attributes:
label: Expected behavior
description: |
Tell us what you expect to happen.

- type: textarea
id: actual-behavior
attributes:
label: Actual behavior
description: |
Tell us what happens with the steps given above.

- type: textarea
id: additional-information
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ jobs:
GH_TOKEN: ${{ github.token }}

- name: Close issue if everything is fine
if: env.lychee_exit_code == 0 && steps.find-issue.outputs.number != ''
if: steps.lychee.outputs.exit_code == 0 && steps.find-issue.outputs.number != ''
run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
env:
GH_TOKEN: ${{ github.token }}

- name: Create Issue From File
if: env.lychee_exit_code != 0
if: steps.lychee.outputs.exit_code != 0
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
with:
issue-number: ${{ steps.find-issue.outputs.number }}
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
needs: [check-code]
timeout-minutes: 10
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
upload_url: ${{ steps.create-release.outputs.upload_url }}
steps:
- uses: actions/checkout@v4

Expand All @@ -61,15 +61,7 @@ jobs:
git config --global user.name "GitHub Actions"

- name: Un-SNAP
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
(cd "$i" && $mvnwPath -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
done
run: ./mvnw -B versions:set -DremoveSnapshot -DprocessAllModules -DgenerateBackupPoms=false

- name: Get version
id: version
Expand All @@ -88,8 +80,8 @@ jobs:
git push origin --tags

- name: Create Release
id: create_release
uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1
id: create-release
uses: shogo82148/actions-create-release@4661dc54f7b4b564074e9fbf73884d960de569a3 # v1
with:
tag_name: v${{ steps.version.outputs.release }}
release_name: v${{ steps.version.outputs.release }}
Expand Down Expand Up @@ -120,20 +112,36 @@ jobs:
git config --global user.email "actions@github.com"
git config --global user.name "GitHub Actions"
git pull

- name: Set up JDK
uses: actions/setup-java@v4
with: # running setup-java overwrites the settings.xml
distribution: 'temurin'
java-version: '17'
server-id: github-central
server-password: PACKAGES_CENTRAL_TOKEN
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once

- name: Publish to GitHub Packages Central
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
env:
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Set up JDK
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
java-version: '17'
distribution: 'temurin'
java-version: '17'
server-id: sonatype-central-portal
server-username: MAVEN_CENTRAL_USERNAME
server-password: MAVEN_CENTRAL_TOKEN
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

- name: Publish to Central Portal
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
Expand Down Expand Up @@ -185,15 +193,7 @@ jobs:
git pull

- name: Inc Version and SNAP
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true -DupdateMatchingVersions=false)
done
run: ./mvnw -B versions:set -DnextSnapshot -DprocessAllModules -DgenerateBackupPoms=false

- name: Git Commit and Push
run: |
Expand Down
79 changes: 0 additions & 79 deletions .github/workflows/sonar.yml

This file was deleted.

20 changes: 18 additions & 2 deletions .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,23 @@ jobs:
timeout-minutes: 60
steps:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with: # running setup-java overwrites the settings.xml
distribution: 'temurin'
java-version: '17'
server-id: github-central
server-password: PACKAGES_CENTRAL_TOKEN
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once

- name: Publish to GitHub Packages Central
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
env:
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Set up JDK
uses: actions/setup-java@v4
Expand All @@ -22,10 +39,9 @@ jobs:
server-username: MAVEN_CENTRAL_USERNAME
server-password: MAVEN_CENTRAL_TOKEN
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

- name: Publish to Central Portal
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
Expand Down
46 changes: 9 additions & 37 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,65 +1,37 @@
# Maven
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
# https://github.com/takari/maven-wrapper#usage-without-binary-jar

# Maven Wrapper
.mvn/wrapper/maven-wrapper.jar

# Maven Flatten Plugin
.flattened-pom.xml

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package/Binary Files don't belong into a git repo
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
*.dll
*.exe
*.bin

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# JRebel
**/resources/rebel.xml
**/resources/rebel-remote.xml

# eclispe stuff for root
/.settings/
/.classpath
/.project


# eclispe stuff for modules
/*/.metadata/
/*/.apt_generated_tests/
/*/.settings/
/*/.classpath
/*/.project
/*/RemoteSystemsTempFiles/

#custom
.flattened-pom.xml
.tern-project
# Eclipse
.metadata
.settings
.classpath
.project

# EclipseStore
spring-data-eclipse-store/storage
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 2.5.3

* Updated org.springframework.boot.version to v3.5.3
* Updated EclipseStore to v2.1.3

# 2.5.2
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
* Updated dependencies
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/spring-data-eclipse-store?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/spring-data-eclipse-store)
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/spring-data-eclipse-store/check-build.yml?branch=develop)](https://github.com/xdev-software/spring-data-eclipse-store/actions/workflows/check-build.yml?query=branch%3Adevelop)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_spring-data-eclipse-store&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_spring-data-eclipse-store)
[![Documentation](https://img.shields.io/maven-central/v/software.xdev/spring-data-eclipse-store?label=docs)](https://spring-eclipsestore.xdev.software/)

<div align="center">
Expand Down Expand Up @@ -60,7 +59,8 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
| ``2.4.0`` | ``17+`` | ``3.4.0`` | ``2.0.0`` |
| ``2.4.1`` | ``17+`` | ``3.4.0`` | ``2.1.0`` |
| ``2.5.0`` | ``17+`` | ``3.4.1`` | ``2.1.0`` |
| ``>= 2.5.1`` | ``17+`` | ``3.4.2`` | ``2.1.1`` |
| ``2.5.1-2.5.2`` | ``17+`` | ``3.4.2`` | ``2.1.1`` |
| ``>= 2.5.3`` | ``17+`` | ``3.5.3`` | ``2.1.3`` |

## Demo

Expand Down
6 changes: 3 additions & 3 deletions docs/antora.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: ROOT
title: Spring-Data-Eclipse-Store
version: master
display_version: '2.5.0'
display_version: '2.5.3'
start_page: index.adoc
nav:
- modules/ROOT/nav.adoc
asciidoc:
attributes:
product-name: 'Spring-Data-Eclipse-Store'
display-version: '2.5.0'
maven-version: '2.5.0'
display-version: '2.5.3'
maven-version: '2.5.3'
page-editable: false
page-out-of-support: false
Loading