Post merge Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index ddf4e77..179d814 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml
@@ -68,20 +68,14 @@ runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 - uses: actions/setup-java@v4.1.0 - with: - distribution: ${{ env.JAVA_DISTRO }} - java-version: 17 - cache: maven - - name: Build JDK17+ required modules - run: mvn -B -U -V clean install -DskipTests -pl :jersey-helidon-connector -am - name: Set up JDK ${{ env.JAVA_VERSION }} uses: actions/setup-java@v4.1.0 with: distribution: ${{ env.JAVA_DISTRO }} java-version: ${{ env.JAVA_VERSION }} cache: maven + - name: Build JDK21+ required modules + run: mvn -B -U -V clean install -DskipTests -pl :jersey-helidon-connector -am - name: Build ApiDocs run: etc/scripts/apidocs.sh archetypes:
diff --git a/connectors/helidon-connector/src/main/java21/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java b/connectors/helidon-connector/src/main/java21/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java index 7cfc22e..263408d 100644 --- a/connectors/helidon-connector/src/main/java21/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java +++ b/connectors/helidon-connector/src/main/java21/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/cp_el.log b/cp_el.log deleted file mode 100644 index bb8cc96..0000000 --- a/cp_el.log +++ /dev/null
@@ -1 +0,0 @@ -/home/mavines/git/JERSEY/merge_jersey/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ResponseReadAndBufferEntityTest.java: Copyright year is wrong; is 2024, should be 2025