Skip to content

Commit da0ff4a

Browse files
KristianroslandKristianrosland
authored
Merge pull request #51 from digipost/bump-super-pom
Bump digipost-open-super-pom to v13
2 parents 2899a74 + f28d551 commit da0ff4a

File tree

3 files changed

+26
-85
lines changed

3 files changed

+26
-85
lines changed

‎.github/workflows/build.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
java: [ '1.8', '11' ]
10+
java: [ '8', '11' ]
1111

1212
name: build java ${{ matrix.java }}
1313
steps:
14-
- uses: actions/checkout@v1
14+
- uses: actions/checkout@v4
1515
- name: Set up java
16-
uses: actions/setup-java@v1
16+
uses: actions/setup-java@v3
1717
with:
18+
distribution: temurin
1819
java-version: ${{ matrix.java }}
20+
cache: "maven"
1921
- name: Build with Maven
2022
run: mvn -B package --no-transfer-progress --file pom.xml
2123

@@ -35,7 +37,7 @@ jobs:
3537
else
3638
TAG=${GITHUB_REF#refs/heads/}-SNAPSHOT
3739
fi
38-
echo ::set-output name=version::${TAG//\//-}
40+
echo "version=${TAG//\//-}" >> $GITHUB_OUTPUT
3941
4042
deploy_snapshot:
4143
if: startsWith(github.ref, 'refs/heads/')
@@ -44,8 +46,8 @@ jobs:
4446

4547
name: Deploy snapshot
4648
steps:
47-
- uses: actions/checkout@v1
48-
- uses: digipost/action-maven-publish@1.1.0
49+
- uses: actions/checkout@v4
50+
- uses: digipost/action-maven-publish@v1
4951
with:
5052
sonatype_secrets: ${{ secrets.sonatype_secrets }}
5153
release_version: ${{ needs.makeversion.outputs.version }}
@@ -60,7 +62,7 @@ jobs:
6062
- name: Check out Git repository
6163
uses: actions/checkout@v1
6264
- name: Release to Central Repository
63-
uses: digipost/action-maven-publish@1.1.0
65+
uses: digipost/action-maven-publish@v1
6466
with:
6567
sonatype_secrets: ${{ secrets.sonatype_secrets }}
6668
release_version: ${{ needs.makeversion.outputs.version }}

‎.mvn/maven.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-Pbuild-sources-and-javadoc
1+
-Pbuild-sources-and-javadoc,dependency-analyze

‎pom.xml

+16-77
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>no.digipost</groupId>
2424
<artifactId>digipost-open-super-pom</artifactId>
25-
<version>7</version>
25+
<version>13</version>
2626
</parent>
2727

2828
<artifactId>digipost-useragreements-api-client-java</artifactId>
@@ -179,8 +179,8 @@
179179
<pluginManagement>
180180
<plugins>
181181
<plugin>
182-
<artifactId>maven-release-plugin</artifactId>
183-
<version>2.5.3</version>
182+
<artifactId>maven-enforcer-plugin</artifactId>
183+
<version>3.4.1</version>
184184
</plugin>
185185
<plugin>
186186
<groupId>org.jasig.maven</groupId>
@@ -211,49 +211,49 @@
211211
</plugin>
212212
<plugin>
213213
<artifactId>maven-compiler-plugin</artifactId>
214-
<version>3.7.0</version>
214+
<version>3.11.0</version>
215215
</plugin>
216216
<plugin>
217217
<artifactId>maven-surefire-plugin</artifactId>
218-
<version>2.21.0</version>
218+
<version>3.2.2</version>
219219
</plugin>
220220
<plugin>
221221
<artifactId>maven-deploy-plugin</artifactId>
222-
<version>2.8.2</version>
222+
<version>3.1.1</version>
223223
</plugin>
224224
<plugin>
225225
<artifactId>maven-clean-plugin</artifactId>
226-
<version>3.1.0</version>
226+
<version>3.3.2</version>
227227
</plugin>
228228
<plugin>
229229
<artifactId>maven-dependency-plugin</artifactId>
230-
<version>3.1.0</version>
230+
<version>3.6.1</version>
231231
</plugin>
232232
<plugin>
233233
<artifactId>maven-jar-plugin</artifactId>
234-
<version>3.1.0</version>
234+
<version>3.3.0</version>
235235
</plugin>
236236
<plugin>
237237
<artifactId>maven-install-plugin</artifactId>
238-
<version>2.5.2</version>
238+
<version>3.1.1</version>
239239
</plugin>
240240
<plugin>
241241
<artifactId>maven-resources-plugin</artifactId>
242-
<version>3.0.2</version>
242+
<version>3.3.1</version>
243243
</plugin>
244244
<plugin>
245245
<artifactId>maven-source-plugin</artifactId>
246-
<version>3.0.1</version>
246+
<version>3.3.0</version>
247247
</plugin>
248248
<plugin>
249249
<groupId>org.codehaus.mojo</groupId>
250250
<artifactId>versions-maven-plugin</artifactId>
251-
<version>2.5</version>
251+
<version>2.16.2</version>
252252
</plugin>
253253
<plugin>
254254
<groupId>com.github.siom79.japicmp</groupId>
255255
<artifactId>japicmp-maven-plugin</artifactId>
256-
<version>0.11.1</version>
256+
<version>0.18.3</version>
257257
<configuration>
258258
<newVersion>
259259
<file><path>${project.build.directory}/${project.build.finalName}.${project.packaging}</path></file>
@@ -286,6 +286,7 @@
286286
<exclude>docs/**</exclude>
287287
<exclude>.java-version</exclude>
288288
<exclude>.github/**/*.yml</exclude>
289+
<exclude>.mvn/*</exclude>
289290
</excludes>
290291
<mapping>
291292
<editorconfig>SCRIPT_STYLE</editorconfig>
@@ -301,31 +302,6 @@
301302
</execution>
302303
</executions>
303304
</plugin>
304-
<plugin>
305-
<artifactId>maven-javadoc-plugin</artifactId>
306-
<executions>
307-
<execution>
308-
<id>attach-javadoc</id>
309-
<goals>
310-
<goal>jar</goal>
311-
</goals>
312-
</execution>
313-
</executions>
314-
</plugin>
315-
<plugin>
316-
<artifactId>maven-source-plugin</artifactId>
317-
<configuration>
318-
<includePom>true</includePom>
319-
</configuration>
320-
<executions>
321-
<execution>
322-
<id>attach-source</id>
323-
<goals>
324-
<goal>jar</goal>
325-
</goals>
326-
</execution>
327-
</executions>
328-
</plugin>
329305
<plugin>
330306
<groupId>org.jasig.maven</groupId>
331307
<artifactId>maven-notice-plugin</artifactId>
@@ -339,23 +315,8 @@
339315
</execution>
340316
</executions>
341317
</plugin>
342-
<plugin>
343-
<artifactId>maven-dependency-plugin</artifactId>
344-
<executions>
345-
<execution>
346-
<goals>
347-
<goal>analyze-only</goal>
348-
</goals>
349-
<configuration>
350-
<failOnWarning>true</failOnWarning>
351-
<ignoreNonCompile>true</ignoreNonCompile>
352-
</configuration>
353-
</execution>
354-
</executions>
355-
</plugin>
356318
<plugin>
357319
<artifactId>maven-enforcer-plugin</artifactId>
358-
<version>3.0.0-M1</version>
359320
<executions>
360321
<execution>
361322
<id>enforce-maven</id>
@@ -366,7 +327,7 @@
366327
<configuration>
367328
<rules>
368329
<requireMavenVersion>
369-
<version>3.0</version>
330+
<version>3.6.3</version>
370331
</requireMavenVersion>
371332
<bannedDependencies>
372333
<excludes>
@@ -411,28 +372,6 @@
411372
</plugins>
412373
</build>
413374

414-
<profiles>
415-
<profile>
416-
<id>doclint-java8-disable</id>
417-
<activation>
418-
<jdk>[1.8,</jdk>
419-
</activation>
420-
421-
<build>
422-
<pluginManagement>
423-
<plugins>
424-
<plugin>
425-
<artifactId>maven-javadoc-plugin</artifactId>
426-
<configuration>
427-
<additionalparam>-Xdoclint:none</additionalparam>
428-
</configuration>
429-
</plugin>
430-
</plugins>
431-
</pluginManagement>
432-
</build>
433-
</profile>
434-
</profiles>
435-
436375
<scm>
437376
<connection>scm:git:[email protected]:digipost/digipost-useragreements-api-client-java.git</connection>
438377
<developerConnection>scm:git:[email protected]:digipost/digipost-useragreements-api-client-java.git</developerConnection>

0 commit comments

Comments
 (0)