Skip to content
Snippets Groups Projects
Commit dcb7308e authored by Derek Hudson's avatar Derek Hudson
Browse files

Upgraded Spring WebMVC version.

parent 238f1378
No related branches found
No related tags found
1 merge request!946Upgraded Spring WebMVC version.
Hide whitespace changes
Inline Side-by-side
NOTICE
+ 6
− 7
View file @ dcb7308e
......@@ -68,8 +68,8 @@ The following software have components provided under the terms of this license:
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Cloud Key Management Service (KMS) API v1-rev20240903-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Cloud Storage JSON API v1-rev20240916-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Cloud Key Management Service (KMS) API v1-rev20240918-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Cloud Storage JSON API v1-rev20240924-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
- Commons Digester (from http://commons.apache.org/digester/)
- Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
......@@ -266,7 +266,6 @@ The following software have components provided under the terms of this license:
- java-cloudant (from https://cloudant.com)
- javatuples (from http://www.javatuples.org)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
- javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common)
- jersey-repackaged-guava (from https://repo1.maven.org/maven2/org/glassfish/jersey/bundles/repackaged/jersey-guava)
......@@ -282,6 +281,7 @@ The following software have components provided under the terms of this license:
- msg-simple (from https://github.com/java-json-tools/msg-simple)
- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
- org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/)
- org.glassfish.hk2.external:javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/, https://www.xmlunit.org/)
- perfmark:perfmark-api (from https://github.com/perfmark/perfmark)
......@@ -415,8 +415,8 @@ The following software have components provided under the terms of this license:
- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
- javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- jersey-repackaged-guava (from https://repo1.maven.org/maven2/org/glassfish/jersey/bundles/repackaged/jersey-guava)
- org.glassfish.hk2.external:javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
========================================================================
CDDL-1.1
......@@ -428,9 +428,9 @@ The following software have components provided under the terms of this license:
- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
- javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- jersey-repackaged-guava (from https://repo1.maven.org/maven2/org/glassfish/jersey/bundles/repackaged/jersey-guava)
- org.glassfish.hk2.external:javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- tomcat-embed-core (from http://tomcat.apache.org/)
========================================================================
......@@ -511,10 +511,10 @@ The following software have components provided under the terms of this license:
- ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
- javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common)
- jersey-repackaged-guava (from https://repo1.maven.org/maven2/org/glassfish/jersey/bundles/repackaged/jersey-guava)
- org.glassfish.hk2.external:javax.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- tomcat-embed-core (from http://tomcat.apache.org/)
========================================================================
......@@ -689,7 +689,6 @@ public-domain
========================================================================
The following software have components provided under the terms of this license:
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- JBoss Logging 3 (from http://www.jboss.org)
- JSON in Java (from https://github.com/douglascrockford/JSON-java)
- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
......
pom.xml
+ 2
− 2
View file @ dcb7308e
......@@ -37,8 +37,8 @@
<woodstox-core.version>6.5.1</woodstox-core.version>
<json-smart.version>2.5.0</json-smart.version>
<jackson.version>2.16.1</jackson.version>
<spring-framework-version>6.1.10</spring-framework-version>
<spring-boot.version>3.3.1</spring-boot.version>
<spring-framework-version>6.1.13</spring-framework-version>
<spring-boot.version>3.3.4</spring-boot.version>
<spring-security.version>6.3.1</spring-security.version>
</properties>
......
provider/storage-aws/pom.xml
+ 1
− 1
View file @ dcb7308e
......@@ -44,7 +44,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
provider/storage-gc/pom.xml
+ 1
− 1
View file @ dcb7308e
......@@ -35,7 +35,7 @@
<java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<spring-webmvc.version>6.1.3</spring-webmvc.version>
<spring-webmvc.version>6.1.13</spring-webmvc.version>
</properties>
<dependencyManagement>
......
provider/storage-ibm/pom.xml
+ 3
− 3
View file @ dcb7308e
......@@ -70,7 +70,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>6.2.4</version>
<version>${spring-security.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
......@@ -82,12 +82,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.1.6</version>
<version>${spring-framework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>6.1.6</version>
<version>${spring-framework-version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
......
storage-core-plus/pom.xml
+ 3
− 3
View file @ dcb7308e
......@@ -30,20 +30,20 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>6.1.5</version>
<version>${spring-framework-version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.2.4</version>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-bom</artifactId>
<version>6.2.3</version>
<version>${spring-security.version}</version>
<type>pom</type>
</dependency>
</dependencies>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment