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

Update E2E to Java 21 #41

Merged
merged 2 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: [pull_request, push, workflow_dispatch]
jobs:
build:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
secrets: inherit
with:
vulnerability_scan_only: true
java_version: "21"
secrets: inherit
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
release_type: ${{ inputs.release_type }}
version_number_input: ${{ inputs.version_number_input }}
java_version: '17'
java_version: '21'
force_release: 'yes'
skip_tests: true
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/validate-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
with:
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
fail_on_error: ${{ inputs.fail_on_error || true }}
java_version: '17'
java_version: '21'
skip_tests: true
secrets: inherit
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
######################
# Build dependencies #
######################
FROM maven:3.9.5-eclipse-temurin-17
FROM maven:3.9.8-eclipse-temurin-21

WORKDIR /app

Expand Down
21 changes: 13 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

<groupId>com.uid2</groupId>
<artifactId>uid2-e2e</artifactId>
<version>3.0.59-7310afd26d</version>
<version>3.0.60-alpha-27-SNAPSHOT</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<uid2-shared.version>7.9.0</uid2-shared.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<uid2-shared.version>7.17.1-alpha-145-SNAPSHOT</uid2-shared.version>
</properties>
<packaging>jar</packaging>

Expand All @@ -37,13 +37,18 @@
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.2</version>
<version>5.10.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -74,7 +79,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.25.2</version>
<version>3.26.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -97,13 +102,13 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.0</version>
<version>4.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 2 additions & 0 deletions src/test/java/app/LocalPublicApps.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package app;

import app.component.Core;
import app.component.Operator;

import java.util.Set;

public final class LocalPublicApps extends Apps {
public LocalPublicApps() {
super(Set.of(
new Core("http://localhost", 8088, "Local - Core"),
new Operator("http://localhost", 8888, "Local - Public Operator", Operator.Type.PUBLIC)
));
}
Expand Down