Skip to content

Commit b46263c

Browse files
oblonskioblonski
committed
Merge branch 'master' into HEAD
# Conflicts: # pom.xml
2 parents f4ffdf2 + a253adf commit b46263c

File tree

2 files changed

+88
-85
lines changed

2 files changed

+88
-85
lines changed

‎.github/workflows/build.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: GitHub CI
1+
name: Build and test
2+
on: push
23

3-
on:
4-
push:
5-
branches:
6-
- master
7-
tags:
8-
- '*'
4+
env:
5+
# we use these in .ci.maven.settings.xml, which is needed to authenticate for core (!) GitHub packages
6+
MAVEN_SETTINGS_USERNAME_FOR_GITHUB: ${{ secrets.MAVEN_SETTINGS_USERNAME_FOR_GITHUB }}
7+
MAVEN_SETTINGS_PASSWORD_FOR_GITHUB: ${{ secrets.MAVEN_SETTINGS_PASSWORD_FOR_GITHUB }}
8+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99

1010
jobs:
1111
build:
@@ -18,11 +18,15 @@ jobs:
1818
with:
1919
java-version: '21'
2020
distribution: 'temurin'
21+
server-id: github
2122
- name: Build with Maven
2223
run: mvn --batch-mode --update-snapshots verify
24+
- name: Set jsprit version (tagged only)
25+
run: mvn versions:set -DnewVersion=${{ github.ref_name }} -DgenerateBackupPoms=false --no-transfer-progress
26+
if: startsWith(github.ref, 'refs/tags/')
2327
- name: Publish to GitHub Packages
2428
if: startsWith(github.ref, 'refs/tags/')
25-
run: mvn --batch-mode deploy
29+
run: mvn --batch-mode deploy -B --no-transfer-progress -DskipTests -P release
2630
env:
2731
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2832

‎pom.xml

Lines changed: 76 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,10 @@
107107
<version>3.11.0</version>
108108
<configuration>
109109
<compilerArgument>-XDignore.symbol.file</compilerArgument>
110-
<compilerArgs>
111-
<arg>--add-opens</arg>
112-
<arg>java.base/java.util=ALL-UNNAMED</arg>
113-
</compilerArgs>
114110
<fork>true</fork>
115111
<source>${jdkVersion}</source>
116112
<target>${jdkVersion}</target>
117113
</configuration>
118-
119114
</plugin>
120115

121116
<plugin>
@@ -191,80 +186,84 @@
191186
</dependencies>
192187

193188
<distributionManagement>
194-
189+
<repository>
190+
<id>github</id>
191+
<name>GitHub GraphHopper Apache Maven Packages</name>
192+
<url>https://maven.pkg.github.com/graphhopper/jsprit</url>
193+
</repository>
195194
</distributionManagement>
196195

197196
<!-- mvn clean deploy -P release -->
198-
<profiles>
199-
<profile>
200-
<id>selected-build</id>
201-
<modules>
202-
<module>jsprit-core</module>
203-
<module>jsprit-analysis</module>
204-
</modules>
205-
</profile>
206-
<profile>
207-
<id>release</id>
208-
<activation>
209-
<activeByDefault>false</activeByDefault>
210-
</activation>
211-
<build>
212-
<plugins>
213-
<plugin>
214-
<groupId>org.apache.maven.plugins</groupId>
215-
<artifactId>maven-gpg-plugin</artifactId>
216-
<version>1.6</version>
217-
<executions>
218-
<execution>
219-
<id>sign-artifacts</id>
220-
<phase>verify</phase>
221-
<goals>
222-
<goal>sign</goal>
223-
</goals>
224-
</execution>
225-
</executions>
226-
</plugin>
227-
<plugin>
228-
<groupId>org.sonatype.plugins</groupId>
229-
<artifactId>nexus-staging-maven-plugin</artifactId>
230-
<version>1.6.8</version>
231-
<extensions>true</extensions>
232-
<configuration>
233-
<serverId>ossrh</serverId>
234-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
235-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
236-
</configuration>
237-
</plugin>
238-
239-
<plugin>
240-
<groupId>org.apache.maven.plugins</groupId>
241-
<artifactId>maven-javadoc-plugin</artifactId>
242-
<version>2.10.3</version>
243-
<executions>
244-
<execution>
245-
<id>attach-javadocs</id>
246-
<goals>
247-
<goal>jar</goal>
248-
</goals>
249-
</execution>
250-
</executions>
251-
</plugin>
252-
<plugin>
253-
<groupId>org.apache.maven.plugins</groupId>
254-
<artifactId>maven-source-plugin</artifactId>
255-
<version>3.0.0</version>
256-
<executions>
257-
<execution>
258-
<id>attach-sources</id>
259-
<goals>
260-
<goal>jar-no-fork</goal>
261-
</goals>
262-
</execution>
263-
</executions>
264-
</plugin>
265-
</plugins>
266-
</build>
267-
</profile>
268-
</profiles>
197+
<!-- <profiles>-->
198+
<!-- <profile>-->
199+
<!-- <id>selected-build</id>-->
200+
<!-- <modules>-->
201+
<!-- <module>jsprit-core</module>-->
202+
<!-- <module>jsprit-analysis</module>-->
203+
<!-- </modules>-->
204+
<!-- </profile>-->
205+
<!-- <profile>-->
206+
<!-- <id>release</id>-->
207+
<!-- <activation>-->
208+
<!-- <activeByDefault>false</activeByDefault>-->
209+
<!-- </activation>-->
210+
<!-- <build>-->
211+
<!-- <plugins>-->
212+
<!-- <plugin>-->
213+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
214+
<!-- <artifactId>maven-gpg-plugin</artifactId>-->
215+
<!-- <version>1.6</version>-->
216+
<!-- <executions>-->
217+
<!-- <execution>-->
218+
<!-- <id>sign-artifacts</id>-->
219+
<!-- <phase>verify</phase>-->
220+
<!-- <goals>-->
221+
<!-- <goal>sign</goal>-->
222+
<!-- </goals>-->
223+
<!-- </execution>-->
224+
<!-- </executions>-->
225+
<!-- </plugin>-->
226+
<!-- <plugin>-->
227+
<!-- <groupId>org.sonatype.plugins</groupId>-->
228+
<!-- <artifactId>nexus-staging-maven-plugin</artifactId>-->
229+
<!-- <version>1.6.7</version>-->
230+
<!-- <extensions>true</extensions>-->
231+
<!-- <configuration>-->
232+
<!-- <serverId>ossrh</serverId>-->
233+
<!-- <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
234+
<!-- <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
235+
<!-- </configuration>-->
236+
<!-- </plugin>-->
237+
238+
<!-- <plugin>-->
239+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
240+
<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
241+
<!-- <version>2.10.3</version>-->
242+
<!-- <executions>-->
243+
<!-- <execution>-->
244+
<!-- <id>attach-javadocs</id>-->
245+
<!-- <goals>-->
246+
<!-- <goal>jar</goal>-->
247+
<!-- </goals>-->
248+
<!-- </execution>-->
249+
<!-- </executions>-->
250+
<!-- </plugin>-->
251+
<!-- <plugin>-->
252+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
253+
<!-- <artifactId>maven-source-plugin</artifactId>-->
254+
<!-- <version>3.0.0</version>-->
255+
<!-- <executions>-->
256+
<!-- <execution>-->
257+
<!-- <id>attach-sources</id>-->
258+
<!-- <goals>-->
259+
<!-- <goal>jar-no-fork</goal>-->
260+
<!-- </goals>-->
261+
<!-- </execution>-->
262+
<!-- </executions>-->
263+
<!-- </plugin>-->
264+
<!-- </plugins>-->
265+
<!-- </build>-->
266+
<!-- </profile>-->
267+
<!-- </profiles>-->
269268

270269
</project>

0 commit comments

Comments
 (0)