Skip to content

Commit

Permalink
updating to motherpom and Spring 2.4.4 which seems to be the next rel…
Browse files Browse the repository at this point in the history
…ease that doesn't use plexus which creates conflict with errorprone and lombok google/error-prone#1481
  • Loading branch information
fmendezh committed Mar 31, 2021
1 parent de024d2 commit 0dcc5dc
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,8 @@ Concept createNewEntity() {
*/
static class ContexInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ Vocabulary createNewEntity() {
*/
static class ContexInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ public void listTest() {
*/
static class ContexInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,8 @@ public void findParentsTest() {

static class ContexInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ public void releaseVocabularyTest() throws IOException {

static class ContexInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ public void deprecateTest() {

static class ContexInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down
10 changes: 3 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,12 @@
</distributionManagement>

<properties>
<spring-boot.version>2.2.6.RELEASE</spring-boot.version>
<spring-boot.version>2.4.4</spring-boot.version>
<spring-cloud-openfeign.version>2.2.6.RELEASE</spring-cloud-openfeign.version>
<main.basedir>${project.basedir}</main.basedir>

<errorprone.excludedpaths>|.*/src/main/java/org/gbif/vocabulary/api/(DeprecateVocabularyAction|DeprecateConceptAction).java|.*/src/main/java/org/gbif/vocabulary/model/(Vocabulary|Concept|AbstractVocabularyEntity).java</errorprone.excludedpaths>

<!-- gbif -->
<gbif-api.version>0.142</gbif-api.version>
<gbif.common-mybatis.version>0.29</gbif.common-mybatis.version>
Expand Down Expand Up @@ -406,7 +408,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration combine.self="override">
<argLine>${surefireArgLine}</argLine>
<runOrder>random</runOrder>
Expand All @@ -420,7 +421,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
Expand All @@ -434,10 +434,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration combine.self="override">
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ String getBasePath() {

static class ContextInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ String getBasePath() {

static class ContexInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
TestPropertyValues.of(
"spring.datasource.url=" + database.getPostgresContainer().getJdbcUrl(),
Expand Down

0 comments on commit 0dcc5dc

Please sign in to comment.