Skip to content

Commit 69ed046

Browse files
funfriedfunfried
authored
Merge pull request #267 from funfried/release/1.15.x
Release/1.15.x
2 parents 51b5ca6 + c624f68 commit 69ed046

File tree

6 files changed

+52
-79
lines changed

6 files changed

+52
-79
lines changed

‎.ci.settings.xml‎

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,7 @@
77
<password>${env.gh_token}</password>
88
</server>
99
<server>
10-
<id>sonatype-nexus-staging</id>
11-
<username>${env.sonatype_username}</username>
12-
<password>${env.sonatype_password}</password>
13-
</server>
14-
<server>
15-
<id>sonatype-nexus-snapshots</id>
16-
<username>${env.sonatype_username}</username>
17-
<password>${env.sonatype_password}</password>
18-
</server>
19-
<server>
20-
<id>sonatype-nexus-s01-staging</id>
21-
<username>${env.sonatype_username}</username>
22-
<password>${env.sonatype_password}</password>
23-
</server>
24-
<server>
25-
<id>sonatype-nexus-s01-snapshots</id>
26-
<username>${env.sonatype_username}</username>
27-
<password>${env.sonatype_password}</password>
28-
</server>
29-
<server>
30-
<id>sonatype-nexus-staging-http-blocker</id>
31-
<username>${env.sonatype_username}</username>
32-
<password>${env.sonatype_password}</password>
33-
</server>
34-
<server>
35-
<id>sonatype-nexus-snapshots-http-blocker</id>
36-
<username>${env.sonatype_username}</username>
37-
<password>${env.sonatype_password}</password>
38-
</server>
39-
<server>
40-
<id>sonatype-nexus-s01-staging-http-blocker</id>
41-
<username>${env.sonatype_username}</username>
42-
<password>${env.sonatype_password}</password>
43-
</server>
44-
<server>
45-
<id>sonatype-nexus-s01-snapshots-http-blocker</id>
10+
<id>central</id>
4611
<username>${env.sonatype_username}</username>
4712
<password>${env.sonatype_password}</password>
4813
</server>
@@ -77,30 +42,6 @@
7742
<name>Apache Mirror</name>
7843
<url>https://repository.apache.org/</url>
7944
</mirror>
80-
<mirror>
81-
<id>sonatype-nexus-staging-http-blocker</id>
82-
<mirrorOf>sonatype-nexus-staging</mirrorOf>
83-
<name>Sonatype Nexus Staging Mirror</name>
84-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
85-
</mirror>
86-
<mirror>
87-
<id>sonatype-nexus-snapshots-http-blocker</id>
88-
<mirrorOf>sonatype-nexus-snapshots</mirrorOf>
89-
<name>Sonatype Nexus Snapshots Mirror</name>
90-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
91-
</mirror>
92-
<mirror>
93-
<id>sonatype-nexus-s01-staging-http-blocker</id>
94-
<mirrorOf>sonatype-nexus-s01-staging</mirrorOf>
95-
<name>Sonatype Nexus S01 Staging Mirror</name>
96-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
97-
</mirror>
98-
<mirror>
99-
<id>sonatype-nexus-s01-snapshots-http-blocker</id>
100-
<mirrorOf>sonatype-nexus-s01-snapshots</mirrorOf>
101-
<name>Sonatype Nexus S01 Snapshots Mirror</name>
102-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
103-
</mirror>
10445
</mirrors>
10546

10647
<activeProfiles>

‎.github/workflows/linux_maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
build:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v5
1919
- name: Set up JDK 21
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v5
2121
with:
2222
java-version: '21'
2323
distribution: 'adopt'

‎.github/workflows/release_maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v5
1616
- name: Set up JDK 21
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v5
1818
with:
1919
java-version: '21'
2020
distribution: 'adopt'

‎.github/workflows/windows_maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
build:
1717
runs-on: windows-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v5
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: '21'
2424
distribution: 'adopt'

‎pom.xml‎

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<groupId>de.funfried.netbeans.plugins</groupId>
1919
<artifactId>externalcodeformatter</artifactId>
20-
<version>1.15.6</version>
20+
<version>1.15.7-SNAPSHOT</version>
2121
<packaging>nbm</packaging>
2222

2323
<developers>
@@ -118,7 +118,7 @@
118118
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
119119
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
120120
<keystore.file>${project.build.directory}/keystore</keystore.file>
121-
<google-java-format.version>1.30.0</google-java-format.version>
121+
<google-java-format.version>1.31.0</google-java-format.version>
122122
<palantir-java-format.version>2.81.0</palantir-java-format.version>
123123
<xml-formatter.version>0.4.0</xml-formatter.version>
124124
<commons-lang.version>3.19.0</commons-lang.version>
@@ -168,7 +168,7 @@
168168
<dependency>
169169
<groupId>de.funfried.libraries</groupId>
170170
<artifactId>jsdt-core</artifactId>
171-
<version>1.0.11</version>
171+
<version>1.0.12</version>
172172
<exclusions>
173173
<exclusion>
174174
<groupId>com.google.guava</groupId>
@@ -607,13 +607,20 @@
607607
<version>3.1.0</version>
608608
</plugin>
609609
<plugin>
610-
<groupId>org.sonatype.plugins</groupId>
611-
<artifactId>nexus-staging-maven-plugin</artifactId>
612-
<version>1.7.0</version>
610+
<groupId>org.codehaus.mojo</groupId>
611+
<artifactId>build-helper-maven-plugin</artifactId>
612+
<version>3.6.1</version>
613+
</plugin>
614+
<plugin>
615+
<groupId>org.sonatype.central</groupId>
616+
<artifactId>central-publishing-maven-plugin</artifactId>
617+
<extensions>true</extensions>
618+
<version>0.9.0</version>
613619
<configuration>
614-
<serverId>sonatype-nexus-staging</serverId>
615-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
616-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
620+
<publishingServerId>central</publishingServerId>
621+
<waitUntil>published</waitUntil>
622+
<autoPublish>true</autoPublish>
623+
<tokenAuth>true</tokenAuth>
617624
</configuration>
618625
</plugin>
619626
<plugin>
@@ -1170,9 +1177,31 @@
11701177
<build>
11711178
<plugins>
11721179
<plugin>
1173-
<groupId>org.sonatype.plugins</groupId>
1174-
<artifactId>nexus-staging-maven-plugin</artifactId>
1175-
<extensions>true</extensions>
1180+
<groupId>org.codehaus.mojo</groupId>
1181+
<artifactId>build-helper-maven-plugin</artifactId>
1182+
<executions>
1183+
<execution>
1184+
<id>regex-snapshot-property</id>
1185+
<phase>validate</phase>
1186+
<goals>
1187+
<goal>regex-property</goal>
1188+
</goals>
1189+
<configuration>
1190+
<name>project.version.isSnapshot</name>
1191+
<value>${project.version}</value>
1192+
<regex>.*(-SNAPSHOT)$</regex>
1193+
<replacement>true</replacement>
1194+
<failIfNoMatch>false</failIfNoMatch>
1195+
</configuration>
1196+
</execution>
1197+
</executions>
1198+
</plugin>
1199+
<plugin>
1200+
<groupId>org.sonatype.central</groupId>
1201+
<artifactId>central-publishing-maven-plugin</artifactId>
1202+
<configuration>
1203+
<skipPublishing>${project.version.isSnapshot}</skipPublishing>
1204+
</configuration>
11761205
</plugin>
11771206
<plugin>
11781207
<groupId>org.apache.maven.plugins</groupId>

‎src/changes/changes.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
</properties>
1010

1111
<body>
12-
<release version="1.15.6" date="2025-10-26" description="Maintenance release">
12+
<release version="1.15.7-SNAPSHOT" date="N/A" description="N/A">
13+
</release>
14+
15+
<release version="1.15.6" date="2025-10-27" description="Maintenance release">
1316
<action dev="bahlef" type="change">
1417
Updated to latest dependency and plugin versions (and due to the Google Formatter also increased the minimum Java version to 21)
1518
</action>

0 commit comments

Comments
 (0)