From 7175358fa6d0e4dc3adc6e3767dc8e4bfd5ac00f Mon Sep 17 00:00:00 2001 From: imbajin Date: Fri, 5 May 2023 13:25:16 +0800 Subject: [PATCH] chore: add .gitattributes file to unify line separator & clean pom Change-Id: I303c98351c2dafda4fbb279dd8dc1056164b8f70 --- .gitattributes | 1 + build-change.sh | 1 + build-pre.sh | 1 + hg-store-cli/pom.xml | 11 ----------- hg-store-client/pom.xml | 11 +---------- hg-store-common/pom.xml | 11 ----------- hg-store-core/pom.xml | 13 +------------ hg-store-dist/pom.xml | 12 +----------- hg-store-grpc/pom.xml | 10 ---------- .../src/assembly/static/bin/hg-get-release.sh | 2 +- pom.xml | 1 + settings.xml | 1 + 12 files changed, 9 insertions(+), 66 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..4fd3cf5c2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/build-change.sh b/build-change.sh index 1fde2703a..e88f92022 100644 --- a/build-change.sh +++ b/build-change.sh @@ -21,6 +21,7 @@ export JAVA_HOME=$ORACLEJDK_11_0_7_HOME export MAVEN_HOME=$MAVEN_3_5_3_HOME readonly VER=3.6.3 +# TODO: remove thie repo readonly REPO_URL=http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots $MAVEN_3_5_3_BIN/mvn clean install -Dmaven.test.skip=true -DaltDeploymentRepository=Baidu_Local_Snapshots::default::${REPO_URL} diff --git a/build-pre.sh b/build-pre.sh index feaa3102b..1d89ff87b 100644 --- a/build-pre.sh +++ b/build-pre.sh @@ -54,6 +54,7 @@ curl -i -X PUT -u "$artifactoryUser:$artifactoryPassword" \ #------------------repo-client----------------------- + # TODO: remove thie repo readonly REPO_SNAPSHOT_PATH=http://10.14.139.8:8082/artifactory/star readonly REPO_FILE_PATH=http://10.14.139.8:8082/artifactory/star-file readonly REPO_BAIDU_LOCAL_PATH=http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local diff --git a/hg-store-cli/pom.xml b/hg-store-cli/pom.xml index ab424185b..ce27b86a4 100644 --- a/hg-store-cli/pom.xml +++ b/hg-store-cli/pom.xml @@ -76,15 +76,4 @@ - - - Baidu_Local - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local - - - Baidu_Local_Snapshots - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots - - - \ No newline at end of file diff --git a/hg-store-client/pom.xml b/hg-store-client/pom.xml index e7d4bed66..6cc697dfd 100644 --- a/hg-store-client/pom.xml +++ b/hg-store-client/pom.xml @@ -98,14 +98,5 @@ test - - - Baidu_Local - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local - - - Baidu_Local_Snapshots - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots - - + \ No newline at end of file diff --git a/hg-store-common/pom.xml b/hg-store-common/pom.xml index 1eb0d1537..7c1ffbe54 100644 --- a/hg-store-common/pom.xml +++ b/hg-store-common/pom.xml @@ -29,15 +29,4 @@ hg-store-common - - - - Baidu_Local - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local - - - Baidu_Local_Snapshots - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots - - \ No newline at end of file diff --git a/hg-store-core/pom.xml b/hg-store-core/pom.xml index e5c9237bd..9dd81438b 100644 --- a/hg-store-core/pom.xml +++ b/hg-store-core/pom.xml @@ -133,17 +133,6 @@ safesdk-java 3.0.2 - - - - - Baidu_Local - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local - - - Baidu_Local_Snapshots - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots - - + \ No newline at end of file diff --git a/hg-store-dist/pom.xml b/hg-store-dist/pom.xml index fd802f6a4..0086e6209 100644 --- a/hg-store-dist/pom.xml +++ b/hg-store-dist/pom.xml @@ -139,17 +139,7 @@ - + - - - Baidu_Local - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local - - - Baidu_Local_Snapshots - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots - - \ No newline at end of file diff --git a/hg-store-grpc/pom.xml b/hg-store-grpc/pom.xml index 95ac872c1..0a3090f29 100644 --- a/hg-store-grpc/pom.xml +++ b/hg-store-grpc/pom.xml @@ -154,14 +154,4 @@ - - - Baidu_Local - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local - - - Baidu_Local_Snapshots - http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots - - \ No newline at end of file diff --git a/hg-store-node/src/assembly/static/bin/hg-get-release.sh b/hg-store-node/src/assembly/static/bin/hg-get-release.sh index fc6051590..b083c6d55 100644 --- a/hg-store-node/src/assembly/static/bin/hg-get-release.sh +++ b/hg-store-node/src/assembly/static/bin/hg-get-release.sh @@ -16,7 +16,7 @@ # under the License. # -#ver 0.1.0 liyan75 on 2021/12/17 +# TODO: remove thie repo readonly REPO_SNAPSHOT_PATH=http://10.14.139.8:8082/artifactory/star readonly REPO_FILE_PATH=http://10.14.139.8:8082/artifactory/star-file readonly REPO_BAIDU_LOCAL_PATH=http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local diff --git a/pom.xml b/pom.xml index 25c5c2879..8f79c9d21 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ + Baidu_Local diff --git a/settings.xml b/settings.xml index 9094e35be..5a7da620a 100644 --- a/settings.xml +++ b/settings.xml @@ -37,6 +37,7 @@ + baidu