From 8f1f251e9f25ecd9b05385326b91a0a4dcb3a1da Mon Sep 17 00:00:00 2001 From: 梁超 Date: Fri, 5 Jan 2024 01:39:22 +0000 Subject: Revert "Merge branch 'feature/gitlab-ci' into 'develop'" This reverts merge request !11 --- .gitlab-ci.yml | 43 ----- develop/checkstyle.xml | 444 ------------------------------------------- develop/spotbugs-exclude.xml | 4 - develop/suppressions.xml | 12 -- pom.xml | 381 +++++++++---------------------------- 5 files changed, 94 insertions(+), 790 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 develop/checkstyle.xml delete mode 100644 develop/spotbugs-exclude.xml delete mode 100644 develop/suppressions.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 164dfc8..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,43 +0,0 @@ -image: 192.168.40.153:9080/common/maven:3.8.2-jdk-8-slim - -variables: - MAVEN_CLI_OPTS: --batch-mode --errors --show-version - SONAR_HOST_URL: http://192.168.40.153:9900 - SONAR_PROJECT_KEY: groot-stream - -stages: - - test - - build - - deploy - -# 代码测试 -test: - stage: test - script: - - echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml - - mvn $MAVEN_CLI_OPTS clean test - only: - - merge_requests - -# 构建。一般用于构建 develop 分支上的 snapshot 版本。 -build: - stage: build - script: - - echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml - - mvn $MAVEN_CLI_OPTS enforcer:enforce@snapshot-version-check - - mvn $MAVEN_CLI_OPTS clean site deploy -DskipTests - only: - - develop - -# 发布。用于发布候选版本，正式版本以及修订版等 release 版本。 -deploy: - stage: deploy - script: - - echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml - - mvn $MAVEN_CLI_OPTS enforcer:enforce@release-version-check - - |- - mvn $MAVEN_CLI_OPTS clean verify sonar:sonar sonar-quality-gate:check -Dsonar.projectKey=$SONAR_PROJECT_KEY \ - -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN_TOKEN - - mvn $MAVEN_CLI_OPTS clean site deploy -DskipTests - only: - - tags \ No newline at end of file diff --git a/develop/checkstyle.xml b/develop/checkstyle.xml deleted file mode 100644 index c1b4f7d..0000000 --- a/develop/checkstyle.xml +++ /dev/null @@ -1,444 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/develop/spotbugs-exclude.xml b/develop/spotbugs-exclude.xml deleted file mode 100644 index 5fd588b..0000000 --- a/develop/spotbugs-exclude.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/develop/suppressions.xml b/develop/suppressions.xml deleted file mode 100644 index 9c4d424..0000000 --- a/develop/suppressions.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/pom.xml b/pom.xml index a9aef7c..1e48008 100644 --- a/pom.xml +++ b/pom.xml @@ -121,14 +121,14 @@ org.slf4j log4j-over-slf4j ${slf4j.version} - provided + provided org.slf4j slf4j-log4j12 ${slf4j.version} - provided + provided + + + log4j + log4j + ${log4j.version} + provided + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + ch.qos.logback + logback-core + ${logback.version} + provided + + + + org.apache.commons + commons-jexl3 + 3.2.1 + + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + com.beust + jcommander + ${jcommander.version} + + + + com.jayway.jsonpath + json-path + ${jsonpath.version} + + + com.alibaba + fastjson + ${fastjson2.version} + + + com.alibaba.nacos + nacos-client + ${nacos.version} + + + + com.typesafe + config + ${config.version} + + + + org.junit + junit-bom + ${junit.version} + pom + import + + + + org.antlr + antlr4 + ${antlr4.version} + + + + com.hazelcast + hazelcast + ${hazelcast.version} + + + + org.apache.flink flink-clients_${scala.version} @@ -441,6 +441,7 @@ + @@ -509,11 +510,10 @@ package - - + + @@ -579,8 +579,8 @@ 1.7 - - + + com.geedgenetworks,org.apache,org,,javax,java,\# @@ -628,7 +628,7 @@ **/.github/**/*.md **/*.json - + true @@ -644,189 +644,7 @@ - - - org.commonjava.maven.plugins - directory-maven-plugin - - - directories - - directory-of - - initialize - - rootDir - - com.geedgenetworks - groot-stream - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - java-style-check - compile - - check - - - src/main/java - - - - java-test-style-check - test-compile - - check - - - src/test/java - true - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - - findbugs-main - compile - - check - - - - findbugs-test - test-compile - - check - - - true - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.7 - - - default-agent - - prepare-agent - - initialize - - - default-report - verify - - report - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.1.2 - - - org.commonjava.maven.plugins - directory-maven-plugin - 1.0 - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - ${rootDir}/develop/checkstyle.xml - ${rootDir}/develop/suppressions.xml - true - true - true - - - - com.puppycrawl.tools - checkstyle - 8.40 - - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.4.2.2 - - Low - default - true - true - ${rootDir}/develop/spotbugs-exclude.xml - ${project.build.directory}/spotbugs - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - release-version-check - - enforce - - - - - SNAPSHOT versions ${project.version} are not allowed. - - - - - - snapshot-version-check - - enforce - - - - - Non-SNAPSHOT versions ${project.version} are not allowed. - - - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.9.0.2155 - - - io.github.r0bb3n - sonar-quality-gate-maven-plugin - 1.3.0 - - - @@ -839,18 +657,7 @@ cloudera https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - platform-releases - http://192.168.40.153:8099/content/repositories/platform-release - true - - - platform-snapshots - http://192.168.40.153:8099/content/repositories/platform-snapshot - - + -- cgit v1.2.3