Skip to content

Commit 1c65d3b

Browse files
authored
Merge pull request #271 from digipost/remove-spring-and-jersey-dependencies
Remove spring and jersey dependencies
2 parents 5143b22 + 9f3e1de commit 1c65d3b

36 files changed

+702
-843
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@ 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@v3
1515
- name: Set up java
16-
uses: actions/setup-java@v1
16+
uses: actions/setup-java@v3.6.0
1717
with:
1818
java-version: ${{ matrix.java }}
19+
distribution: temurin
20+
cache: "maven"
1921
- name: Build with Maven
20-
run: mvn -B package --no-transfer-progress --file pom.xml
22+
run: mvn --settings .mvn/settings.xml -B package --no-transfer-progress
2123

2224
makeversion:
2325
if: github.ref != 'refs/heads/main'
@@ -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@v3
50+
- uses: digipost/action-maven-publish@1.3.2
4951
with:
5052
sonatype_secrets: ${{ secrets.sonatype_secrets }}
5153
release_version: ${{ needs.makeversion.outputs.version }}
@@ -58,9 +60,9 @@ jobs:
5860
name: Release to Sonatype
5961
steps:
6062
- name: Check out Git repository
61-
uses: actions/checkout@v1
63+
uses: actions/checkout@v3
6264
- name: Release to Central Repository
63-
uses: digipost/action-maven-publish@1.1.0
65+
uses: digipost/action-maven-publish@1.3.2
6466
with:
6567
sonatype_secrets: ${{ secrets.sonatype_secrets }}
6668
release_version: ${{ needs.makeversion.outputs.version }}

.mvn/settings.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4+
http://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
6+
<profiles>
7+
<profile>
8+
<id>sonatype_snapshots</id>
9+
<repositories>
10+
<repository>
11+
<id>oss.sonatype.org-snapshot</id>
12+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
13+
<releases>
14+
<enabled>false</enabled>
15+
</releases>
16+
<snapshots>
17+
<enabled>true</enabled>
18+
</snapshots>
19+
</repository>
20+
</repositories>
21+
</profile>
22+
</profiles>
23+
24+
<activeProfiles>
25+
<activeProfile>sonatype_snapshots</activeProfile>
26+
</activeProfiles>
27+
28+
</settings>

NOTICE

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,24 @@ Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html
88

99
This software includes third party software subject to the following licenses:
1010

11-
aopalliance version 1.0 repackaged as a module under EPL 2.0 or GPL2 w/ CPE
1211
Apache Commons Codec under Apache License, Version 2.0
1312
Apache Commons Lang under Apache License, Version 2.0
1413
Apache HttpClient under Apache License, Version 2.0
14+
Apache HttpComponents Core HTTP/1.1 under Apache License, Version 2.0
15+
Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0
1516
Apache HttpCore under Apache License, Version 2.0
1617
Digipost Certificate Validator under The Apache Software License, Version 2.0
17-
HK2 API module under EPL 2.0 or GPL2 w/ CPE
18-
HK2 Implementation Utilities under EPL 2.0 or GPL2 w/ CPE
1918
istack common utility code runtime under Eclipse Distribution License - v 1.0
2019
Jakarta Activation under EDL 1.0
2120
Jakarta Activation API jar under EDL 1.0
22-
Jakarta Annotations API under EPL 2.0 or GPL2 w/ CPE
2321
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
24-
jakarta.ws.rs-api under EPL 2.0 or GPL2 w/ CPE
25-
Javassist under MPL 1.1 or LGPL 2.1 or Apache License 2.0
26-
javax.inject:1 as OSGi bundle under EPL 2.0 or GPL2 w/ CPE
2722
JAXB Runtime under Eclipse Distribution License - v 1.0
2823
JAXB2 Basics - Runtime under BSD-Style License
2924
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
30-
jersey-core-client under EPL 2.0 or GPL2 w/ CPE or EDL 1.0 or BSD 2-Clause or Apache License, 2.0 or Public Domain or Modified BSD or jQuery license or MIT license or W3C license
31-
jersey-core-common under EPL 2.0 or The GNU General Public License (GPL), Version 2, With Classpath Exception or Apache License, 2.0 or Public Domain
32-
jersey-inject-hk2 under EPL 2.0 or GPL2 w/ CPE or EDL 1.0 or BSD 2-Clause or Apache License, 2.0 or Public Domain or Modified BSD or jQuery license or MIT license or W3C license
33-
jersey-media-multipart under EPL 2.0 or GPL2 w/ CPE or EDL 1.0 or BSD 2-Clause or Apache License, 2.0 or Public Domain or Modified BSD or jQuery license or MIT license or W3C license
34-
MIME streaming extension under Eclipse Distribution License - v 1.0
35-
OSGi resource locator under EPL 2.0 or GPL2 w/ CPE
3625
Posten signering - API JAXB Classes under The Apache Software License, Version 2.0
3726
Posten signering - API Schema under The Apache Software License, Version 2.0
3827
Posten signering - Java API Client Library under The Apache Software License, Version 2.0
39-
ServiceLocator Default Implementation under EPL 2.0 or GPL2 w/ CPE
4028
SLF4J API Module under MIT License
41-
Spring AOP under Apache License, Version 2.0
42-
Spring Beans under Apache License, Version 2.0
43-
Spring Commons Logging Bridge under Apache License, Version 2.0
44-
Spring Context under Apache License, Version 2.0
45-
Spring Core under Apache License, Version 2.0
46-
Spring Expression Language (SpEL) under Apache License, Version 2.0
47-
Spring Object/XML Marshalling under Apache License, Version 2.0
48-
spring-xml under Apache License, Version 2.0
4929
TXW2 Runtime under Eclipse Distribution License - v 1.0
5030

5131

0 commit comments

Comments
 (0)