Skip to content
This repository has been archived by the owner on Jan 14, 2025. It is now read-only.

Commit

Permalink
Merge pull request #112 from digipost/master
Browse files Browse the repository at this point in the history
Oppdater Spring Framework til 5.3.18
  • Loading branch information
runeflobakk authored Apr 6, 2022
2 parents 8038aa8 + 0f705b2 commit 9f31e3e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
4 changes: 1 addition & 3 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This software includes third party software subject to the following licenses:
Bouncy Castle Provider under Bouncy Castle Licence
Cryptacular Library under Apache 2 or GNU Lesser General Public License
Digipost Certificate Validator under The Apache Software License, Version 2.0
Extended StAX API under Dual license consisting of the CDDL v1.1 and GPL v2
Extended StAX API under Eclipse Distribution License - v 1.0
Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0
Guava: Google Core Libraries for Java under Apache License, Version 2.0
istack common utility code runtime under Eclipse Distribution License - v 1.0
Expand All @@ -33,7 +33,6 @@ This software includes third party software subject to the following licenses:
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
Jakarta XML Web Services API under Eclipse Distribution License - v 1.0
JASYPT: Java Simplified Encryption under The Apache Software License, Version 2.0
JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0
JAXB Runtime under Eclipse Distribution License - v 1.0
JAXB2 Basics - Runtime under BSD-Style License
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
Expand Down Expand Up @@ -63,7 +62,6 @@ This software includes third party software subject to the following licenses:
spring-ws-security under Apache License, Version 2.0
spring-xml under Apache License, Version 2.0
Stax2 API under The BSD License
Streaming API for XML under GNU General Public Library or COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
TXW2 Runtime under Eclipse Distribution License - v 1.0
Woodstox under The Apache License, Version 2.0

2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</parent>

<properties>
<sdp-shared.version>3.0</sdp-shared.version>
<sdp-shared.version>3.1</sdp-shared.version>
</properties>

<dependencyManagement>
Expand Down
16 changes: 8 additions & 8 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring.ws.version>3.1.1</spring.ws.version>
<spring.ws.version>3.1.3</spring.ws.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -168,7 +168,7 @@
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>2.2.2</version>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -191,16 +191,16 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sikker-digital-post-klient-bom</artifactId>
<version>${project.version}</version>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.18</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.9</version>
<groupId>${project.groupId}</groupId>
<artifactId>sikker-digital-post-klient-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down

0 comments on commit 9f31e3e

Please sign in to comment.