From 274dfcdc8a81023d9fac25b4f6e994dff72429b5 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Thu, 20 Jun 2024 11:45:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?metadata-to-java-spi=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01e90f8..15ca911 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ com.inspur.edp metadata-to-java-spi - 0.1.0-SNAPSHOT + 0.1.4 com.inspur.edp @@ -331,4 +331,14 @@ + + + gsp-snapshots-repo + https://repos.iec.io/repository/maven-gsp-snapshots/ + + + gsp-releases-repo + https://repos.iec.io/repository/maven-gsp-releases/ + + -- Gitee From 916f9d5b55fe12fb25155866e5d2b6d14ad7ef04 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Thu, 20 Jun 2024 11:46:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9E=84=E4=BB=B6java=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BE=9B?= =?UTF-8?q?update=E9=BB=98=E8=AE=A4=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javageneratecmpcode/JavaIBaseCompCodeGen.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 298979c..f934a47 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 @@ -53,4 +53,11 @@ public interface JavaIBaseCompCodeGen */ String generateCommon(); + /** + * 更新内容 + * @return 若不需要更新返回null + */ + default String update(String originContent) { + return null; + } } -- Gitee From bc0680d0c5c1bf5688b1ff3862dd1dbc77d2d724 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 25 Jun 2024 14:41:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84copyright?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JavaIBaseCompCodeGen.java | 12 ---------- pom.xml | 24 ------------------- 2 files changed, 36 deletions(-) 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 f934a47..289bfbb 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; diff --git a/pom.xml b/pom.xml index 15ca911..763a7eb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,20 +15,6 @@ ~ limitations under the License. --> - - @@ -331,14 +317,4 @@ - - - gsp-snapshots-repo - https://repos.iec.io/repository/maven-gsp-snapshots/ - - - gsp-releases-repo - https://repos.iec.io/repository/maven-gsp-releases/ - - -- Gitee From 9049ddb3009aa7ca25a926423deb1bc45e79c606 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 25 Jun 2024 15:04:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=BA0.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business-entity-generator/pom.xml | 3 +-- common-entity-generator/pom.xml | 2 +- common-entity-variable-generator/pom.xml | 2 +- pom.xml | 2 +- unified-datatype-generator/pom.xml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/business-entity-generator/pom.xml b/business-entity-generator/pom.xml index 47ffd20..bae529c 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.0 business-entity-generator - 0.1.0-SNAPSHOT diff --git a/common-entity-generator/pom.xml b/common-entity-generator/pom.xml index 6c6d74c..f6923e0 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.0 common-entity-generator diff --git a/common-entity-variable-generator/pom.xml b/common-entity-variable-generator/pom.xml index c851165..6af5baf 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.0 common-entity-variable-generator diff --git a/pom.xml b/pom.xml index 763a7eb..69f4490 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.inspur.edp business-entity-generator1 - 0.1.0-SNAPSHOT + 0.1.0 pom diff --git a/unified-datatype-generator/pom.xml b/unified-datatype-generator/pom.xml index 1e5949f..1539671 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.0 -- Gitee From f6e15ad5f77fb2649d45848267b37249e8ffd35e Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 25 Jun 2024 15:05:14 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=BA0.1.1-SNAPSHOT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business-entity-generator/pom.xml | 2 +- common-entity-generator/pom.xml | 2 +- common-entity-variable-generator/pom.xml | 2 +- pom.xml | 2 +- unified-datatype-generator/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/business-entity-generator/pom.xml b/business-entity-generator/pom.xml index bae529c..931efcd 100644 --- a/business-entity-generator/pom.xml +++ b/business-entity-generator/pom.xml @@ -22,7 +22,7 @@ com.inspur.edp business-entity-generator1 - 0.1.0 + 0.1.1-SNAPSHOT business-entity-generator diff --git a/common-entity-generator/pom.xml b/common-entity-generator/pom.xml index f6923e0..0084b8d 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 + 0.1.1-SNAPSHOT common-entity-generator diff --git a/common-entity-variable-generator/pom.xml b/common-entity-variable-generator/pom.xml index 6af5baf..c60c8f4 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 + 0.1.1-SNAPSHOT common-entity-variable-generator diff --git a/pom.xml b/pom.xml index 69f4490..d5f9409 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.inspur.edp business-entity-generator1 - 0.1.0 + 0.1.1-SNAPSHOT pom diff --git a/unified-datatype-generator/pom.xml b/unified-datatype-generator/pom.xml index 1539671..9aa2463 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 + 0.1.1-SNAPSHOT -- Gitee From 585a0a133f5edfe121db6f8f6d76dacda613049e Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 25 Jun 2024 15:10:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A1=A5=E5=85=85gitlab=20ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..4b2451d --- /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 -- Gitee