Skip to content

Commit b93ef6d

Browse files
committed
Merge branch 'main' into 2.1.x
2 parents 2e5a7d8 + 5f8add3 commit b93ef6d

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/pull_request_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- name: Checkout
1212
uses: actions/[email protected]
13-
- name: Set up JDK 11
13+
- name: Set up JDK 17
1414
uses: actions/setup-java@v2
1515
with:
1616
distribution: 'temurin'

.github/workflows/release-workflow.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ jobs:
9191
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
9292
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
9393
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
94+
# Workaround for https://issues.sonatype.org/browse/OSSRH-66257
95+
# as described in https://stackoverflow.com/a/70157413
96+
MAVEN_OPTS: --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
9497

9598
# milestone-build
9699
- name: Create GitHub release

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

19-
2019
<groupId>io.openmanufacturing</groupId>
2120
<artifactId>sds-sdk-parent</artifactId>
2221
<name>SDS SDK Parent</name>
@@ -647,7 +646,7 @@
647646
<plugin>
648647
<groupId>org.sonatype.plugins</groupId>
649648
<artifactId>nexus-staging-maven-plugin</artifactId>
650-
<version>1.6.7</version>
649+
<version>1.6.9</version>
651650
<extensions>true</extensions>
652651
<configuration>
653652
<serverId>ossrh</serverId>

0 commit comments

Comments
 (0)