Browse Source

Fixed dependency - use data commons instead of boot jpa starter

pull/5765/head
Volodymyr Babak 5 years ago
parent
commit
c3e65c5019
  1. 4
      common/data/pom.xml
  2. 1
      common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
  3. 6
      pom.xml

4
common/data/pom.xml

@ -65,8 +65,8 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

1
common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java

@ -20,7 +20,6 @@ import lombok.Data;
import org.springframework.data.domain.Sort;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

6
pom.xml

@ -40,6 +40,7 @@
<jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
<jaxb-runtime.version>2.3.2</jaxb-runtime.version>
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<spring-data.version>2.3.9.RELEASE</spring-data.version>
<spring.version>5.2.16.RELEASE</spring.version>
<spring-redis.version>5.2.11.RELEASE</spring-redis.version>
<spring-security.version>5.4.7</spring-security.version>
@ -1130,6 +1131,11 @@
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>${spring-data.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>

Loading…
Cancel
Save