Skip to content

Commit

Permalink
Merge branch 'master' into feature/accreditation_control
Browse files Browse the repository at this point in the history 
* master: (32 commits)
  Fix unit dependencies to run unit tests
  Bump jobrunr-spring-boot-starter from 3.0.0 to 3.0.1 (#104)
  Bump spring-data-commons from 2.3.1.RELEASE to 2.5.1 (#76)
  Bump lombok from 1.18.10 to 1.18.20 (#83)
  Bump pf4j-spring from 0.6.0 to 0.7.0 (#80)
  Bump pf4j from 3.3.1 to 3.6.0 (#89)
  Bump spring-security-oauth2-autoconfigure from 2.4.5 to 2.5.0 (#102)
  Bump jobrunr-spring-boot-starter from 2.0.1 to 3.0.0 (#101)
  Bump commons-lang3 from 3.10 to 3.12.0 (#99)
  Bump jacoco-maven-plugin from 0.8.5 to 0.8.7 (#77)
  Bump powermock-module-javaagent from 2.0.7 to 2.0.9 (#100)
  Bump jackson-datatype-joda from 2.8.7 to 2.12.3 (#91)
  Bump jaxb-core from 2.3.0 to 3.0.1 (#92)
  Bump powermock-module-junit4 from 2.0.7 to 2.0.9 (#96)
  Bump powermock-module-junit4-rule from 2.0.7 to 2.0.9 (#98)
  Bump querydsl-jpa from 4.3.1 to 4.4.0 (#97)
  Bump spring-boot-starter-parent from 2.3.1.RELEASE to 2.5.0 (#95)
  Bump sshd-sftp from 2.5.0 to 2.6.0 (#94)
  Bump powermock-api-mockito2 from 2.0.7 to 2.0.9 (#93)
  Bump querydsl-apt from 4.3.1 to 4.4.0 (#82)
  ...
  • Loading branch information
@dtrouillet
dtrouillet committed May 28, 2021
2 parents 3a70e43 + 6010004 commit c95a4c6
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 39 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "maven"
open-pull-requests-limit: 50
directory: "/"
schedule:
interval: "daily"
63 changes: 35 additions & 28 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>spring-boot-starter-parent</artifactId>
<groupId>org.springframework.boot</groupId>
<version>2.3.1.RELEASE</version>
<version>2.5.0</version>
<relativePath />
</parent>
<licenses>
Expand All @@ -32,8 +32,8 @@

<assertj-core.version>1.0.0m1</assertj-core.version>
<awaitility.version>1.7.0</awaitility.version>
<commons-io.version>2.7</commons-io.version>
<commons-lang.version>3.10</commons-lang.version>
<commons-io.version>2.9.0</commons-io.version>
<commons-lang.version>3.12.0</commons-lang.version>
<gatling-maven-plugin.version>2.2.4</gatling-maven-plugin.version>
<gatling.version>2.3.0</gatling.version>
<java.version>11</java.version>
Expand All @@ -50,9 +50,9 @@
<spring-security-oauth2.version>2.5.0.RELEASE</spring-security-oauth2.version>
<usertype-core.version>7.0.0.CR1</usertype-core.version>
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
<pf4j-spring.version>0.6.0</pf4j-spring.version>
<pf4j.version>3.3.1</pf4j.version>
<jobrunr.version>2.0.1</jobrunr.version>
<pf4j-spring.version>0.7.0</pf4j-spring.version>
<pf4j.version>3.6.0</pf4j.version>
<jobrunr.version>3.0.1</jobrunr.version>
<git.user />
<git.password />
<jacoco.agent.ut.arg />
Expand Down Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>2.8.7</version>
<version>2.12.3</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -177,12 +177,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
Expand Down Expand Up @@ -301,7 +301,7 @@
<dependency>
<groupId>org.springframework.security.oauth.boot</groupId>
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.0</version>
</dependency>

<dependency>
Expand All @@ -321,39 +321,39 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>2.0.7</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>2.0.7</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-rule</artifactId>
<version>2.0.7</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-classloading-xstream</artifactId>
<version>2.0.7</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.10</version>
<version>1.18.20</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.zalando</groupId>
<artifactId>problem-spring-web</artifactId>
<version>0.25.2</version>
<version>0.26.2</version>
</dependency>

<dependency>
Expand All @@ -370,29 +370,29 @@
<dependency>
<groupId>com.openpojo</groupId>
<artifactId>openpojo</artifactId>
<version>0.8.13</version>
<version>0.9.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>4.3.1</version>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<version>4.3.1</version>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.4.2</version>
<version>1.5.9</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -407,18 +407,18 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-javaagent</artifactId>
<version>2.0.7</version>
<version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.agent</artifactId>
<version>0.8.5</version>
<version>0.8.7</version>
</dependency>
<dependency>
<groupId>org.pf4j</groupId>
Expand Down Expand Up @@ -458,7 +458,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>3.10.2</version>
<version>4.3.5</version>
</dependency>

<!-- WEBSOCKET -->
Expand All @@ -472,7 +472,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -522,7 +522,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.7</version>

<executions>
<execution>
Expand Down Expand Up @@ -556,12 +556,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<jacoco-agent.destfile>${project.build.directory}/coverage.exec</jacoco-agent.destfile>
</systemPropertyVariables>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.22.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/fr/icdc/ebad/web/rest/ApplicationResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ public void getUsersFromApplication() throws Exception {
restMvc.perform(builder)
.andExpect(status().isOk())
.andExpect(jsonPath("$", hasSize(2)))
.andExpect(jsonPath("$[0].id", is(1)))
.andExpect(jsonPath("$[1].id", is(2)))
.andExpect(jsonPath("$[0].login", is("test1")))
.andExpect(jsonPath("$[1].login", is("test2")));
.andExpect(jsonPath("$[0].id", is(2)))
.andExpect(jsonPath("$[1].id", is(1)))
.andExpect(jsonPath("$[0].login", is("test2")))
.andExpect(jsonPath("$[1].login", is("test1")));
}

@Test
Expand All @@ -280,10 +280,10 @@ public void getModeratorsFromApplication() throws Exception {
restMvc.perform(builder)
.andExpect(status().isOk())
.andExpect(jsonPath("$", hasSize(2)))
.andExpect(jsonPath("$[0].id", is(1)))
.andExpect(jsonPath("$[1].id", is(2)))
.andExpect(jsonPath("$[0].login", is("test1")))
.andExpect(jsonPath("$[1].login", is("test2")));
.andExpect(jsonPath("$[0].id", is(2)))
.andExpect(jsonPath("$[1].id", is(1)))
.andExpect(jsonPath("$[0].login", is("test2")))
.andExpect(jsonPath("$[1].login", is("test1")));
}

@Test
Expand Down
5 changes: 2 additions & 3 deletions src/test/resources/config/application-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@ async:
maxPoolSize: 50
queueCapacity: 10000
spring:
profiles:
active: test
datasource:
dataSourceClassName: org.h2.Driver
url: jdbc:h2:mem:ebad;DB_CLOSE_DELAY=-1
databaseName:
serverName:
username:
password:
data: classpath:nop.sql

jpa:
database-platform: org.hibernate.dialect.PostgreSQLDialect
Expand All @@ -32,7 +29,9 @@ spring:
hibernate.generate_statistics: true
javax.persistence.schema-generation.database.action: drop-and-create
javax.persistence.schema-generation.drop-source: script-then-metadata
javax.persistence.schema-generation.create-source: metadata-then-script
javax.persistence.schema-generation.drop-script-source: drop-tables.sql
javax.persistence.schema-generation.create-script-source: nop.sql
main:
allow-bean-definition-overriding: true
banner-mode: "off"
Expand Down

0 comments on commit c95a4c6

Please sign in to comment.