diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..4b2451d15dd49a936f44028b8dde53d054818f2f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,59 @@ +stages: + - build + - package + - deploy + +variables: + # Maven + MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true + # MAVEN_CONFIG: --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -s .mvn/settings.xml + MAVEN_CONFIG: --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -s .mvn/settings.xml + MAVEN_USER_HOME: .mvn/ + +before_script: + - echo _auth=$(echo -n $ARTIFACTS_REPO_USERNAME:$ARTIFACTS_REPO_PASSWORD | base64) >> .npmrc + + + +Build with Maven: + stage: build + tags: + - environment:cloud + - runner:docker + - namespace:generic + except: + variables: + - $CI_COMMIT_MESSAGE =~ /^Helm debug:\ .*/ + cache: + paths: + - .mvn/wrapper/maven-wrapper.jar + - .mvn/wrapper/dists/ + - .mvn/repository/ + image: openjdk:8-stretch + script: + - chmod a+x ./mvnw + - ./mvnw -DskipTests=true clean install +# artifacts: +# paths: +# - caf-boot-parent/target/app.jar +# expire_in: 10d + +Package: + stage: package + tags: + - environment:cloud + - runner:docker + - namespace:generic + only: + - master + - dev + - tags + cache: + paths: + - .mvn/wrapper/maven-wrapper.jar + - .mvn/wrapper/dists/ + - .mvn/repository/ + image: openjdk:8-stretch + script: + - chmod a+x ./mvnw + - ./mvnw -DskipTests=true clean deploy diff --git a/business-entity-generator/pom.xml b/business-entity-generator/pom.xml index 47ffd2081768caaaf814001245c1552a26175362..931efcdb6e7f4b1d6e7d13cac6bf9f55ceb193ba 100644 --- a/business-entity-generator/pom.xml +++ b/business-entity-generator/pom.xml @@ -22,11 +22,10 @@ com.inspur.edp business-entity-generator1 - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT business-entity-generator - 0.1.0-SNAPSHOT diff --git a/common-entity-generator/pom.xml b/common-entity-generator/pom.xml index 6c6d74c84776038c5fc968135b1921ede81949f1..0084b8d7da55614219385ad44cdff23f485dccc6 100644 --- a/common-entity-generator/pom.xml +++ b/common-entity-generator/pom.xml @@ -36,7 +36,7 @@ com.inspur.edp business-entity-generator1 - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT common-entity-generator diff --git a/common-entity-variable-generator/pom.xml b/common-entity-variable-generator/pom.xml index c851165a43d4c54f6abdede97081a41af0b3f8b6..c60c8f4b993d9dced5e6c16cff9609db1aa364fe 100644 --- a/common-entity-variable-generator/pom.xml +++ b/common-entity-variable-generator/pom.xml @@ -36,7 +36,7 @@ com.inspur.edp business-entity-generator1 - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT common-entity-variable-generator diff --git a/common-entity-variable-generator/src/main/java/com/inspur/edp/cef/variable/dtgenerator/vardtmGenerate/javageneratecmpcode/JavaIBaseCompCodeGen.java b/common-entity-variable-generator/src/main/java/com/inspur/edp/cef/variable/dtgenerator/vardtmGenerate/javageneratecmpcode/JavaIBaseCompCodeGen.java index 298979c60c31a318d63b7685aa85ca8f30285503..289bfbb43d3b25c041dad6bea0b9652cc261f5a7 100644 --- a/common-entity-variable-generator/src/main/java/com/inspur/edp/cef/variable/dtgenerator/vardtmGenerate/javageneratecmpcode/JavaIBaseCompCodeGen.java +++ b/common-entity-variable-generator/src/main/java/com/inspur/edp/cef/variable/dtgenerator/vardtmGenerate/javageneratecmpcode/JavaIBaseCompCodeGen.java @@ -12,18 +12,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ /* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. */ package com.inspur.edp.cef.variable.dtgenerator.vardtmGenerate.javageneratecmpcode; @@ -53,4 +41,11 @@ public interface JavaIBaseCompCodeGen */ String generateCommon(); + /** + * 更新内容 + * @return 若不需要更新返回null + */ + default String update(String originContent) { + return null; + } } diff --git a/pom.xml b/pom.xml index 01e90f85d7d4e3ce34091a788251dd39c4f1d6d5..d5f940999f90eb6a4d4f2811ad240dba12980745 100644 --- a/pom.xml +++ b/pom.xml @@ -15,20 +15,6 @@ ~ limitations under the License. --> - - @@ -36,7 +22,7 @@ com.inspur.edp business-entity-generator1 - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT pom @@ -100,7 +86,7 @@ com.inspur.edp metadata-to-java-spi - 0.1.0-SNAPSHOT + 0.1.4 com.inspur.edp diff --git a/unified-datatype-generator/pom.xml b/unified-datatype-generator/pom.xml index 1e5949f586a7411dfea892af70e3ba4acbecf4cc..9aa2463245bccd65ddfbd622e1f45107b2b699d6 100644 --- a/unified-datatype-generator/pom.xml +++ b/unified-datatype-generator/pom.xml @@ -35,7 +35,7 @@ com.inspur.edp business-entity-generator1 - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT