Skip to content

Commit 7f3cbb6

Browse files
committed
Update release configuration
1 parent c159aac commit 7f3cbb6

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
echo "Release commit already exists, skipping version setting"
4343
elif [ "$CURRENT_VERSION" != "${{ github.event.inputs.version }}" ]; then
4444
echo "Setting version to ${{ github.event.inputs.version }}"
45-
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.version }}
45+
./mvnw -ntp -B versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.version }}
4646
git add pom.xml "**/pom.xml"
4747
git commit -m "Release version ${{ github.event.inputs.version }}"
4848
git push origin main
@@ -61,6 +61,10 @@ jobs:
6161
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
6262
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
6363
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
64+
JRELEASER_MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}
65+
JRELEASER_BLUESKY_HOST: ${{ secrets.BLUESKY_HOST }}
66+
JRELEASER_BLUESKY_HANDLE: ${{ secrets.BLUESKY_HANDLE }}
67+
JRELEASER_BLUESKY_PASSWORD: ${{ secrets.BLUESKY_PASSWORD }}
6468
run: ./mvnw -ntp -B -N -Ppublication jreleaser:full-release
6569

6670
- name: Release log

pom.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@ application while protecting against XSS.
155155
<artifactId>maven-deploy-plugin</artifactId>
156156
<version>3.1.1</version>
157157
</plugin>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-release-plugin</artifactId>
161+
<version>3.1.1</version>
162+
</plugin>
158163
<plugin>
159164
<groupId>org.apache.maven.plugins</groupId>
160165
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -197,7 +202,6 @@ application while protecting against XSS.
197202
<groupId>org.apache.maven.plugins</groupId>
198203
<artifactId>maven-enforcer-plugin</artifactId>
199204
<version>3.5.0</version>
200-
<inherited>false</inherited>
201205
<executions>
202206
<execution>
203207
<id>check</id>
@@ -207,16 +211,6 @@ application while protecting against XSS.
207211
</goals>
208212
<configuration>
209213
<rules>
210-
<!-- .mvn and wrapper files must exist -->
211-
<requireFilesExist>
212-
<files>
213-
<file>${project.basedir}/.mvn</file>
214-
<file>${project.basedir}/.mvn/wrapper/maven-wrapper.properties</file>
215-
<file>${project.basedir}/mvnw</file>
216-
<file>${project.basedir}/mvnw.cmd</file>
217-
</files>
218-
</requireFilesExist>
219-
220214
<!-- java.version must match -->
221215
<requireJavaVersion>
222216
<version>${jdk.version}</version>
@@ -242,7 +236,11 @@ application while protecting against XSS.
242236
</enforceBytecodeVersion>
243237

244238
<!-- disallow same classes in different dependencies -->
245-
<banDuplicateClasses/>
239+
<!-- TODO: fix duplicate classes
240+
<banDuplicateClasses>
241+
<findAllDuplicates>true</findAllDuplicates>
242+
</banDuplicateClasses>
243+
-->
246244
</rules>
247245
</configuration>
248246
</execution>
@@ -366,7 +364,7 @@ application while protecting against XSS.
366364
<release>
367365
<github>
368366
<tagName>release-{{projectVersion}}</tagName>
369-
<previousTagName>release-20240325.1</previousTagName>
367+
<previousTagName>release-20260101.1</previousTagName>
370368
<releaseName>Release {{projectVersion}}</releaseName>
371369
<changelog>
372370
<formatted>ALWAYS</formatted>
@@ -403,6 +401,7 @@ application while protecting against XSS.
403401
<announce>
404402
<mastodon>
405403
<active>RELEASE</active>
404+
<host>https://mastodon.social</host>
406405
<status>🚀 Java HTML Sanitizer {{projectVersion}} has been released! {{releaseNotesUrl}}</status>
407406
</mastodon>
408407
<bluesky>

0 commit comments

Comments
 (0)