Skip to content

Commit 40c5abb

Browse files
authored
Merge pull request #136 from digipost/update_xmlsec
Oppdaterer xmlsec
2 parents 7cff0c8 + baea604 commit 40c5abb

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
java: [ '1.8', '11' ]
10+
java: [ '8', '11.0.16+1' ]
1111

1212
name: build java ${{ matrix.java }}
1313
steps:
1414
- uses: actions/checkout@v1
1515
with:
1616
submodules: true
17-
- name: Set up java
18-
uses: actions/setup-java@v1
17+
- name: Set up JDK
18+
uses: actions/setup-java@v2.3.1
1919
with:
20+
distribution: zulu
2021
java-version: ${{ matrix.java }}
22+
server-id: github
23+
cache: 'maven'
2124
- name: Build with Maven
2225
run: mvn -B package --no-transfer-progress --file pom.xml
2326

api-client/NOTICE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,5 @@ This software includes third party software subject to the following licenses:
5454
spring-ws-core under Apache License, Version 2.0
5555
spring-ws-security under Apache License, Version 2.0
5656
spring-xml under Apache License, Version 2.0
57-
Stax2 API under The BSD License
5857
TXW2 Runtime under Eclipse Distribution License - v 1.0
59-
Woodstox under The Apache License, Version 2.0
6058

api-commons/NOTICE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,5 @@ This software includes third party software subject to the following licenses:
5050
spring-ws-core under Apache License, Version 2.0
5151
spring-ws-security under Apache License, Version 2.0
5252
spring-xml under Apache License, Version 2.0
53-
Stax2 API under The BSD License
5453
TXW2 Runtime under Eclipse Distribution License - v 1.0
55-
Woodstox under The Apache License, Version 2.0
5654

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<project.previousVersion>set_with_-Dproject.previousVersion=X.Y</project.previousVersion>
2727

2828
<org.slf4j.version>1.7.32</org.slf4j.version>
29-
<spring.ws.version>3.1.1</spring.ws.version>
29+
<spring.ws.version>3.1.4</spring.ws.version>
3030
<wss4j.version>2.3.2</wss4j.version>
3131
<jaxb2-basics.version>0.12.0</jaxb2-basics.version>
3232
</properties>
@@ -116,21 +116,21 @@
116116
<dependency>
117117
<groupId>org.bouncycastle</groupId>
118118
<artifactId>bcprov-jdk15on</artifactId>
119-
<version>1.69</version>
119+
<version>1.70</version>
120120
</dependency>
121121

122122
<dependency>
123123
<groupId>org.springframework</groupId>
124124
<artifactId>spring-framework-bom</artifactId>
125-
<version>5.3.9</version>
125+
<version>5.3.23</version>
126126
<type>pom</type>
127127
<scope>import</scope>
128128
</dependency>
129129

130130
<dependency>
131131
<groupId>org.springframework.security</groupId>
132132
<artifactId>spring-security-bom</artifactId>
133-
<version>5.5.2</version>
133+
<version>5.7.5</version>
134134
<type>pom</type>
135135
<scope>import</scope>
136136
</dependency>
@@ -219,7 +219,7 @@
219219
<dependency>
220220
<groupId>org.apache.santuario</groupId>
221221
<artifactId>xmlsec</artifactId>
222-
<version>2.2.2</version>
222+
<version>3.0.1</version>
223223
</dependency>
224224

225225
<dependency>

0 commit comments

Comments
 (0)