Skip to content

Commit b0f7ff5

Browse files
committed
[agent.java] not any more support java 6, java 7
1 parent 29e12fe commit b0f7ff5

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

build_package.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ if [ -z "$MVN" ]; then
1515
exit 1
1616
else
1717
$MVN -Dmaven.test.skip=true clean install
18-
$MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-legacy clean package
18+
# $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-legacy clean package
1919
$MVN -Dmaven.test.skip=true -f ./scouter.deploy/pom.xml clean package
2020
fi

scouter.common/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
<plugin>
2929
<groupId>org.apache.maven.plugins</groupId>
3030
<artifactId>maven-compiler-plugin</artifactId>
31-
<version>3.1</version>
31+
<version>3.8.1</version>
3232
<configuration>
33-
<compilerVersion>1.6</compilerVersion>
34-
<source>1.6</source>
35-
<target>1.6</target>
33+
<source>1.8</source>
34+
<target>1.8</target>
3635
</configuration>
3736
</plugin>
3837
<plugin>

scouter.deploy/pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<scouter.assembly.dir>${project.build.directory}/assembly-working</scouter.assembly.dir>
2020

2121
<scouter.assembly.agent.java.dir>${scouter.assembly.dir}/scouter/agent.java</scouter.assembly.agent.java.dir>
22-
<scouter.assembly.agent.java.legacy.dir>${scouter.assembly.dir}/scouter/agent.java_6_7</scouter.assembly.agent.java.legacy.dir>
22+
<!-- <scouter.assembly.agent.java.legacy.dir>${scouter.assembly.dir}/scouter/agent.java_6_7</scouter.assembly.agent.java.legacy.dir>-->
2323
<scouter.assembly.agent.host.dir>${scouter.assembly.dir}/scouter/agent.host</scouter.assembly.agent.host.dir>
2424
<scouter.assembly.agent.batch.dir>${scouter.assembly.dir}/scouter/agent.batch</scouter.assembly.agent.batch.dir>
2525
<scouter.assembly.server.dir>${scouter.assembly.dir}/scouter/server</scouter.assembly.server.dir>
@@ -75,9 +75,9 @@
7575
<mkdir dir="${scouter.assembly.dir}" />
7676
<untar src="${scouter.whole.packaging.prepare.dir}/${scouter.agent.host.assembly.name}.tar" dest="${scouter.assembly.agent.host.dir}" />
7777
<untar src="${scouter.whole.packaging.prepare.dir}/${scouter.agent.java.assembly.name}.tar" dest="${scouter.assembly.agent.java.dir}" />
78-
<copy todir="${scouter.assembly.agent.java.legacy.dir}">
79-
<fileset dir="${scouter.whole.packaging.prepare.dir}/${scouter.agent.java.legacy.dir.name}" />
80-
</copy>
78+
<!-- <copy todir="${scouter.assembly.agent.java.legacy.dir}">-->
79+
<!-- <fileset dir="${scouter.whole.packaging.prepare.dir}/${scouter.agent.java.legacy.dir.name}" />-->
80+
<!-- </copy>-->
8181
<untar src="${scouter.whole.packaging.prepare.dir}/${scouter.agent.batch.assembly.name}.tar" dest="${scouter.assembly.agent.batch.dir}" />
8282
<untar src="${scouter.whole.packaging.prepare.dir}/${scouter.server.assembly.name}.tar" dest="${scouter.assembly.server.dir}" />
8383
<untar src="${scouter.whole.packaging.prepare.dir}/${scouter.webapp.assembly.name}.tar" dest="${scouter.assembly.webapp.dir}" />
@@ -89,11 +89,11 @@
8989
</fileset>
9090
</delete>
9191
<delete dir="${scouter.assembly.server.dir}/lib-min"/>
92-
<copy todir="${scouter.assembly.agent.java.legacy.dir}">
93-
<fileset dir="${scouter.assembly.agent.java.dir}">
94-
<exclude name="scouter*agent*.jar" />
95-
</fileset>
96-
</copy>
92+
<!-- <copy todir="${scouter.assembly.agent.java.legacy.dir}">-->
93+
<!-- <fileset dir="${scouter.assembly.agent.java.dir}">-->
94+
<!-- <exclude name="scouter*agent*.jar" />-->
95+
<!-- </fileset>-->
96+
<!-- </copy>-->
9797
<tar destfile="${project.build.directory}/${scouter.product.name}.tar">
9898
<tarfileset dir="${scouter.assembly.dir}" mode="755">
9999
<include name="**/*.sh" />

0 commit comments

Comments
 (0)