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.

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

fix maven dependencies version #5930

Merged
merged 12 commits into from
Nov 18, 2021
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ allprojects {
implementation("javax.servlet:javax.servlet-api:4.0.1")
implementation("commons-configuration:commons-configuration:1.10")
implementation("org.apache.commons:commons-configuration2:2.7")
implementation("org.hibernate:hibernate-validator:7.0.1.Final")
implementation("org.hibernate:hibernate-validator:6.2.0.Final")

// testng also used in our 'source' code to support unit tests
implementation("org.testng:testng:7.4.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@
<artifactId>snappy-java</artifactId>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>

</dependencies>

<build>
Expand All @@ -155,7 +160,10 @@
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.janusgraph:janusgraph-cql:*
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>joda-time:joda-time:*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>joda-time:joda-time:*
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.hibernate.validator:hibernate-validator:*
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.antlr:antlr-runtime:jar:*
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.xerial.snappy:snappy-java:*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,11 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down Expand Up @@ -496,6 +501,9 @@
<!-- Spring seems to cause false positives on dependency checker -->
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-web:*
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-validation:*
</ignoredUnusedDeclaredDependency>

<ignoredUnusedDeclaredDependency>
org.springframework.boot:spring-boot-starter-security:*
</ignoredUnusedDeclaredDependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.context.event.ContextRefreshedEvent;
Expand All @@ -32,8 +31,9 @@
import java.util.*;


@SpringBootApplication
@ComponentScan(basePackages = {"${scan.packages}"})
@SpringBootApplication(
scanBasePackages = {"${scan.packages}"}
)
@OpenAPIDefinition(
info = @Info(
title = "Egeria's Open Metadata and Governance (OMAG) Server Platform",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
Expand Down Expand Up @@ -369,7 +374,6 @@
<ignoredUnusedDeclaredDependency>org.odpi.egeria:*spring*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>javax.xml.bind:*jaxb*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot:*:*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.cloud:*:*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.tomcat.embed:tomcat-embed-core:*</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
import javax.annotation.PostConstruct;

@SpringBootApplication(
scanBasePackages = {"${scan.packages}"},
exclude={DataSourceAutoConfiguration.class}
scanBasePackages = {"${scan.packages}"}
)
@EnableConfigurationProperties(
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@

<artifactId>access-services-fvt</artifactId>

<dependencies>
<dependency>
<groupId>org.odpi.egeria</groupId>
<artifactId>graph-repository-connector</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<!-- We don't make use of the assembly at a jar level, but we need it
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<javax.servlet.version>4.0.1</javax.servlet.version>
<thrift.version>0.15.0</thrift.version>
<elasticsearch.version>7.15.1</elasticsearch.version>
<hibernate-validator.version>7.0.1.Final</hibernate-validator.version>
<hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
<!-- Versions of plugins -->
<enunciate-maven-plugin.version>2.10.1</enunciate-maven-plugin.version>
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
Expand Down Expand Up @@ -2782,6 +2782,12 @@
<version>${spring-boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>${spring-boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down