upgrade tspandata to JDK21 (apache#157)

* upgrade monitor to JDK21 * update * upgrade tspandata to JDK21 * update tspan data workflow
shanwb · Nov 29, 2023 · 36994ef · 36994ef
1 parent 8bebb11
commit 36994ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/ozhera-tspandata-package.yml b/.github/workflows/ozhera-tspandata-package.yml
@@ -12,16 +12,16 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  check-build-8:
+  check-build-21:
     name: ozhera-tspandata test
     runs-on: ubuntu-latest
     steps:
       - name: Setup Maven Action
         uses: s4u/[email protected]
         with:
-          java-version: 8
+          java-version: 21
           #settings-properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
 
       - run: echo '<settings>    <interactiveMode>false</interactiveMode>    <profiles>        <profile>            <repositories>                <repository>                    <snapshots />                    <id>ossrh</id>                    <name>ossrh-snapshot</name>                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>                </repository>            </repositories>            <pluginRepositories>                <pluginRepository>                    <snapshots />                    <id>ossrh</id>                    <name>ossrh-snapshot</name>                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>                </pluginRepository>            </pluginRepositories>            <id>artifactory</id>        </profile>    </profiles>    <activeProfiles>        <activeProfile>artifactory</activeProfile>    </activeProfiles>    <servers>        <server>            <id>github</id>            <username>${env.GITHUB_ACTOR}</username>            <password>${env.GITHUB_TOKEN}</password>        </server>    </servers>    <mirrors/>    <proxies/></settings>' > ~/.m2/settings.xml
 
-      - run: cd ozhera-tspandata; mvn -U clean package --fail-at-end -Dmaven.test.skip=true
+      - run: cd ozhera-tspandata; mvn -U clean package --fail-at-end -Dmaven.test.skip=true
diff --git a/ozhera-tspandata/pom.xml b/ozhera-tspandata/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>run.mone</groupId>
-    <artifactId>hera-tspandata</artifactId>
+    <artifactId>ozhera-tspandata</artifactId>
     <version>2.0-SNAPSHOT</version>
 
     <name>${project.artifactId}</name>
@@ -25,10 +25,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <compilerVersion>21</compilerVersion>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
 

diff --git a/trace-etl/trace-etl-api/pom.xml b/trace-etl/trace-etl-api/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>run.mone</groupId>
-            <artifactId>hera-tspandata</artifactId>
+            <artifactId>ozhera-tspandata</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 

diff --git a/trace-etl/trace-etl-service/pom.xml b/trace-etl/trace-etl-service/pom.xml
@@ -221,11 +221,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>run.mone</groupId>
-            <artifactId>hera-tspandata</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>run.mone</groupId>
             <artifactId>log</artifactId>