You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/06/20 13:26:52 UTC

[skywalking] 01/01: Add JDK 16 to test matrix, move bom to backend profile

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch jdk/16
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit fd8bf337fc8196b290809725f6c9704d50bf69ce
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sun Jun 20 21:26:28 2021 +0800

    Add JDK 16 to test matrix, move bom to backend profile
---
 .github/workflows/e2e.jdk-versions.yaml | 5 ++++-
 CHANGES.md                              | 1 +
 pom.xml                                 | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml
index 7798a11..26d8faf 100644
--- a/.github/workflows/e2e.jdk-versions.yaml
+++ b/.github/workflows/e2e.jdk-versions.yaml
@@ -20,6 +20,9 @@ on:
   pull_request:
   schedule:
     - cron: '0 18 * * *'
+  push:
+    branches:
+      - jdk/16
 
 concurrency:
   group: e2e-jdk-versions-${{ github.event.pull_request.number || github.ref }}
@@ -33,7 +36,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        jdk: [8, 9, 10, 11, 12, 13, 14, 15]
+        jdk: [8, 9, 10, 11, 12, 13, 14, 15, 16]
     env:
       SW_SIMPLE_CASE: jdk
       SW_AGENT_JDK_VERSION: ${{ matrix.jdk }}
diff --git a/CHANGES.md b/CHANGES.md
index 0d0705d..62b3e03 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Release Notes.
 ------------------
 #### Project
 * Extract dependency management to a bom.
+* Add JDK 16 to test matrix.
 
 #### Java Agent
 * Supports modifying span attributes in async mode.
diff --git a/pom.xml b/pom.xml
index 9788b61..bd25c25 100755
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,6 @@
     <modules>
         <module>apm-commons</module>
         <module>apm-protocol</module>
-        <module>oap-server-bom</module>
-        <module>oap-server-bom-es7</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -94,6 +92,8 @@
             </activation>
             <modules>
                 <module>oap-server</module>
+                <module>oap-server-bom</module>
+                <module>oap-server-bom-es7</module>
             </modules>
         </profile>
         <profile>