change target to jdk8. #2146

alibaba · Apr 23, 2023 · 8834a0f · 8834a0f
1 parent acd9844
commit 8834a0f
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 193 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17, 19]
     steps:
       - uses: actions/checkout@v3
       - name: Setup java
@@ -49,34 +49,4 @@ jobs:
           distribution: 'zulu'
           cache: 'maven'
       - name: Build with Maven
-        run: mvn clean package -P full
-
-  ubuntu_build_jdk_ge_12:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # https://static.azul.com/zulu/bin/
-        java: [12, 13, 14 , 17, 18, 19]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
-        with:
-          java-version: 8
-          distribution: 'zulu'
-          cache: 'maven'
-      - name: save java8 home
-        run: |
-          export JAVA8_HOME=$JAVA_HOME && echo $JAVA8_HOME
-          echo "export JAVA8_HOME=$JAVA_HOME" > ~/.testenv
-
-      - name: Setup java
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: 'zulu'
-          cache: 'maven'
-      - name: Build with Maven
-        run: |
-          source ~/.testenv
-          mvn -Dmaven.compiler.fork=true -Dmaven.compiler.executable=$JAVA8_HOME/bin/javac -DJAVA8_HOME=$JAVA8_HOME clean package -P full
+        run: mvn clean package -P full
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -28,16 +28,6 @@
     <build>
         <finalName>arthas-agent</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>

diff --git a/arthas-agent-attach/pom.xml b/arthas-agent-attach/pom.xml
@@ -34,19 +34,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/boot/pom.xml b/boot/pom.xml
@@ -31,16 +31,6 @@
     <build>
         <finalName>arthas-boot</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -15,16 +15,6 @@
     <build>
         <finalName>arthas-client</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -14,18 +14,6 @@
     <!-- This module can not add any dependencies -->
     <build>
         <finalName>arthas-common</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,17 +18,6 @@
     <build>
         <finalName>arthas-core</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/core/src/test/java/com/taobao/arthas/core/server/ArthasBootstrapTest.java b/core/src/test/java/com/taobao/arthas/core/server/ArthasBootstrapTest.java
@@ -3,13 +3,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.instrument.Instrumentation;
+import java.lang.reflect.Field;
 
 import org.jboss.modules.ModuleClassLoader;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.internal.util.reflection.FieldSetter;
 
+import com.alibaba.bytekit.utils.ReflectionUtils;
 import com.taobao.arthas.common.JavaVersionUtils;
 import com.taobao.arthas.core.bytecode.TestHelper;
 import com.taobao.arthas.core.config.Configure;
@@ -40,9 +41,13 @@ public void test() throws Exception {
         Configure configure = Mockito.mock(Configure.class);
         Mockito.when(configure.getEnhanceLoaders())
                 .thenReturn("java.lang.ClassLoader,org.jboss.modules.ConcurrentClassLoader");
-        FieldSetter.setField(arthasBootstrap, ArthasBootstrap.class.getDeclaredField("configure"), configure);
-        FieldSetter.setField(arthasBootstrap, ArthasBootstrap.class.getDeclaredField("instrumentation"),
-                instrumentation);
+        Field configureField = ArthasBootstrap.class.getDeclaredField("configure");
+        configureField.setAccessible(true);
+        ReflectionUtils.setField(configureField, arthasBootstrap, configure);
+
+        Field instrumentationField = ArthasBootstrap.class.getDeclaredField("instrumentation");
+        instrumentationField.setAccessible(true);
+        ReflectionUtils.setField(instrumentationField, arthasBootstrap, instrumentation);
 
         org.jboss.modules.ModuleClassLoader moduleClassLoader = Mockito.mock(ModuleClassLoader.class);
 

diff --git a/math-game/pom.xml b/math-game/pom.xml
@@ -14,16 +14,6 @@
     <build>
         <finalName>math-game</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/memorycompiler/pom.xml b/memorycompiler/pom.xml
@@ -36,20 +36,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <finalName>arthas-agent</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -79,8 +79,8 @@
     <properties>
         <revision>3.6.8</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>1.6</maven.compiler.target>
-        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
         <spring-boot.version>2.7.0</spring-boot.version>
         <maven-invoker-plugin.version>3.0.0</maven-invoker-plugin.version>
         <project.build.outputTimestamp>2020-09-27T15:10:43Z</project.build.outputTimestamp>
@@ -170,7 +170,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>2.28.2</version>
+                <version>4.11.0</version>
                 <scope>test</scope>
             </dependency>
 
@@ -209,13 +209,13 @@
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.11.6</version>
+                <version>1.14.4</version>
             </dependency>
 
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-agent</artifactId>
-                <version>1.11.6</version>
+                <version>1.14.4</version>
             </dependency>
 
             <dependency>

diff --git a/spy/pom.xml b/spy/pom.xml
@@ -23,18 +23,6 @@
 
     <build>
         <finalName>arthas-spy</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
diff --git a/testcase/pom.xml b/testcase/pom.xml
@@ -17,18 +17,4 @@
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/tunnel-client/pom.xml b/tunnel-client/pom.xml
@@ -59,20 +59,4 @@
 
 	</dependencies>
 
-	<build>
-		<finalName>arthas-tunnel-client</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<encoding>UTF-8</encoding>
-					<showDeprecation>true</showDeprecation>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/tunnel-common/pom.xml b/tunnel-common/pom.xml
@@ -16,20 +16,4 @@
 
 	</dependencies>
 
-	<build>
-		<finalName>arthas-tunnel-common</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<encoding>UTF-8</encoding>
-					<showDeprecation>true</showDeprecation>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>