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

Java 19 support #1022

Merged
merged 7 commits into from
Sep 28, 2022
Merged

Java 19 support #1022

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1beb55
Update GHA for Java 19
jasonjkeller Sep 27, 2022
ebbee50
Update agent and tests for Java 19
jasonjkeller Sep 27, 2022
6df2666
gha point to java 19 AIT branch
obenkenobi Sep 27, 2022
f592d1d
fix gha AIT branch reference
obenkenobi Sep 27, 2022
5b760ad
fix typo
obenkenobi Sep 27, 2022
56af1a2
Simplify gradle test config for instrumentation modules
jasonjkeller Sep 28, 2022
002b33d
Revert AITs back to main branch
jasonjkeller Sep 28, 2022
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
25 changes: 13 additions & 12 deletions .github/workflows/AITs-Basic-Features-Special-JREs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: AITs - Basic - JREs (only Zulu enabled)
# We need to set java home to JDK 8
# Also configure workflow_dispatch fr all workflows - add github ref
# Also configure workflow_dispatch for all workflows - add github ref
# Force build

on:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: newrelic/java-agent-integration-tests
ref: main
ref: java-19
token: ${{ secrets.AITPAT }}
path: agent-integration-tests

Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
distribution: 'temurin'
java-version: 11

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk11=${JAVA_HOME}" >> $GITHUB_ENV
Expand All @@ -137,20 +137,21 @@ jobs:
distribution: 'temurin'
java-version: 17

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV

- name: Set up Java 18
# Install latest non-LTS Java version (we should only ever test one non-LTS version to keep test times reasonable)
- name: Set up Java 19
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 18
java-version: 19

- name: Save JAVA_HOME as JDK18 for later usage
- name: Save JAVA_HOME as JDK19 for later usage
run: |
echo "ORG_GRADLE_PROJECT_jdk18=${JAVA_HOME}" >> $GITHUB_ENV
echo "ORG_GRADLE_PROJECT_jdk19=${JAVA_HOME}" >> $GITHUB_ENV

# Install 8, last to set JAVA_HOME to 8
- name: Set up Java 8
Expand All @@ -159,7 +160,7 @@ jobs:
distribution: 'temurin'
java-version: 8

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk8=${JAVA_HOME}" >> $GITHUB_ENV
Expand Down Expand Up @@ -202,10 +203,10 @@ jobs:
<toolchain>
<type>jdk</type>
<provides>
<version>18</version>
<version>19</version>
</provides>
<configuration>
<jdkHome>${ORG_GRADLE_PROJECT_jdk18}</jdkHome>
<jdkHome>${ORG_GRADLE_PROJECT_jdk19}</jdkHome>
</configuration>
</toolchain>
</toolchains>
Expand Down Expand Up @@ -284,7 +285,7 @@ jobs:
JAVA11JRE=${ORG_GRADLE_PROJECT_jdk11} \
ZULU=${ORG_GRADLE_PROJECT_zulu} \
JAVA17JRE=${ORG_GRADLE_PROJECT_jdk17} \
JAVA18JRE=${ORG_GRADLE_PROJECT_jdk18} \
JAVA19JRE=${ORG_GRADLE_PROJECT_jdk19} \
conf/autoconfigure
echo "running conf/testenv java"
. conf/testenv java
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/AITs-Basic-Features.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: newrelic/java-agent-integration-tests
ref: main
ref: java-19
token: ${{ secrets.AITPAT }}
path: agent-integration-tests

Expand All @@ -65,7 +65,7 @@ jobs:
run: |
printenv | sort -f

# Apps repos/caches - this prpcess could be a candidate for custom action
# Apps repos/caches - this process could be a candidate for custom action
- name: Checkout Cache 1
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
distribution: 'temurin'
java-version: 11

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk11=${JAVA_HOME}" >> $GITHUB_ENV
Expand All @@ -149,21 +149,21 @@ jobs:
distribution: 'temurin'
java-version: 17

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV

# Install 18
- name: Set up Java 18
# Install latest non-LTS Java version (we should only ever test one non-LTS version to keep test times reasonable)
- name: Set up Java 19
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 18
java-version: 19

- name: Save JAVA_HOME as JDK18 for later usage
- name: Save JAVA_HOME as JDK19 for later usage
run: |
echo "ORG_GRADLE_PROJECT_jdk18=${JAVA_HOME}" >> $GITHUB_ENV
echo "ORG_GRADLE_PROJECT_jdk19=${JAVA_HOME}" >> $GITHUB_ENV

# Install 8, last to set JAVA_HOME to 8
- name: Set up Java 8
Expand All @@ -172,7 +172,7 @@ jobs:
distribution: 'temurin'
java-version: 8

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk8=${JAVA_HOME}" >> $GITHUB_ENV
Expand Down Expand Up @@ -215,10 +215,10 @@ jobs:
<toolchain>
<type>jdk</type>
<provides>
<version>18</version>
<version>19</version>
</provides>
<configuration>
<jdkHome>${ORG_GRADLE_PROJECT_jdk18}</jdkHome>
<jdkHome>${ORG_GRADLE_PROJECT_jdk19}</jdkHome>
</configuration>
</toolchain>
</toolchains>
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
JAVA11JRE=${ORG_GRADLE_PROJECT_jdk11} \
ZULU=${ORG_GRADLE_PROJECT_zulu} \
JAVA17JRE=${ORG_GRADLE_PROJECT_jdk17} \
JAVA18JRE=${ORG_GRADLE_PROJECT_jdk18} \
JAVA19JRE=${ORG_GRADLE_PROJECT_jdk19} \
conf/autoconfigure
echo "running conf/testenv java"
. conf/testenv java
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/AITs-Clients.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: newrelic/java-agent-integration-tests
ref: main
ref: java-19
token: ${{ secrets.AITPAT }}
path: agent-integration-tests

Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
distribution: 'temurin'
java-version: 11

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk11=${JAVA_HOME}" >> $GITHUB_ENV
Expand All @@ -136,21 +136,21 @@ jobs:
distribution: 'temurin'
java-version: 17

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV

# Install 18
- name: Set up Java 18
# Install latest non-LTS Java version (we should only ever test one non-LTS version to keep test times reasonable)
- name: Set up Java 19
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 18
java-version: 19

- name: Save JAVA_HOME as JDK18 for later usage
- name: Save JAVA_HOME as JDK19 for later usage
run: |
echo "ORG_GRADLE_PROJECT_jdk18=${JAVA_HOME}" >> $GITHUB_ENV
echo "ORG_GRADLE_PROJECT_jdk19=${JAVA_HOME}" >> $GITHUB_ENV

# Install 8, last to set JAVA_HOME to 8
- name: Set up Java 8
Expand All @@ -159,7 +159,7 @@ jobs:
distribution: 'temurin'
java-version: 8

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk8=${JAVA_HOME}" >> $GITHUB_ENV
Expand Down Expand Up @@ -202,10 +202,10 @@ jobs:
<toolchain>
<type>jdk</type>
<provides>
<version>18</version>
<version>19</version>
</provides>
<configuration>
<jdkHome>${ORG_GRADLE_PROJECT_jdk18}</jdkHome>
<jdkHome>${ORG_GRADLE_PROJECT_jdk19}</jdkHome>
</configuration>
</toolchain>
</toolchains>
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
JAVA11JRE=${ORG_GRADLE_PROJECT_jdk11} \
ZULU=${ORG_GRADLE_PROJECT_zulu} \
JAVA17JRE=${ORG_GRADLE_PROJECT_jdk17} \
JAVA18JRE=${ORG_GRADLE_PROJECT_jdk18} \
JAVA19JRE=${ORG_GRADLE_PROJECT_jdk19} \
conf/autoconfigure
echo "running conf/testenv java"
. conf/testenv java
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/AITs-Datastores.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: newrelic/java-agent-integration-tests
ref: main
ref: java-19
token: ${{ secrets.AITPAT }}
path: agent-integration-tests

Expand Down Expand Up @@ -133,15 +133,16 @@ jobs:
run: |
echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV

- name: Set up Java 18
# Install latest non-LTS Java version (we should only ever test one non-LTS version to keep test times reasonable)
- name: Set up Java 19
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 18
java-version: 19

- name: Save JAVA_HOME as JDK18 for later usage
- name: Save JAVA_HOME as JDK19 for later usage
run: |
echo "ORG_GRADLE_PROJECT_jdk18=${JAVA_HOME}" >> $GITHUB_ENV
echo "ORG_GRADLE_PROJECT_jdk19=${JAVA_HOME}" >> $GITHUB_ENV

# Install 8, last to set JAVA_HOME to 8
- name: Set up Java 8
Expand Down Expand Up @@ -222,7 +223,7 @@ jobs:
JAVA8JRE=${ORG_GRADLE_PROJECT_jdk8} \
JAVA11JRE=${ORG_GRADLE_PROJECT_jdk11} \
JAVA17JRE=${ORG_GRADLE_PROJECT_jdk17} \
JAVA18JRE=${ORG_GRADLE_PROJECT_jdk18} \
JAVA19JRE=${ORG_GRADLE_PROJECT_jdk19} \
conf/autoconfigure
echo "running conf/testenv java"
. conf/testenv java
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/AITs-Frameworks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: newrelic/java-agent-integration-tests
ref: main
ref: java-19
token: ${{ secrets.AITPAT }}
path: agent-integration-tests

Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
distribution: 'temurin'
java-version: 11

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk11=${JAVA_HOME}" >> $GITHUB_ENV
Expand All @@ -143,21 +143,21 @@ jobs:
distribution: 'temurin'
java-version: 17

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV

# Install 18
- name: Set up Java 18
# Install latest non-LTS Java version (we should only ever test one non-LTS version to keep test times reasonable)
- name: Set up Java 19
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 18
java-version: 19

- name: Save JAVA_HOME as JDK18 for later usage
- name: Save JAVA_HOME as JDK19 for later usage
run: |
echo "ORG_GRADLE_PROJECT_jdk18=${JAVA_HOME}" >> $GITHUB_ENV
echo "ORG_GRADLE_PROJECT_jdk19=${JAVA_HOME}" >> $GITHUB_ENV

# Install 8, last to set JAVA_HOME to 8
- name: Set up Java 8
Expand All @@ -166,7 +166,7 @@ jobs:
distribution: 'temurin'
java-version: 8

# Set the JDk variable
# Set the JDK variable
- name: Set the required JDK variable
run: |
echo "ORG_GRADLE_PROJECT_jdk8=${JAVA_HOME}" >> $GITHUB_ENV
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
JAVA8JRE=${ORG_GRADLE_PROJECT_jdk8} \
JAVA11JRE=${ORG_GRADLE_PROJECT_jdk11} \
JAVA17JRE=${ORG_GRADLE_PROJECT_jdk17} \
JAVA18JRE=${ORG_GRADLE_PROJECT_jdk18} \
JAVA19JRE=${ORG_GRADLE_PROJECT_jdk19} \
conf/autoconfigure
echo "running conf/testenv java"
. conf/testenv java
Expand Down
Loading