[agent.java] not any more support java 6, java 7

VenusIM · May 29, 2023 · b0f7ff5 · b0f7ff5
1 parent 29e12fe
commit b0f7ff5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/build_package.sh b/build_package.sh
@@ -15,6 +15,6 @@ if [ -z "$MVN" ]; then
 	exit 1
 else
     $MVN -Dmaven.test.skip=true clean install
-    $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-legacy clean package
+#    $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-legacy clean package
     $MVN -Dmaven.test.skip=true -f ./scouter.deploy/pom.xml clean package
 fi
diff --git a/scouter.common/pom.xml b/scouter.common/pom.xml
@@ -28,11 +28,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/scouter.deploy/pom.xml b/scouter.deploy/pom.xml
@@ -19,7 +19,7 @@
         <scouter.assembly.dir>${project.build.directory}/assembly-working</scouter.assembly.dir>
 
         <scouter.assembly.agent.java.dir>${scouter.assembly.dir}/scouter/agent.java</scouter.assembly.agent.java.dir>
-        <scouter.assembly.agent.java.legacy.dir>${scouter.assembly.dir}/scouter/agent.java_6_7</scouter.assembly.agent.java.legacy.dir>
+<!--        <scouter.assembly.agent.java.legacy.dir>${scouter.assembly.dir}/scouter/agent.java_6_7</scouter.assembly.agent.java.legacy.dir>-->
         <scouter.assembly.agent.host.dir>${scouter.assembly.dir}/scouter/agent.host</scouter.assembly.agent.host.dir>
         <scouter.assembly.agent.batch.dir>${scouter.assembly.dir}/scouter/agent.batch</scouter.assembly.agent.batch.dir>
         <scouter.assembly.server.dir>${scouter.assembly.dir}/scouter/server</scouter.assembly.server.dir>
@@ -75,9 +75,9 @@
                                 <mkdir dir="${scouter.assembly.dir}" />
                                 <untar src="${scouter.whole.packaging.prepare.dir}/${scouter.agent.host.assembly.name}.tar" dest="${scouter.assembly.agent.host.dir}" />
                                 <untar src="${scouter.whole.packaging.prepare.dir}/${scouter.agent.java.assembly.name}.tar" dest="${scouter.assembly.agent.java.dir}" />
-                                <copy todir="${scouter.assembly.agent.java.legacy.dir}">
-                                    <fileset dir="${scouter.whole.packaging.prepare.dir}/${scouter.agent.java.legacy.dir.name}" />
-                                </copy>
+<!--                                <copy todir="${scouter.assembly.agent.java.legacy.dir}">-->
+<!--                                    <fileset dir="${scouter.whole.packaging.prepare.dir}/${scouter.agent.java.legacy.dir.name}" />-->
+<!--                                </copy>-->
                                 <untar src="${scouter.whole.packaging.prepare.dir}/${scouter.agent.batch.assembly.name}.tar" dest="${scouter.assembly.agent.batch.dir}" />
                                 <untar src="${scouter.whole.packaging.prepare.dir}/${scouter.server.assembly.name}.tar" dest="${scouter.assembly.server.dir}" />
                                 <untar src="${scouter.whole.packaging.prepare.dir}/${scouter.webapp.assembly.name}.tar" dest="${scouter.assembly.webapp.dir}" />
@@ -89,11 +89,11 @@
                                     </fileset>
                                 </delete>
                                 <delete dir="${scouter.assembly.server.dir}/lib-min"/>
-                                <copy todir="${scouter.assembly.agent.java.legacy.dir}">
-                                    <fileset dir="${scouter.assembly.agent.java.dir}">
-                                        <exclude name="scouter*agent*.jar" />
-                                    </fileset>
-                                </copy>
+<!--                                <copy todir="${scouter.assembly.agent.java.legacy.dir}">-->
+<!--                                    <fileset dir="${scouter.assembly.agent.java.dir}">-->
+<!--                                        <exclude name="scouter*agent*.jar" />-->
+<!--                                    </fileset>-->
+<!--                                </copy>-->
                                 <tar destfile="${project.build.directory}/${scouter.product.name}.tar">
                                     <tarfileset dir="${scouter.assembly.dir}" mode="755">
                                         <include name="**/*.sh" />