Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9f5cab5
Enforce IDEA plugins
AB-xdev Apr 22, 2025
e67bdaa
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 22, 2025
0036d1f
Merge pull request #213 from xdev-software/master
AB-xdev Apr 22, 2025
def0b7d
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 23, 2025
4b971e9
Update dependency org.apache.httpcomponents.client5:httpclient5 to v5…
xdev-renovate Apr 25, 2025
a26ff67
Update dependency com.fasterxml.jackson:jackson-bom to v2.19.0
xdev-renovate Apr 25, 2025
5e33477
Merge pull request #225 from xdev-software/renovate/com.fasterxml.jac…
AB-xdev Apr 25, 2025
84196af
Merge pull request #224 from xdev-software/renovate/org.apache.httpco…
AB-xdev Apr 25, 2025
855c40a
Update net.sourceforge.pmd to v7.13.0
xdev-renovate Apr 26, 2025
2ca127c
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Apr 28, 2025
7c3c850
Update dependency com.puppycrawl.tools:checkstyle to v10.23.1
xdev-renovate Apr 28, 2025
7d38031
Merge pull request #152 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Apr 28, 2025
5ba23c7
Merge pull request #151 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Apr 28, 2025
f9b2fee
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 29, 2025
580cc60
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 5, 2025
25dd0ed
Update lycheeverse/lychee-action digest to 82202e5
xdev-renovate May 10, 2025
22946ad
Update lycheeverse/lychee-action digest to 82202e5
xdev-renovate May 10, 2025
7e5d51b
Merge pull request #153 from xdev-software/renovate/lycheeverse-lyche…
AB-xdev May 12, 2025
6e1800a
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 13, 2025
2af0660
Update dependency org.openapitools:openapi-generator-maven-plugin to …
xdev-renovate May 13, 2025
0cee3f6
Merge pull request #3 from xdev-software/renovate/lycheeverse-lychee-…
AB-xdev May 15, 2025
c3764dd
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 15, 2025
cc03283
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 15, 2025
71a8c71
Merge pull request #228 from xdev-software/renovate/org.openapitools-…
AB-xdev May 15, 2025
45f8113
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 15, 2025
d2c8287
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 19, 2025
6b8bdec
Update .gitignore
AB-xdev May 19, 2025
f60eab0
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 20, 2025
a0c76bc
OSSRH → Sonatype Maven Central Portal
AB-xdev May 20, 2025
af1af8c
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev May 20, 2025
1a4d974
Wait until ``validated`` as deployment otherwise takes too long
AB-xdev May 20, 2025
c781d9a
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 20, 2025
5f42aac
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 20, 2025
13cd954
OSSRH → Sonatype Maven Central Portal
AB-xdev May 20, 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
2 changes: 1 addition & 1 deletion .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
with:
fail: false # Don't fail on broken links, create an issue instead

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,22 @@ jobs:
git config --global user.name "GitHub Actions"
git pull
- name: Set up JDK OSSRH
- name: Set up JDK
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
java-version: '17'
distribution: 'temurin'
server-id: ossrh
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 OSSRH
run: ../mvnw -B deploy -Possrh -DskipTests
- name: Publish to Central Portal
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK OSSRH
- name: Set up JDK
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
distribution: 'temurin'
java-version: '17'
server-id: ossrh
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 OSSRH
run: ../mvnw -B deploy -Possrh -DskipTests
- name: Publish to Central Portal
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ hs_err_pid*
.idea/*
!.idea/saveactions_settings.xml
!.idea/checkstyle-idea.xml
!.idea/externalDependencies.xml

!.idea/inspectionProfiles/
.idea/inspectionProfiles/*
Expand Down
7 changes: 7 additions & 0 deletions .idea/externalDependencies.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 1.2.7
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
* Updated dependencies

# 1.2.6
* Updated dependencies

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.23.0</version>
<version>10.23.1</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -82,12 +82,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.12.0</version>
<version>7.13.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.12.0</version>
<version>7.13.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
62 changes: 12 additions & 50 deletions sessionize-java-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,47 +56,12 @@
</sonar.exclusions>
</properties>

<repositories>
<!-- The order of definitions matters. Explicitly defining central here
to make sure it has the highest priority. -->
<repository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<!-- The order of definitions matters. Explicitly defining central here
to make sure it has the highest priority. -->
<pluginRepository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.18.3</version>
<version>2.19.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -108,7 +73,7 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.4.3</version>
<version>5.4.4</version>
</dependency>

<!-- JSON processing: jackson -->
Expand Down Expand Up @@ -252,7 +217,7 @@
</build>
<profiles>
<profile>
<id>ossrh</id>
<id>publish-sonatype-central-portal</id>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -296,16 +261,13 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.7.0</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<!-- Sometimes OSSRH is really slow -->
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>sonatype-central-portal</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -356,7 +318,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>7.12.0</version>
<version>7.13.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -481,7 +443,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.23.0</version>
<version>10.23.1</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -522,12 +484,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.12.0</version>
<version>7.13.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.12.0</version>
<version>7.13.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down