Skip to content

Commit

Permalink
DSND-2703: Upgrade to Java 21 (#114)
Browse files Browse the repository at this point in the history 
* DSND-2703: Upgrade to Java 21

* DSND-2703: Get docker working with cucumber tests

* The cucumber tests would not run due to testcontainers not
  finding a "valid docker environment". The reason for this was
  because data-sync-api-sdk-java had the transitive dependency
  docker-java-api which is out of date (presumeably out of date
  with the current spring or testcontainers version. Therefore,
  adding the docker-java-api dependency to the pom with the most
  recent version got the cucumber tests running, albeit not all
  pass.
* In addition to this, I've added docker-java-api as an exclusion
  to data-sync-api-sdk-java to be even more explicit - this might
  get removed going forward as it may be deemed unneccessary.

* DSND-2703: WIP get cucumber 503s working

* TestRestTemplate was timing out due to waiting for Mongo to respond.
  This was caused by an out of date transitive dep.

* DSND-2703: Remove unused dep

* DSND-2703: Remove unused property from pom

* DSND-2703: Clean up pom

* DSND-2703: Fix failing GET list cucumber tests

* DSND-2703: Add autocloseable to steps
  • Loading branch information
@sthompsonCH
sthompsonCH committed Jul 5, 2024
1 parent 0138d4c commit fdbec4c
Show file tree
Hide file tree
Showing 8 changed files with 342 additions and 280 deletions.
89 changes: 40 additions & 49 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>companies-house-parent</artifactId>
<version>2.1.4</version>
<version>2.1.5</version>
<relativePath />
</parent>
<artifactId>psc-data-api</artifactId>
Expand All @@ -14,37 +14,29 @@
<name>psc-data-api</name>
<description>Service handling CRUD functions for pscs</description>
<properties>
<java.version>11</java.version>
<java.version>21</java.version>
<start-class>uk.gov.companieshouse.pscdataapi.PscDataApiApplication</start-class>
<spring-boot-dependencies.version>2.6.4</spring-boot-dependencies.version>
<spring-boot-maven-plugin.version>2.6.4</spring-boot-maven-plugin.version>
<spring-boot-dependencies.version>3.3.1</spring-boot-dependencies.version>
<spring-boot-maven-plugin.version>3.3.1</spring-boot-maven-plugin.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<jib-maven-plugin.version>3.3.0</jib-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<ch-kafka.version>1.4.2</ch-kafka.version>
<kafka-models.version>1.0.34</kafka-models.version>
<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
<jib-maven-plugin.version>3.3.1</jib-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>

<!-- Internal -->
<structured-logging.version>1.9.25</structured-logging.version>
<private-api-sdk-java.version>2.0.420</private-api-sdk-java.version>
<data-sync-api-sdk-java.version>1.0.4</data-sync-api-sdk-java.version>
<api-security-java.version>0.4.1</api-security-java.version>
<api-sdk-manager-java-library.version>1.0.8</api-sdk-manager-java-library.version>
<api-helper-java-library.version>1.4.5</api-helper-java-library.version>
<sdk-manager-java.version>1.5.17</sdk-manager-java.version>
<structured-logging.version>3.0.8</structured-logging.version>
<private-api-sdk-java.version>4.0.162</private-api-sdk-java.version>
<data-sync-api-sdk-java.version>1.0.6</data-sync-api-sdk-java.version>
<api-security-java.version>2.0.4</api-security-java.version>
<api-sdk-manager-java-library.version>3.0.5</api-sdk-manager-java-library.version>

<!-- tests -->
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<jib-maven-plugin.version>3.3.0</jib-maven-plugin.version>
<io-cucumber.version>7.2.3</io-cucumber.version>
<test-containers.version>1.16.3</test-containers.version>
<maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
<assertj-core.version>3.22.0</assertj-core.version>
<jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
<io-cucumber.version>7.18.0</io-cucumber.version>
<test-containers.version>1.19.8</test-containers.version>
<skip.integration.tests>false</skip.integration.tests>
<skip.unit.tests>false</skip.unit.tests>
<maven-resources-plugin.version>2.5</maven-resources-plugin.version>

<!--sonar configuration-->
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml,
Expand Down Expand Up @@ -93,11 +85,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>ch-kafka</artifactId>
<version>${ch-kafka.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>structured-logging</artifactId>
Expand All @@ -108,32 +95,35 @@
<artifactId>private-api-sdk-java</artifactId>
<version>${private-api-sdk-java.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>api-sdk-manager-java-library</artifactId>
<version>${api-sdk-manager-java-library.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>data-sync-api-sdk-java</artifactId>
<version>${data-sync-api-sdk-java.version}</version>
<exclusions>
<!-- Exclusion due to transitive dependency being an older version-->
<exclusion>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>api-helper-java</artifactId>
<version>${api-helper-java-library.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>api-security-java</artifactId>
Expand Down Expand Up @@ -166,11 +156,12 @@
<groupId>org.testcontainers</groupId>
<artifactId>mongodb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.companieshouse</groupId>
<artifactId>kafka-models</artifactId>
<version>${kafka-models.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
Loading

0 comments on commit fdbec4c

Please sign in to comment.