Skip to content

Commit e6a525e

Browse files
committed
Merge branch 'develop' of https://github.com/xdev-software/brevo-java-client into develop
2 parents 2fb6cdb + 06516dc commit e6a525e

File tree

8 files changed

+27
-30
lines changed

8 files changed

+27
-30
lines changed

.github/workflows/broken-links.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
22+
uses: lycheeverse/lychee-action@5c4ee84814c983aa7164eaee476f014e53ff3963 # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

@@ -31,13 +31,13 @@ jobs:
3131
GH_TOKEN: ${{ github.token }}
3232

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

3939
- name: Create Issue From File
40-
if: env.lychee_exit_code != 0
40+
if: steps.lychee.outputs.exit_code != 0
4141
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
4242
with:
4343
issue-number: ${{ steps.find-issue.outputs.number }}

.github/workflows/check-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ on:
2020
- 'assets/**'
2121

2222
env:
23-
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
2423
DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
2524

2625
jobs:

.github/workflows/release.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ jobs:
104104
runs-on: ubuntu-latest
105105
needs: [prepare-release]
106106
timeout-minutes: 60
107-
permissions:
108-
contents: read
109-
packages: write
110107
steps:
111108
- uses: actions/checkout@v4
112109

@@ -121,15 +118,17 @@ jobs:
121118
with: # running setup-java overwrites the settings.xml
122119
distribution: 'temurin'
123120
java-version: '17'
121+
server-id: github-central
122+
server-password: PACKAGES_CENTRAL_TOKEN
124123
gpg-passphrase: MAVEN_GPG_PASSPHRASE
125124
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
126125

127-
- name: Publish to Central Portal
128-
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github::https://maven.pkg.github.com/${{ github.repository }}
126+
- name: Publish to GitHub Packages Central
127+
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
128+
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
129129
env:
130-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130+
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
131131
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
132-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
133132

134133
- name: Set up JDK
135134
uses: actions/setup-java@v4

.github/workflows/test-deploy.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ jobs:
1010
publish-maven:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 60
13-
permissions:
14-
contents: read
15-
packages: write
1613
steps:
1714
- uses: actions/checkout@v4
1815

@@ -21,14 +18,16 @@ jobs:
2118
with: # running setup-java overwrites the settings.xml
2219
distribution: 'temurin'
2320
java-version: '17'
21+
server-id: github-central
22+
server-password: PACKAGES_CENTRAL_TOKEN
2423
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2524
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
2625

27-
- name: Publish to GitHub Packages
28-
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github::https://maven.pkg.github.com/${{ github.repository }}
26+
- name: Publish to GitHub Packages Central
27+
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
2928
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
3029
env:
31-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
3231
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
3332

3433
- name: Set up JDK

.idea/checkstyle-idea.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

brevo-java-client-demo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>brevo-java-client-root</artifactId>
10-
<version>1.1.0-SNAPSHOT</version>
10+
<version>1.1.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>brevo-java-client-demo</artifactId>
14-
<version>1.1.0-SNAPSHOT</version>
14+
<version>1.1.1-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>

brevo-java-client/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>brevo-java-client</artifactId>
9-
<version>1.1.0-SNAPSHOT</version>
9+
<version>1.1.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>brevo-java-client</name>
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>com.fasterxml.jackson</groupId>
6363
<artifactId>jackson-bom</artifactId>
64-
<version>2.19.1</version>
64+
<version>2.19.2</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
@@ -223,7 +223,7 @@
223223
<plugin>
224224
<groupId>org.codehaus.mojo</groupId>
225225
<artifactId>flatten-maven-plugin</artifactId>
226-
<version>1.7.1</version>
226+
<version>1.7.2</version>
227227
<configuration>
228228
<flattenMode>ossrh</flattenMode>
229229
</configuration>
@@ -449,7 +449,7 @@
449449
<dependency>
450450
<groupId>com.puppycrawl.tools</groupId>
451451
<artifactId>checkstyle</artifactId>
452-
<version>10.26.1</version>
452+
<version>11.0.0</version>
453453
</dependency>
454454
</dependencies>
455455
<configuration>
@@ -490,12 +490,12 @@
490490
<dependency>
491491
<groupId>net.sourceforge.pmd</groupId>
492492
<artifactId>pmd-core</artifactId>
493-
<version>7.15.0</version>
493+
<version>7.16.0</version>
494494
</dependency>
495495
<dependency>
496496
<groupId>net.sourceforge.pmd</groupId>
497497
<artifactId>pmd-java</artifactId>
498-
<version>7.15.0</version>
498+
<version>7.16.0</version>
499499
</dependency>
500500
</dependencies>
501501
</plugin>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>brevo-java-client-root</artifactId>
9-
<version>1.1.0-SNAPSHOT</version>
9+
<version>1.1.1-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.puppycrawl.tools</groupId>
4747
<artifactId>checkstyle</artifactId>
48-
<version>10.26.1</version>
48+
<version>11.0.0</version>
4949
</dependency>
5050
</dependencies>
5151
<configuration>
@@ -82,12 +82,12 @@
8282
<dependency>
8383
<groupId>net.sourceforge.pmd</groupId>
8484
<artifactId>pmd-core</artifactId>
85-
<version>7.15.0</version>
85+
<version>7.16.0</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>net.sourceforge.pmd</groupId>
8989
<artifactId>pmd-java</artifactId>
90-
<version>7.15.0</version>
90+
<version>7.16.0</version>
9191
</dependency>
9292
</dependencies>
9393
</plugin>

0 commit comments

Comments
 (0)