diff --git a/.gitignore b/.gitignore index df75d90..2178006 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ initializer-page/node/ initializer-page/node_modules/ initializer-page/analysis/ initializer-page/target/ - +initializer-start/target/ initializer-generator/target/ node_modules/ diff --git a/Dockerfile b/Dockerfile index 8e3691d..386942f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM openjdk:17 WORKDIR /app -COPY initializer-generator/target/initializer-generator-0.8.jar /app +COPY initializer-generator/target/initializer-start-0.8.jar /app COPY initializer-generator/target/classes/static /app EXPOSE 7001 -CMD ["java","-jar","/app/initializer-generator-0.8.jar"] \ No newline at end of file +CMD ["java","-jar","/app/initializer-start-0.8.jar"] \ No newline at end of file diff --git a/initializer-generator/pom.xml b/initializer-generator/pom.xml index 6c3f02e..347f208 100644 --- a/initializer-generator/pom.xml +++ b/initializer-generator/pom.xml @@ -52,11 +52,6 @@ initializr-actuator - - com.alibaba - initializer-page - - com.google.guava @@ -126,26 +121,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - 2.3.7.RELEASE - - com.alibaba.initializer.start.Application - true - fatjar - - - - repackage - - repackage - - - - - - diff --git a/initializer-start/pom.xml b/initializer-start/pom.xml new file mode 100644 index 0000000..5ffa09e --- /dev/null +++ b/initializer-start/pom.xml @@ -0,0 +1,53 @@ + + + + + com.alibaba + cloud-native-app-initializer + ${revision} + ../pom.xml + + + 4.0.0 + initializer-start + + + + org.springframework.boot + spring-boot-starter + + + com.alibaba + initializer-generator + + + com.alibaba + initializer-page + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.3.7.RELEASE + + com.alibaba.initializer.start.Application + true + fatjar + + + + repackage + + repackage + + + + + + + + diff --git a/initializer-generator/src/main/java/com/alibaba/initializer/start/Application.java b/initializer-start/src/main/java/com/alibaba/initializer/start/Application.java similarity index 100% rename from initializer-generator/src/main/java/com/alibaba/initializer/start/Application.java rename to initializer-start/src/main/java/com/alibaba/initializer/start/Application.java diff --git a/initializer-generator/src/main/java/com/alibaba/initializer/start/web/CommonPages.java b/initializer-start/src/main/java/com/alibaba/initializer/start/web/CommonPages.java similarity index 100% rename from initializer-generator/src/main/java/com/alibaba/initializer/start/web/CommonPages.java rename to initializer-start/src/main/java/com/alibaba/initializer/start/web/CommonPages.java diff --git a/initializer-generator/src/main/java/com/alibaba/initializer/start/web/WebConfig.java b/initializer-start/src/main/java/com/alibaba/initializer/start/web/WebConfig.java similarity index 100% rename from initializer-generator/src/main/java/com/alibaba/initializer/start/web/WebConfig.java rename to initializer-start/src/main/java/com/alibaba/initializer/start/web/WebConfig.java diff --git a/initializer-generator/src/main/resources/application-docker.yml b/initializer-start/src/main/resources/application-docker.yml similarity index 100% rename from initializer-generator/src/main/resources/application-docker.yml rename to initializer-start/src/main/resources/application-docker.yml diff --git a/initializer-generator/src/main/resources/application.yml b/initializer-start/src/main/resources/application.yml similarity index 100% rename from initializer-generator/src/main/resources/application.yml rename to initializer-start/src/main/resources/application.yml diff --git a/initializer-generator/src/main/resources/ehcache.xml b/initializer-start/src/main/resources/ehcache.xml similarity index 100% rename from initializer-generator/src/main/resources/ehcache.xml rename to initializer-start/src/main/resources/ehcache.xml diff --git a/initializer-generator/src/main/resources/logback-spring.xml b/initializer-start/src/main/resources/logback-spring.xml similarity index 100% rename from initializer-generator/src/main/resources/logback-spring.xml rename to initializer-start/src/main/resources/logback-spring.xml diff --git a/pom.xml b/pom.xml index 34e6c53..204642e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ initializer-page initializer-generator + initializer-start @@ -48,29 +49,17 @@ com.alibaba initializer-generator - 0.8 + ${revision} - com.alibaba initializer-page - 0.8 - - - - org.slf4j - jcl-over-slf4j - 1.7.26 + ${revision} com.alibaba - fastjson - 1.2.68.noneautotype - - - com.google.guava - guava - 20.0 + initializer-start + ${revision} @@ -85,18 +74,7 @@ 5.6.0.201912101111-r - - org.mockito - mockito-all - ${mockito-all.version} - test - - - - org.codehaus.groovy - groovy - 2.5.8 - + commons-configuration commons-configuration @@ -117,40 +95,28 @@ commons-collections4 4.4 - - com.vladsch.flexmark - flexmark-all - 0.50.46 - - - com.vladsch.flexmark - flexmark-pdf-converter - - + org.slf4j + jcl-over-slf4j + 1.7.26 - com.auth0 - java-jwt - 3.4.0 + com.alibaba + fastjson + 1.2.68.noneautotype + + + com.google.guava + guava + 20.0 + - org.springframework.security.extensions - spring-security-saml2-core - 1.0.10.RELEASE - - - commons-collections - commons-collections - - - - - - com.squareup.okhttp3 - okhttp - 3.12.12 + org.mockito + mockito-all + ${mockito-all.version} + test