Skip to content

Commit b88cc24

Browse files
funfriedfunfried
committed
Improved build
1 parent 2167955 commit b88cc24

File tree

5 files changed

+10
-90
lines changed

5 files changed

+10
-90
lines changed

‎.ci.settings.xml‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -103,50 +103,6 @@
103103
<enabled>false</enabled>
104104
</snapshots>
105105
</repository>
106-
<repository>
107-
<id>sonatype-nexus-staging</id>
108-
<name>sonatype-nexus-staging</name>
109-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
110-
<releases>
111-
<enabled>true</enabled>
112-
</releases>
113-
<snapshots>
114-
<enabled>false</enabled>
115-
</snapshots>
116-
</repository>
117-
<repository>
118-
<id>sonatype-nexus-snapshots</id>
119-
<name>sonatype-nexus-snapshots</name>
120-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
121-
<releases>
122-
<enabled>false</enabled>
123-
</releases>
124-
<snapshots>
125-
<enabled>true</enabled>
126-
</snapshots>
127-
</repository>
128-
<repository>
129-
<id>sonatype-nexus-s01-staging</id>
130-
<name>sonatype-nexus-s01-staging</name>
131-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
132-
<releases>
133-
<enabled>true</enabled>
134-
</releases>
135-
<snapshots>
136-
<enabled>false</enabled>
137-
</snapshots>
138-
</repository>
139-
<repository>
140-
<id>sonatype-nexus-s01-snapshots</id>
141-
<name>sonatype-nexus-s01-snapshots</name>
142-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
143-
<releases>
144-
<enabled>false</enabled>
145-
</releases>
146-
<snapshots>
147-
<enabled>true</enabled>
148-
</snapshots>
149-
</repository>
150106
</repositories>
151107
<pluginRepositories>
152108
<pluginRepository>
@@ -193,50 +149,6 @@
193149
<enabled>false</enabled>
194150
</snapshots>
195151
</pluginRepository>
196-
<pluginRepository>
197-
<id>sonatype-nexus-staging</id>
198-
<name>sonatype-nexus-staging</name>
199-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
200-
<releases>
201-
<enabled>true</enabled>
202-
</releases>
203-
<snapshots>
204-
<enabled>false</enabled>
205-
</snapshots>
206-
</pluginRepository>
207-
<pluginRepository>
208-
<id>sonatype-nexus-snapshots</id>
209-
<name>sonatype-nexus-snapshots</name>
210-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
211-
<releases>
212-
<enabled>false</enabled>
213-
</releases>
214-
<snapshots>
215-
<enabled>true</enabled>
216-
</snapshots>
217-
</pluginRepository>
218-
<pluginRepository>
219-
<id>sonatype-nexus-s01-staging</id>
220-
<name>sonatype-nexus-s01-staging</name>
221-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
222-
<releases>
223-
<enabled>true</enabled>
224-
</releases>
225-
<snapshots>
226-
<enabled>false</enabled>
227-
</snapshots>
228-
</pluginRepository>
229-
<pluginRepository>
230-
<id>sonatype-nexus-s01-snapshots</id>
231-
<name>sonatype-nexus-s01-snapshots</name>
232-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
233-
<releases>
234-
<enabled>false</enabled>
235-
</releases>
236-
<snapshots>
237-
<enabled>true</enabled>
238-
</snapshots>
239-
</pluginRepository>
240152
</pluginRepositories>
241153
</profile>
242154
</profiles>

‎.github/workflows/linux_maven.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
run: mvn -s .ci.settings.xml --no-transfer-progress -Dgh_username=${{ secrets.GH_USERNAME }} -Dgh_token=${{ secrets.GH_TOKEN }} -Prelease-commons,sonatype-oss-release package site
3838
env:
3939
MAVEN_OPTS: -Xms256m -Xmx2g --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
40+
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
4041
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
4142
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
4243
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎.github/workflows/release_maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
GPG_TTY: $(tty)
4545
MAVEN_OPTS: -Xms256m -Xmx2g --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
4646
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
47-
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
4847
gh_username: ${{ secrets.GH_USERNAME }}
4948
gh_token: ${{ secrets.GH_TOKEN }}
5049
sonatype_username: ${{ secrets.SONATYPE_USERNAME }}
5150
sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
5251
repoToken: ${{ secrets.COVERALLS_REPOTOKEN }}
5352
skipRemoteStaging: ${{ secrets.SKIP_REMOTE_STAGING }}
53+
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5454
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
5555
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
5656
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎.github/workflows/windows_maven.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
run: mvn -s .ci.settings.xml --no-transfer-progress clean package
3939
env:
4040
MAVEN_OPTS: -Xms256m -Xmx2g --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
41+
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
4142
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
4243
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
4344
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,12 @@
164164
<artifactId>org.eclipse.jgit</artifactId>
165165
<version>7.4.0.202509020913-r</version>
166166
</dependency>
167+
168+
<dependency>
169+
<groupId>org.eclipse.jgit</groupId>
170+
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
171+
<version>7.4.0.202509020913-r</version>
172+
</dependency>
167173
</dependencies>
168174
</dependencyManagement>
169175

@@ -913,7 +919,7 @@
913919
<artifactId>maven-compiler-plugin</artifactId>
914920
<configuration>
915921
<release>${java.version}</release>
916-
<forceJavacCompilerUse>true</forceJavacCompilerUse>
922+
<forceLegacyJavacApi>true</forceLegacyJavacApi>
917923
<fork>true</fork>
918924
<proc>full</proc>
919925
<compilerArgs>

0 commit comments

Comments
 (0)