Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update dependencies #1827

Merged
merged 3 commits into from
Jul 30, 2024
Merged

build: update dependencies #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eb32bf
build: update dependencies
takb Jul 29, 2024
f7cfb6d
chore: pom cleanup
takb Jul 29, 2024
e7893f3
chore: changelog
takb Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ RELEASING:
## [unreleased]

### Added
- updated dependencies: spring, swagger, geotools etc. ([#1827](https://github.com/GIScience/openrouteservice/pull/1827))
### Changed
### Deprecated
### Removed
Expand Down
58 changes: 0 additions & 58 deletions ors-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,6 @@
</exclusions>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
-->

<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand All @@ -159,53 +152,16 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
-->

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- TODO: find out why this fails
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>10.1.16</version>
<scope>provided</scope>
</dependency>
-->

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-->

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
Expand Down Expand Up @@ -240,20 +196,6 @@
</exclusions>
</dependency>
<!-- The following dependency is needed for the Spring Boot Actuator and validates beans -->
<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
-->

<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
105 changes: 1 addition & 104 deletions ors-engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
</resources>
</build>

<properties>
<jupiter.version>5.9.3</jupiter.version>
</properties>

<dependencies>
<dependency>
<groupId>com.carrotsearch</groupId>
Expand All @@ -80,43 +76,16 @@
</exclusions>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
-->
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>
-->

<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
Expand Down Expand Up @@ -179,14 +148,6 @@
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<type>pom</type>
</dependency>
-->

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
Expand Down Expand Up @@ -225,7 +186,7 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${jupiter.version}</version>
<scope>runtime</scope>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -264,79 +225,15 @@
<artifactId>postgresql</artifactId>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
<scope>test</scope>
</dependency> -->

<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik-api</artifactId>
<scope>test</scope>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
-->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>runtime</scope>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
-->

<!-- TODO: remove this if nothing breaks
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
-->
</dependencies>
</project>
29 changes: 15 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.11</version>
<version>3.3.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down Expand Up @@ -46,26 +46,27 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.timestamp>${maven.build.timestamp}</project.timestamp>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
<springdoc-openapi-starter.version>2.1.0</springdoc-openapi-starter.version>
<swagger-parser.version>2.1.16</swagger-parser.version>
<snakeyaml.version>2.0</snakeyaml.version>
<geotools.version>29.1</geotools.version>
<springdoc-openapi-starter.version>2.6.0</springdoc-openapi-starter.version>
<swagger-parser.version>2.1.22</swagger-parser.version>
<snakeyaml.version>2.2</snakeyaml.version>
<geotools.version>29.6</geotools.version>
<!-- switch graphhopper versions to enable debugging -->
<graphhopper.version>v4.9.1</graphhopper.version>
<!--graphhopper.version>v4.9-SNAPSHOT</graphhopper.version-->
<slf4j.version>2.0.7</slf4j.version>
<log4j.version>2.20.0</log4j.version>
<fasterxml.jackson.version>2.14.2</fasterxml.jackson.version>
<commons-io.version>2.11.0</commons-io.version>
<slf4j.version>2.0.13</slf4j.version>
<log4j.version>2.22.1</log4j.version>
<fasterxml.jackson.version>2.17.2</fasterxml.jackson.version>
<commons-io.version>2.16.1</commons-io.version>
<typesafe-config.version>1.4.1</typesafe-config.version>
<jts.version>1.19.0</jts.version>
<org-json.version>20231013</org-json.version>
<postgresql.version>42.7.2</postgresql.version>
<org-json.version>20240303</org-json.version>
<postgresql.version>42.7.3</postgresql.version>
<progressbar.version>0.10.0</progressbar.version>
<jline.version>3.25.0</jline.version>
<jqwik.version>1.6.5</jqwik.version>
<jline.version>3.26.3</jline.version>
<jqwik.version>1.9.0</jqwik.version>
<json-simple.version>1.1.1</json-simple.version>
<swagger-core.version>2.2.14</swagger-core.version>
<jupiter.version>5.10.3</jupiter.version>
<swagger-core.version>2.2.22</swagger-core.version>
<sonar.projectKey>GIScience_openrouteservice</sonar.projectKey>
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
<sonar.organization>giscience</sonar.organization>
Expand Down
Loading