Skip to content

Commit f535333

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents cef03fd + d0ce36e commit f535333

File tree

33 files changed

+1810
-749
lines changed

33 files changed

+1810
-749
lines changed

‎.github/workflows/maven-build.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ name: Build
44

55
on:
66
push:
7-
branches-ignore:
8-
- master
9-
- experimental/**
7+
branches:
8+
- develop
109
pull_request:
11-
branches-ignore:
12-
- master
13-
- experimental/**
1410
workflow_dispatch:
1511

1612
jobs:

‎.maven-settings.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
</repository>
4444

4545
<repository>
46-
<id>oss-snapshots</id>
47-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
46+
<id>sonatype-central-snapshots</id>
47+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
4848
<layout>default</layout>
4949
<releases>
5050
<enabled>false</enabled>
@@ -86,8 +86,8 @@
8686
</pluginRepository>
8787

8888
<pluginRepository>
89-
<id>oss-snapshots</id>
90-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
89+
<id>sonatype-central-snapshots</id>
90+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
9191
<layout>default</layout>
9292
<releases>
9393
<enabled>false</enabled>
@@ -123,7 +123,12 @@
123123

124124
<servers>
125125
<server>
126-
<id>ossrh</id>
126+
<id>sonatype-central</id>
127+
<username>${env.SONATYPE_USERNAME}</username>
128+
<password>${env.SONATYPE_PASSWORD}</password>
129+
</server>
130+
<server>
131+
<id>sonatype-central-snapshots</id>
127132
<username>${env.SONATYPE_USERNAME}</username>
128133
<password>${env.SONATYPE_PASSWORD}</password>
129134
</server>

‎.mvn/wrapper/maven-wrapper.jar

-61.1 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

‎6.5.0/pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<oak.version>1.10.2</oak.version>
6868

6969
<!-- repository settings -->
70-
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
71-
<distribution.snapshotRepositoryUrl>https://oss.sonatype.org/content/repositories/snapshots</distribution.snapshotRepositoryUrl>
72-
<distribution.releaseRepositoryId>ossrh</distribution.releaseRepositoryId>
73-
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>
70+
<distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
71+
<distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
72+
<distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
73+
<distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -756,9 +756,9 @@
756756
<version>3.5.0</version>
757757
</plugin>
758758
<plugin>
759-
<groupId>org.sonatype.plugins</groupId>
760-
<artifactId>nexus-staging-maven-plugin</artifactId>
761-
<version>1.7.0</version>
759+
<groupId>org.sonatype.central</groupId>
760+
<artifactId>central-publishing-maven-plugin</artifactId>
761+
<version>0.7.0</version>
762762
</plugin>
763763
<plugin>
764764
<groupId>com.amashchenko.maven.plugin</groupId>
@@ -818,15 +818,12 @@
818818
</plugin>
819819
<!-- configure staging process at sonatype.-->
820820
<plugin>
821-
<groupId>org.sonatype.plugins</groupId>
822-
<artifactId>nexus-staging-maven-plugin</artifactId>
821+
<groupId>org.sonatype.central</groupId>
822+
<artifactId>central-publishing-maven-plugin</artifactId>
823823
<inherited>false</inherited>
824824
<extensions>true</extensions>
825825
<configuration>
826-
<serverId>ossrh</serverId>
827-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
828-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
829-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
826+
<publishingServerId>sonatype-central</publishingServerId>
830827
</configuration>
831828
</plugin>
832829
</plugins>

‎6.5.1/pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<oak.version>1.10.2</oak.version>
6868

6969
<!-- repository settings -->
70-
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
71-
<distribution.snapshotRepositoryUrl>https://oss.sonatype.org/content/repositories/snapshots</distribution.snapshotRepositoryUrl>
72-
<distribution.releaseRepositoryId>ossrh</distribution.releaseRepositoryId>
73-
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>
70+
<distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
71+
<distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
72+
<distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
73+
<distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -553,9 +553,9 @@
553553
<version>3.0.0</version>
554554
</plugin>
555555
<plugin>
556-
<groupId>org.sonatype.plugins</groupId>
557-
<artifactId>nexus-staging-maven-plugin</artifactId>
558-
<version>1.6.8</version>
556+
<groupId>org.sonatype.central</groupId>
557+
<artifactId>central-publishing-maven-plugin</artifactId>
558+
<version>0.7.0</version>
559559
</plugin>
560560
<plugin>
561561
<groupId>com.amashchenko.maven.plugin</groupId>
@@ -614,15 +614,12 @@
614614
</plugin>
615615
<!-- configure staging process at sonatype.-->
616616
<plugin>
617-
<groupId>org.sonatype.plugins</groupId>
618-
<artifactId>nexus-staging-maven-plugin</artifactId>
617+
<groupId>org.sonatype.central</groupId>
618+
<artifactId>central-publishing-maven-plugin</artifactId>
619619
<inherited>false</inherited>
620620
<extensions>true</extensions>
621621
<configuration>
622-
<serverId>ossrh</serverId>
623-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
624-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
625-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
622+
<publishingServerId>sonatype-central</publishingServerId>
626623
</configuration>
627624
</plugin>
628625
</plugins>

‎6.5.10/pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<oak.version>1.22.8</oak.version>
6868

6969
<!-- repository settings -->
70-
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
71-
<distribution.snapshotRepositoryUrl>https://oss.sonatype.org/content/repositories/snapshots</distribution.snapshotRepositoryUrl>
72-
<distribution.releaseRepositoryId>ossrh</distribution.releaseRepositoryId>
73-
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>
70+
<distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
71+
<distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
72+
<distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
73+
<distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -771,9 +771,9 @@
771771
<version>3.0.0</version>
772772
</plugin>
773773
<plugin>
774-
<groupId>org.sonatype.plugins</groupId>
775-
<artifactId>nexus-staging-maven-plugin</artifactId>
776-
<version>1.6.8</version>
774+
<groupId>org.sonatype.central</groupId>
775+
<artifactId>central-publishing-maven-plugin</artifactId>
776+
<version>0.7.0</version>
777777
</plugin>
778778
<plugin>
779779
<groupId>com.amashchenko.maven.plugin</groupId>
@@ -832,15 +832,12 @@
832832
</plugin>
833833
<!-- configure staging process at sonatype.-->
834834
<plugin>
835-
<groupId>org.sonatype.plugins</groupId>
836-
<artifactId>nexus-staging-maven-plugin</artifactId>
835+
<groupId>org.sonatype.central</groupId>
836+
<artifactId>central-publishing-maven-plugin</artifactId>
837837
<inherited>false</inherited>
838838
<extensions>true</extensions>
839839
<configuration>
840-
<serverId>ossrh</serverId>
841-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
842-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
843-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
840+
<publishingServerId>sonatype-central</publishingServerId>
844841
</configuration>
845842
</plugin>
846843
</plugins>

‎6.5.11/pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<oak.version>1.22.9</oak.version>
6868

6969
<!-- repository settings -->
70-
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
71-
<distribution.snapshotRepositoryUrl>https://oss.sonatype.org/content/repositories/snapshots</distribution.snapshotRepositoryUrl>
72-
<distribution.releaseRepositoryId>ossrh</distribution.releaseRepositoryId>
73-
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>
70+
<distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
71+
<distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
72+
<distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
73+
<distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -768,9 +768,9 @@
768768
<version>3.0.0</version>
769769
</plugin>
770770
<plugin>
771-
<groupId>org.sonatype.plugins</groupId>
772-
<artifactId>nexus-staging-maven-plugin</artifactId>
773-
<version>1.6.8</version>
771+
<groupId>org.sonatype.central</groupId>
772+
<artifactId>central-publishing-maven-plugin</artifactId>
773+
<version>0.7.0</version>
774774
</plugin>
775775
<plugin>
776776
<groupId>com.amashchenko.maven.plugin</groupId>
@@ -829,15 +829,12 @@
829829
</plugin>
830830
<!-- configure staging process at sonatype.-->
831831
<plugin>
832-
<groupId>org.sonatype.plugins</groupId>
833-
<artifactId>nexus-staging-maven-plugin</artifactId>
832+
<groupId>org.sonatype.central</groupId>
833+
<artifactId>central-publishing-maven-plugin</artifactId>
834834
<inherited>false</inherited>
835835
<extensions>true</extensions>
836836
<configuration>
837-
<serverId>ossrh</serverId>
838-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
839-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
840-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
837+
<publishingServerId>sonatype-central</publishingServerId>
841838
</configuration>
842839
</plugin>
843840
</plugins>

‎6.5.12/pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<oak.version>1.22.9</oak.version>
6868

6969
<!-- repository settings -->
70-
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
71-
<distribution.snapshotRepositoryUrl>https://oss.sonatype.org/content/repositories/snapshots</distribution.snapshotRepositoryUrl>
72-
<distribution.releaseRepositoryId>ossrh</distribution.releaseRepositoryId>
73-
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>
70+
<distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
71+
<distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
72+
<distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
73+
<distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -780,9 +780,9 @@
780780
<version>3.0.0</version>
781781
</plugin>
782782
<plugin>
783-
<groupId>org.sonatype.plugins</groupId>
784-
<artifactId>nexus-staging-maven-plugin</artifactId>
785-
<version>1.6.8</version>
783+
<groupId>org.sonatype.central</groupId>
784+
<artifactId>central-publishing-maven-plugin</artifactId>
785+
<version>0.7.0</version>
786786
</plugin>
787787
<plugin>
788788
<groupId>com.amashchenko.maven.plugin</groupId>
@@ -841,15 +841,12 @@
841841
</plugin>
842842
<!-- configure staging process at sonatype.-->
843843
<plugin>
844-
<groupId>org.sonatype.plugins</groupId>
845-
<artifactId>nexus-staging-maven-plugin</artifactId>
844+
<groupId>org.sonatype.central</groupId>
845+
<artifactId>central-publishing-maven-plugin</artifactId>
846846
<inherited>false</inherited>
847847
<extensions>true</extensions>
848848
<configuration>
849-
<serverId>ossrh</serverId>
850-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
851-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
852-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
849+
<publishingServerId>sonatype-central</publishingServerId>
853850
</configuration>
854851
</plugin>
855852
</plugins>

‎6.5.13/pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<oak.version>1.22.11</oak.version>
6868

6969
<!-- repository settings -->
70-
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
71-
<distribution.snapshotRepositoryUrl>https://oss.sonatype.org/content/repositories/snapshots</distribution.snapshotRepositoryUrl>
72-
<distribution.releaseRepositoryId>ossrh</distribution.releaseRepositoryId>
73-
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>
70+
<distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
71+
<distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
72+
<distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
73+
<distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -778,9 +778,9 @@
778778
<version>3.0.0</version>
779779
</plugin>
780780
<plugin>
781-
<groupId>org.sonatype.plugins</groupId>
782-
<artifactId>nexus-staging-maven-plugin</artifactId>
783-
<version>1.6.8</version>
781+
<groupId>org.sonatype.central</groupId>
782+
<artifactId>central-publishing-maven-plugin</artifactId>
783+
<version>0.7.0</version>
784784
</plugin>
785785
<plugin>
786786
<groupId>com.amashchenko.maven.plugin</groupId>
@@ -839,15 +839,12 @@
839839
</plugin>
840840
<!-- configure staging process at sonatype.-->
841841
<plugin>
842-
<groupId>org.sonatype.plugins</groupId>
843-
<artifactId>nexus-staging-maven-plugin</artifactId>
842+
<groupId>org.sonatype.central</groupId>
843+
<artifactId>central-publishing-maven-plugin</artifactId>
844844
<inherited>false</inherited>
845845
<extensions>true</extensions>
846846
<configuration>
847-
<serverId>ossrh</serverId>
848-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
849-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
850-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
847+
<publishingServerId>sonatype-central</publishingServerId>
851848
</configuration>
852849
</plugin>
853850
</plugins>

‎6.5.14/pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<oak.version>1.22.12</oak.version>
6868

6969
<!-- repository settings -->
70-
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
71-
<distribution.snapshotRepositoryUrl>https://oss.sonatype.org/content/repositories/snapshots</distribution.snapshotRepositoryUrl>
72-
<distribution.releaseRepositoryId>ossrh</distribution.releaseRepositoryId>
73-
<distribution.releaseRepositoryUrl>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distribution.releaseRepositoryUrl>
70+
<distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
71+
<distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
72+
<distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
73+
<distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -780,9 +780,9 @@
780780
<version>3.1.0</version>
781781
</plugin>
782782
<plugin>
783-
<groupId>org.sonatype.plugins</groupId>
784-
<artifactId>nexus-staging-maven-plugin</artifactId>
785-
<version>1.6.8</version>
783+
<groupId>org.sonatype.central</groupId>
784+
<artifactId>central-publishing-maven-plugin</artifactId>
785+
<version>0.7.0</version>
786786
</plugin>
787787
<plugin>
788788
<groupId>com.amashchenko.maven.plugin</groupId>
@@ -841,15 +841,12 @@
841841
</plugin>
842842
<!-- configure staging process at sonatype.-->
843843
<plugin>
844-
<groupId>org.sonatype.plugins</groupId>
845-
<artifactId>nexus-staging-maven-plugin</artifactId>
844+
<groupId>org.sonatype.central</groupId>
845+
<artifactId>central-publishing-maven-plugin</artifactId>
846846
<inherited>false</inherited>
847847
<extensions>true</extensions>
848848
<configuration>
849-
<serverId>ossrh</serverId>
850-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
851-
<!-- Deployed artifacts should go to staging to be reviewed before publish -->
852-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
849+
<publishingServerId>sonatype-central</publishingServerId>
853850
</configuration>
854851
</plugin>
855852
</plugins>

0 commit comments

Comments
 (0)