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.

Sign up for GitHub

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

Software Library Updates #226

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Software Library Updates #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
678bb90
Software Library Updates
DivyaSreeMunagavalasa Dec 3, 2024
80a570b
Fix:package junit.framework does not exist
DivyaSreeMunagavalasa Dec 4, 2024
c36d374
Upgrading the open jdk version from 11 to 21
DivyaSreeMunagavalasa Dec 4, 2024
380cc1e
Upgrading java version dev and test docker files
DivyaSreeMunagavalasa Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/dev.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG VERSION="0.0.1-SNAPSHOT"

# Using maven base image in builder stage to build Java code.
FROM maven:3-eclipse-temurin-11-focal as builder
FROM maven:3-eclipse-temurin-21-jammy as builder

WORKDIR /usr/share/app
COPY pom.xml .
Expand All @@ -14,7 +14,7 @@ RUN mvn clean package -Dmaven.test.skip=true
# Getting GDAL latest image
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5 as gdal-latest
# Java Runtime as the base for final image
FROM eclipse-temurin:11-jre-focal
FROM eclipse-temurin:21.0.5_11-jre-jammy

ARG VERSION
ENV JAR="ogc-resource-server-dev-${VERSION}-fat.jar"
Expand Down
4 changes: 2 additions & 2 deletions docker/test.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG VERSION="0.0.1-SNAPSHOT"
# Getting GDAL latest image
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5 as gdal-latest

FROM maven:3-eclipse-temurin-11-focal
FROM maven:3-eclipse-temurin-21-jammy

WORKDIR /usr/share/app
COPY pom.xml .
Expand All @@ -26,7 +26,7 @@ RUN mv target/${JAR} ./fatjar.jar
RUN cp -r target/classes/ ./built-classes

# downloading JaCoCo JAR to run with the server JAR in javaagent mode
RUN wget https://repo1.maven.org/maven2/org/jacoco/jacoco/0.8.11/jacoco-0.8.11.zip -O /tmp/jacoco.zip
RUN wget https://repo1.maven.org/maven2/org/jacoco/jacoco/0.8.12/jacoco-0.8.12.zip -O /tmp/jacoco.zip
RUN apt update && apt install -y unzip && rm -rf /var/lib/apt/lists/*
RUN unzip /tmp/jacoco.zip -d /tmp/jacoco
RUN apt remove -y unzip && rm /tmp/jacoco.zip
Expand Down
77 changes: 44 additions & 33 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
<version>0.0.1-SNAPSHOT</version>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<vertx.version>4.5.4</vertx.version>
<junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
<apache-log4j2.version>2.23.1</apache-log4j2.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<vertx.version>4.5.11</vertx.version>
<junit-jupiter-engine.version>5.11.3</junit-jupiter-engine.version>
<apache-log4j2.version>2.24.2</apache-log4j2.version>
<lmax-disruptor.version>4.0.0</lmax-disruptor.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<checkstyle.version>10.13.0</checkstyle.version>
<micrometer.version>1.12.3</micrometer.version>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
<maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
<maven-checkstyle-plugin-google.version>3.3.1</maven-checkstyle-plugin-google.version>
<maven-surefire-report-plugin.version>3.2.5</maven-surefire-report-plugin.version>
<openjdk.version>11</openjdk.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<checkstyle.version>10.20.2</checkstyle.version>
<micrometer.version>1.14.1</micrometer.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
<maven-checkstyle-plugin-google.version>3.6.0</maven-checkstyle-plugin-google.version>
<maven-surefire-report-plugin.version>3.5.2</maven-surefire-report-plugin.version>
<httpclient.version>4.5.14</httpclient.version>
<awssdk-s3.version>2.29.24</awssdk-s3.version>
<rest-assured.version>5.5.0</rest-assured.version>
<postgresql.version>42.7.4</postgresql.version>
<openjdk.version>21</openjdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<exec.mainClass>ogc.rs.deploy.Deployer</exec.mainClass>
<skipUnitTests>false</skipUnitTests>
Expand Down Expand Up @@ -98,7 +102,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.2</version>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
Expand All @@ -111,13 +115,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.11.0</version>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.11.0</version>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -133,17 +137,17 @@
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-openapi</artifactId>
<version>4.5.4</version>
<version>4.5.11</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-validation</artifactId>
<version>4.5.4</version>
<version>4.5.11</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.12.7</version>
<version>2.13.0</version>
</dependency>
<!-- log4j2 logging dependencies-->
<dependency>
Expand Down Expand Up @@ -172,7 +176,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.27.17</version>
<version>${awssdk-s3.version}</version>
</dependency>
<dependency>
<groupId>com.ongres.scram</groupId>
Expand All @@ -185,11 +189,6 @@
<version>${maven-pmd-plugin.version}</version>
<type>maven-plugin</type>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-client</artifactId>
<version>4.5.4</version>
</dependency>
<dependency>
<groupId>io.reactiverse</groupId>
<artifactId>reactiverse-junit5-web-client</artifactId>
Expand Down Expand Up @@ -219,13 +218,13 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.37.3</version>
<version>9.47</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.78</version>
<version>1.79</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.awaitility/awaitility -->
Expand All @@ -238,13 +237,13 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>5.4.0</version>
<version>${rest-assured.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>json-path</artifactId>
<version>5.4.0</version>
<version>${rest-assured.version}</version>
<scope>test</scope>
</dependency>
<!-- Packages for Vertx metrics through micrometer -->
Expand All @@ -262,8 +261,20 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>${micrometer.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus-simpleclient -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
<version>${micrometer.version}</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -507,7 +518,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.2</version>
<version>${postgresql.version}</version>
</dependency>
</dependencies>

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/ogc/rs/restAssuredTest/ProcessesTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
import jdk.jfr.Description;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import static org.junit.jupiter.api.Assertions.assertEquals;

import static junit.framework.Assert.assertEquals;
import static ogc.rs.common.Constants.DESCRIPTION_KEY;
import static ogc.rs.common.Constants.INVALID_ENDPOINT_ERROR;
import static ogc.rs.common.Constants.NOT_FOUND;
import static ogc.rs.common.Constants.TYPE_KEY;


/** Integration tests for the Processes endpoint. */
@ExtendWith(RestAssuredConfigExtension.class)
public class ProcessesTestIT {
Expand Down