diff --git a/datasophon-api/pom.xml b/datasophon-api/pom.xml index 9a9ad06b..9c859d50 100644 --- a/datasophon-api/pom.xml +++ b/datasophon-api/pom.xml @@ -15,16 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + 4.0.0 - datasophon com.datasophon + datasophon 1.1.0 - 4.0.0 datasophon-api @@ -43,8 +41,8 @@ spring-boot-starter-tomcat - log4j-to-slf4j org.apache.logging.log4j + log4j-to-slf4j @@ -95,12 +93,18 @@ com.datasophon datasophon-dao - 1.1.0 + ${project.version} com.datasophon datasophon-common - 1.1.0 + ${project.version} + + + + com.datasophon + datasophon-ui + ${project.version} com.typesafe.akka @@ -115,7 +119,6 @@ akka-persistence_2.11 - org.apache.sshd sshd-core @@ -131,60 +134,46 @@ test - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-lib - package - - copy-dependencies - - - target/lib - false - false - runtime - - - - - maven-assembly-plugin + 3.3.0 false datasophon-manager-${project.version} - target/ + ${project.basedir}/target/ - src/main/resources/assembly.xml + ${project.basedir}/src/main/resources/assembly.xml + + + + + make-assembly - - package single + + package - \ No newline at end of file + diff --git a/datasophon-api/src/main/resources/assembly.xml b/datasophon-api/src/main/resources/assembly.xml index b3ef3b71..b8dafd07 100644 --- a/datasophon-api/src/main/resources/assembly.xml +++ b/datasophon-api/src/main/resources/assembly.xml @@ -24,6 +24,19 @@ tar.gz true + + + true + lib + 0755 + 0755 + + + *:log4j + *:slf4j-log4j12 + + + @@ -77,8 +90,10 @@ *.sh 0755 + 0755 true bin + unix @@ -90,30 +105,35 @@ ${basedir}/src/main/resources/jmx jmx + 0755 + 0755 ${basedir}/../datasophon-api/src/main/resources/sql sql + 0755 + 0755 - - - ${project.build.directory}/lib - lib - + ${basedir}/../datasophon-ui/dist + /conf/front/views - *.jar + *.html + *.ico + *.js + 0755 + 0755 - ${project.build.directory} - lib - + ${basedir}/../datasophon-ui/dist + /conf/front/static/resources/bundle-main + 0755 + 0755 - datasophon-api-${project.version}.jar + css/** + static/** - - diff --git a/datasophon-ui/pom.xml b/datasophon-ui/pom.xml index 9cd97758..d4cc681c 100644 --- a/datasophon-ui/pom.xml +++ b/datasophon-ui/pom.xml @@ -15,33 +15,61 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + 4.0.0 - datasophon com.datasophon + datasophon 1.1.0 - 4.0.0 datasophon-ui v12.16.3 6.14.4 - node_modules - dist .deployed + dist + node_modules + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + + false + + false + + + + ${basedir}/dist + + false + + true + + + + + + com.github.eirslett frontend-maven-plugin 1.10.3 + + ${build.node.version} + ${build.npm.version} + + https://npm.taobao.org/mirrors/node/ + https://registry.npm.taobao.org/npm/-/ + install node and npm @@ -57,8 +85,7 @@ generate-resources - install --registry=https://registry.npm.taobao.org --sass-binary-site=https://npm.taobao.org/mirrors/node-sass - + install --registry=https://registry.npm.taobao.org --sass-binary-site=https://npm.taobao.org/mirrors/node-sass @@ -66,29 +93,24 @@ npm - install + package run build - - npm run deploy - - npm - - install - - run deploy - - + - - ${build.node.version} - ${build.npm.version} - - https://npm.taobao.org/mirrors/node/ - https://registry.npm.taobao.org/npm/-/ - @@ -101,21 +123,21 @@ - win + /C brunch + /C mkdir + /C npm + /C rmdir /S /Q + /C \ + win cmd ${basedir}\gzip-content.cmd - /C brunch - node.exe cmd - /C mkdir cmd - /C npm cmd - /C rmdir /S /Q cmd cmd - /C + node.exe @@ -126,21 +148,21 @@ - linux + + + + -rf + / + linux brunch gzip - - node mkdir - npm - rm - -rf sh sh - + node diff --git a/datasophon-worker/pom.xml b/datasophon-worker/pom.xml index 3aebe882..58125e16 100644 --- a/datasophon-worker/pom.xml +++ b/datasophon-worker/pom.xml @@ -15,16 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + 4.0.0 - datasophon com.datasophon + datasophon 1.1.0 - 4.0.0 datasophon-worker @@ -34,52 +32,52 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + com.typesafe.akka akka-actor_2.11 @@ -99,7 +97,7 @@ com.datasophon datasophon-common - 1.1.0 + ${project.version} org.freemarker @@ -126,35 +124,18 @@ org.apache.maven.plugins - maven-dependency-plugin - - - copy-lib - package - - copy-dependencies - - - target/lib - false - false - runtime - - - - - maven-assembly-plugin + 3.3.0 false datasophon-worker - target/ + ${project.basedir}/target/ - src/main/resources/assembly.xml + ${project.basedir}/src/main/resources/assembly.xml @@ -162,16 +143,16 @@ make-assembly - - package single + + package - \ No newline at end of file + diff --git a/datasophon-worker/src/main/resources/assembly.xml b/datasophon-worker/src/main/resources/assembly.xml index b2504a9c..9cb9b2eb 100644 --- a/datasophon-worker/src/main/resources/assembly.xml +++ b/datasophon-worker/src/main/resources/assembly.xml @@ -24,6 +24,19 @@ tar.gz true + + + true + lib + 0755 + 0755 + + + *:log4j + *:slf4j-log4j12 + + + @@ -135,24 +148,5 @@ unix /node/arm - - - - ${project.build.directory}/lib - lib - - - *.jar - - - - ${project.build.directory} - lib - - - datasophon-worker-${project.version}.jar - - - diff --git a/pom.xml b/pom.xml index 94f40949..a9df02f2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - 4.0.0 @@ -60,6 +58,8 @@ 2.27.1 2.1.18.RELEASE 5.1.19.RELEASE + + 2.14.2 @@ -182,6 +182,39 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.2 + + ${java.version} + ${java.version} + UTF-8 + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + + jar-no-fork + + package + + + com.diffplug.spotless spotless-maven-plugin @@ -244,6 +277,12 @@ + + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} +