Skip to content

Commit

Permalink
Update to Spring Boot 3.1.0 and refactor pom (#2987)
Browse files Browse the repository at this point in the history
  • Loading branch information
@justin-tay
justin-tay committed May 20, 2023
1 parent 3cc306b commit a23401f
Show file tree
Hide file tree
Showing 17 changed files with 328 additions and 274 deletions.
19 changes: 0 additions & 19 deletions elide-async/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
Expand All @@ -71,7 +70,6 @@
<dependency>
<groupId>com.github.opendevl</groupId>
<artifactId>json2flat</artifactId>
<version>1.0.3</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -83,14 +81,12 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>

<!-- Test -->
<dependency>
<groupId>com.github.codemonstur</groupId>
<artifactId>embedded-redis</artifactId>
<version>${embedded-redis.version}</version>
<scope>test</scope>
</dependency>
<!-- For Export End-Point Test -->
Expand Down Expand Up @@ -146,21 +142,6 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>8.0.0.Final</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>5.0.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>4.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
15 changes: 1 addition & 14 deletions elide-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,11 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>${version.antlr4}</version>
</dependency>

<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>

<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
Expand All @@ -80,7 +76,6 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
Expand All @@ -94,19 +89,16 @@
<dependency>
<groupId>cz.jirutka.rsql</groupId>
<artifactId>rsql-parser</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>2.2.21</version>
</dependency>

<!-- JSR 303 Validation -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>

<!-- Logging -->
Expand All @@ -118,30 +110,25 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>10.1.8</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>2.4.0</version>
</dependency>

<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.157</version>
</dependency>

<dependency>
<groupId>org.owasp.encoder</groupId>
<artifactId>encoder</artifactId>
<version>1.2.3</version>
</dependency>

<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>22.3.1</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -202,7 +189,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${version.antlr4}</version>
<version>${antlr4.version}</version>
<configuration>
<visitor>true</visitor>
</configuration>
Expand Down
33 changes: 1 addition & 32 deletions elide-datastore/elide-datastore-aggregation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
</scm>

<properties>
<!-- Requires Java 11 -->
<hikari.version>5.0.1</hikari.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -90,56 +88,29 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>1.34.0</version>
<exclusions>
<!-- Excluded for CVE errors -->
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<!-- Excluded for conflict with elide-async's version -->
</exclusions>
</dependency>
<!-- Avoid CVE-2020-13956 -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.15</version>
<scope>runtime</scope>
</dependency>

<!-- Caffeine cache -->
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<!-- Requires Java 11 -->
<version>3.1.1</version>
</dependency>

<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>${hikari.version}</version>
</dependency>

<!-- Redis cache -->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>

<!-- Test -->
<dependency>
<groupId>com.github.codemonstur</groupId>
<artifactId>embedded-redis</artifactId>
<version>${embedded-redis.version}</version>
<scope>test</scope>
</dependency>
<!-- JUnit -->
Expand Down Expand Up @@ -176,7 +147,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.3.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -221,9 +191,8 @@
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate6.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
7 changes: 1 addition & 6 deletions elide-datastore/elide-datastore-jms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>

<!-- Test dependencies -->
Expand Down Expand Up @@ -86,21 +85,18 @@

<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
<version>2.28.0</version>
<artifactId>artemis-jakarta-server</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>3.1.0</version>
</dependency>

<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-jakarta-client-all</artifactId>
<version>2.28.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -131,7 +127,6 @@
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.0.0</version>
</dependency>

<!-- dependencies for native jetty websocket -->
Expand Down
6 changes: 1 addition & 5 deletions elide-datastore/elide-datastore-jpa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -131,14 +130,13 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-ant</artifactId>
<version>${hibernate6.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -149,7 +147,6 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate6.version}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -179,7 +176,6 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${hibernate6.version}</version>
<scope>test</scope>
</dependency>

Expand Down
9 changes: 7 additions & 2 deletions elide-datastore/elide-datastore-search/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,22 @@
<artifactId>jakarta.persistence-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<!-- This override is for hibernate-search-mapper-orm-orm6 6.1 fails with 6.2.2.Final -->
<version>6.1.7.Final</version>
</dependency>

<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-orm6</artifactId>
<version>6.1.8.Final</version>
</dependency>

<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-lucene</artifactId>
<version>6.1.8.Final</version>
</dependency>

<dependency>
Expand Down
6 changes: 0 additions & 6 deletions elide-datastore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,6 @@
<artifactId>elide-test-helpers</artifactId>
<version>7.0.0-pr5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>8.0.0.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down
11 changes: 3 additions & 8 deletions elide-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,17 @@
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.0.0</version>
</dependency>

<!-- Subscription serialization -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>

<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>3.1.0</version>
</dependency>

<!-- Test -->
Expand All @@ -107,9 +104,8 @@
</dependency>

<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.13</version>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -141,7 +137,6 @@
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -151,7 +146,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${version.antlr4}</version>
<version>${antlr4.version}</version>
<configuration>
<visitor>true</visitor>
</configuration>
Expand Down
Loading

0 comments on commit a23401f

Please sign in to comment.