Skip to content

Commit

Permalink
chore(deps): upgrade Spring to 6.2.0 and Security to 6.4.1
Browse files Browse the repository at this point in the history 
Also upgrade SpringDoc to 2.7.0 and Boot to 3.4.0.
  • Loading branch information
@cmark
cmark committed Dec 10, 2024
1 parent 6f72df1 commit ce6d02e
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 42 deletions.
34 changes: 17 additions & 17 deletions core/com.b2international.snowowl.core.rest/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-config-6.3.4.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-core-6.3.4.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-web-6.3.4.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-crypto-6.3.4.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-jcl-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-webmvc-6.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-boot-autoconfigure-3.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-boot-3.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/springdoc-openapi-starter-common-2.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/springdoc-openapi-starter-webmvc-api-2.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/swagger-core-jakarta-2.2.22.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-config-6.4.1.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-core-6.4.1.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-web-6.4.1.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-security-crypto-6.4.1.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-jcl-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-webmvc-6.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-boot-autoconfigure-3.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-boot-3.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/springdoc-openapi-starter-common-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/springdoc-openapi-starter-webmvc-api-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/swagger-core-jakarta-2.2.25.jar"/>
<classpathentry kind="src" output="target/classes" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
34 changes: 17 additions & 17 deletions core/com.b2international.snowowl.core.rest/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ Automatic-Module-Name: com.b2international.snowowl.rest
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
WEB-INF/lib/spring-aop-6.1.13.jar,
WEB-INF/lib/spring-beans-6.1.13.jar,
WEB-INF/lib/spring-boot-3.3.2.jar,
WEB-INF/lib/spring-boot-autoconfigure-3.3.2.jar,
WEB-INF/lib/spring-context-6.1.13.jar,
WEB-INF/lib/spring-core-6.1.13.jar,
WEB-INF/lib/springdoc-openapi-starter-common-2.6.0.jar,
WEB-INF/lib/springdoc-openapi-starter-webmvc-api-2.6.0.jar,
WEB-INF/lib/spring-expression-6.1.13.jar,
WEB-INF/lib/spring-jcl-6.1.13.jar,
WEB-INF/lib/spring-security-config-6.3.4.jar,
WEB-INF/lib/spring-security-core-6.3.4.jar,
WEB-INF/lib/spring-security-crypto-6.3.4.jar,
WEB-INF/lib/spring-security-web-6.3.4.jar,
WEB-INF/lib/spring-web-6.1.13.jar,
WEB-INF/lib/spring-webmvc-6.1.13.jar,
WEB-INF/lib/swagger-core-jakarta-2.2.22.jar
WEB-INF/lib/spring-aop-6.2.0.jar,
WEB-INF/lib/spring-beans-6.2.0.jar,
WEB-INF/lib/spring-boot-3.4.0.jar,
WEB-INF/lib/spring-boot-autoconfigure-3.4.0.jar,
WEB-INF/lib/spring-context-6.2.0.jar,
WEB-INF/lib/spring-core-6.2.0.jar,
WEB-INF/lib/springdoc-openapi-starter-common-2.7.0.jar,
WEB-INF/lib/springdoc-openapi-starter-webmvc-api-2.7.0.jar,
WEB-INF/lib/spring-expression-6.2.0.jar,
WEB-INF/lib/spring-jcl-6.2.0.jar,
WEB-INF/lib/spring-security-config-6.4.1.jar,
WEB-INF/lib/spring-security-core-6.4.1.jar,
WEB-INF/lib/spring-security-crypto-6.4.1.jar,
WEB-INF/lib/spring-security-web-6.4.1.jar,
WEB-INF/lib/spring-web-6.2.0.jar,
WEB-INF/lib/spring-webmvc-6.2.0.jar,
WEB-INF/lib/swagger-core-jakarta-2.2.25.jar
Require-Bundle: org.eclipse.equinox.security;bundle-version="1.3.200",
com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.16.1",
com.fasterxml.jackson.core.jackson-core;bundle-version="2.16.1",
Expand Down
18 changes: 10 additions & 8 deletions core/com.b2international.snowowl.core.rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@
<packaging>eclipse-plugin</packaging>

<properties>
<spring.version>6.1.13</spring.version>
<spring.security.version>6.3.4</spring.security.version>
<springdoc.version>2.6.0</springdoc.version>
<spring.version>6.2.0</spring.version>
<spring.security.version>6.4.1</spring.security.version>
<springdoc.version>2.7.0</springdoc.version>
<!-- Ensure that Spring Boot version matches the version supported by SpringDoc -->
<spring.boot.version>3.4.0</spring.boot.version>
<!-- Make sure this version matches the one present in the target-platform for swagger-annotations and models -->
<swagger.core.version>2.2.22</swagger.core.version>
<swagger.core.version>2.2.25</swagger.core.version>
<!-- Node.js version to use for building the API docs site -->
<node.version>v20.16.0</node.version>
<npm.version>10.8.2</npm.version>
<node.version>v20.18.1</node.version>
<npm.version>10.9.2</npm.version>
</properties>

<!-- NOTE: in case of dependency changes, please update the includeArtifactIds section in the maven-dependency-plugin configuration as well, listing all (exact and transitive) dependency artifactIds -->
Expand Down Expand Up @@ -57,13 +59,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>3.3.2</version>
<version>${spring.boot.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>3.3.2</version>
<version>${spring.boot.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit ce6d02e

Please sign in to comment.