diff --git a/build_package.sh b/build_package.sh index 63ee1762d..f9e4a6a20 100755 --- 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 index 43947d106..6af94de41 100644 --- a/scouter.common/pom.xml +++ b/scouter.common/pom.xml @@ -28,11 +28,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.1 - 1.6 - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/scouter.deploy/pom.xml b/scouter.deploy/pom.xml index f9b4f83c0..9c0039c14 100644 --- a/scouter.deploy/pom.xml +++ b/scouter.deploy/pom.xml @@ -19,7 +19,7 @@ ${project.build.directory}/assembly-working ${scouter.assembly.dir}/scouter/agent.java - ${scouter.assembly.dir}/scouter/agent.java_6_7 + ${scouter.assembly.dir}/scouter/agent.host ${scouter.assembly.dir}/scouter/agent.batch ${scouter.assembly.dir}/scouter/server @@ -75,9 +75,9 @@ - - - + + + @@ -89,11 +89,11 @@ - - - - - + + + + +