This is an automated email from the ASF dual-hosted git repository. vgalaxies pushed a commit to branch dist-1.5.0 in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 10dc4772a99af6af4903e3900ca1d382a43552f8 Author: VGalaxies <[email protected]> AuthorDate: Thu Jul 18 01:22:26 2024 +0800 setup --- hugegraph-pd/Dockerfile | 2 +- hugegraph-pd/hg-pd-dist/pom.xml | 1 - hugegraph-pd/pom.xml | 2 +- .../src/assembly/descriptor/assembly.xml | 11 ---- .../hugegraph-dist/src/assembly/travis/start-pd.sh | 2 +- .../src/assembly/travis/start-store.sh | 2 +- hugegraph-server/pom.xml | 3 +- hugegraph-store/Dockerfile | 2 +- hugegraph-store/hg-store-dist/pom.xml | 1 - hugegraph-store/pom.xml | 2 +- install-dist/pom.xml | 62 ++++++++++++++++++++++ install-dist/scripts/apache-release.sh | 4 +- pom.xml | 1 + 13 files changed, 71 insertions(+), 24 deletions(-) diff --git a/hugegraph-pd/Dockerfile b/hugegraph-pd/Dockerfile index a86b5b9bd..e507900ad 100644 --- a/hugegraph-pd/Dockerfile +++ b/hugegraph-pd/Dockerfile @@ -30,7 +30,7 @@ RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 FROM openjdk:11-slim -COPY --from=build /pkg/hugegraph-pd/apache-hugegraph-incubating-pd-*/ /hugegraph-pd/ +COPY --from=build /pkg/hugegraph-pd/apache-hugegraph-pd-incubating-*/ /hugegraph-pd/ LABEL maintainer="HugeGraph Docker Maintainers <[email protected]>" # TODO: use g1gc or zgc as default diff --git a/hugegraph-pd/hg-pd-dist/pom.xml b/hugegraph-pd/hg-pd-dist/pom.xml index 096c27790..f669cf5ae 100644 --- a/hugegraph-pd/hg-pd-dist/pom.xml +++ b/hugegraph-pd/hg-pd-dist/pom.xml @@ -31,7 +31,6 @@ <properties> <dist.dir>${project.parent.basedir}</dist.dir> - <shell-executable>bash</shell-executable> <assembly.dir>${project.basedir}/src/assembly</assembly.dir> <assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir> <assembly.static.dir>${assembly.dir}/static</assembly.static.dir> diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml index 34f25b5d8..b2547a7dc 100644 --- a/hugegraph-pd/pom.xml +++ b/hugegraph-pd/pom.xml @@ -43,7 +43,7 @@ <properties> <log4j2.version>2.17.0</log4j2.version> - <final.name>apache-${release.name}-incubating-pd-${project.version}</final.name> + <final.name>apache-${release.name}-pd-incubating-${project.version}</final.name> </properties> <dependencyManagement> diff --git a/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml b/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml index b1c293dfb..b7f9ee048 100644 --- a/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml +++ b/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml @@ -46,17 +46,6 @@ <include>*.jar</include> </includes> </fileSet> - <fileSet> - <directory>${top.level.dir}/hugegraph-dist/release-docs/</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - <fileSet> - <directory>${top.level.dir}/../</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>DISCLAIMER*</include> - </includes> - </fileSet> </fileSets> <dependencySets> diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh index c9200fefb..9f694d5c3 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh @@ -18,7 +18,7 @@ set -ev HOME_DIR=$(pwd) -PD_DIR=$HOME_DIR/hugegraph-pd/apache-hugegraph-incubating-pd-1.5.0 +PD_DIR=$HOME_DIR/hugegraph-pd/apache-hugegraph-pd-incubating-1.5.0 pushd $PD_DIR . bin/start-hugegraph-pd.sh diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh index c4c11c2c3..23e8f2297 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh @@ -18,7 +18,7 @@ set -ev HOME_DIR=$(pwd) -STORE_DIR=$HOME_DIR/hugegraph-store/apache-hugegraph-incubating-store-1.5.0 +STORE_DIR=$HOME_DIR/hugegraph-store/apache-hugegraph-store-incubating-1.5.0 pushd $STORE_DIR . bin/start-hugegraph-store.sh diff --git a/hugegraph-server/pom.xml b/hugegraph-server/pom.xml index 2eb015857..6234d17b2 100644 --- a/hugegraph-server/pom.xml +++ b/hugegraph-server/pom.xml @@ -37,7 +37,7 @@ <properties> <top.level.dir>${project.basedir}/..</top.level.dir> - <final.name>apache-${release.name}-incubating-server-${project.version}</final.name> + <final.name>apache-${release.name}-server-incubating-${project.version}</final.name> <slf4j.version>1.7.5</slf4j.version> <log4j.version>1.2.17</log4j.version> <log4j2.version>2.17.1</log4j2.version> @@ -49,7 +49,6 @@ <jersey.version>3.0.3</jersey.version> <metrics.version>4.2.4</metrics.version> <javassist.version>3.21.0-GA</javassist.version> - <shell-executable>bash</shell-executable> <checkstyle.plugin.version>3.1.2</checkstyle.plugin.version> <checkstyle.version>8.45</checkstyle.version> <grpc.version>1.47.0</grpc.version> diff --git a/hugegraph-store/Dockerfile b/hugegraph-store/Dockerfile index c7329a8f8..042ceef42 100644 --- a/hugegraph-store/Dockerfile +++ b/hugegraph-store/Dockerfile @@ -30,7 +30,7 @@ RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 FROM openjdk:11-slim -COPY --from=build /pkg/hugegraph-store/apache-hugegraph-incubating-store-*/ /hugegraph-store/ +COPY --from=build /pkg/hugegraph-store/apache-hugegraph-store-incubating-*/ /hugegraph-store/ LABEL maintainer="HugeGraph Docker Maintainers <[email protected]>" # TODO: use g1gc or zgc as default diff --git a/hugegraph-store/hg-store-dist/pom.xml b/hugegraph-store/hg-store-dist/pom.xml index dc6b1bf34..ce2bd5824 100644 --- a/hugegraph-store/hg-store-dist/pom.xml +++ b/hugegraph-store/hg-store-dist/pom.xml @@ -32,7 +32,6 @@ <properties> <dist.dir>${project.parent.basedir}</dist.dir> - <shell-executable>bash</shell-executable> <assembly.dir>${project.basedir}/src/assembly</assembly.dir> <assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir> <assembly.static.dir>${assembly.dir}/static</assembly.static.dir> diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml index be1bbfc7f..22c96a77b 100644 --- a/hugegraph-store/pom.xml +++ b/hugegraph-store/pom.xml @@ -47,7 +47,7 @@ <properties> <log4j2.version>2.15.0</log4j2.version> - <final.name>apache-${release.name}-incubating-store-${project.version}</final.name> + <final.name>apache-${release.name}-store-incubating-${project.version}</final.name> </properties> <dependencyManagement> diff --git a/install-dist/pom.xml b/install-dist/pom.xml index d351fcf90..ff4fb92c2 100644 --- a/install-dist/pom.xml +++ b/install-dist/pom.xml @@ -27,4 +27,66 @@ </parent> <!-- TODO: rename to hugegraph-dist later --> <artifactId>install-dist</artifactId> + + <properties> + <final.name>apache-${release.name}-incubating-${project.version}</final.name> + </properties> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <!-- TODO: change to assembly plugin in future --> + <echo file="${project.basedir}/dist.sh"> + root_path=$(cd $(dirname $0)/..; pwd) + cd $root_path || exit + + mkdir -p ${final.name} + cp -r -v $root_path/hugegraph-pd/apache-hugegraph-pd-incubating-${project.version} ${final.name}/ || exit + cp -r -v $root_path/hugegraph-store/apache-hugegraph-store-incubating-${project.version} ${final.name}/ || exit + cp -r -v $root_path/hugegraph-server/apache-hugegraph-server-incubating-${project.version} ${final.name}/ || exit + cp -r -v $root_path/install-dist/release-docs/* $root_path/DISCLAIMER ${final.name}/ || exit + + tar zcvf $root_path/target/${final.name}.tar.gz ./${final.name} || exit 1 + + md5sum $root_path/target/${final.name}.tar.gz + echo -n "hugegraph tar.gz available at: " + echo "$root_path/target/${final.name}.tar.gz" + rm -f ${project.basedir}/dist.sh + </echo> + <exec executable="${shell-executable}" dir="${project.basedir}" failonerror="true"> + <arg line="./dist.sh"/> + </exec> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>${project.basedir}/..</directory> + <includes> + <include>${final.name}.tar.gz</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + <fileset> + <directory>${project.basedir}/../${final.name}</directory> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/install-dist/scripts/apache-release.sh b/install-dist/scripts/apache-release.sh index 859a63562..f8a44f547 100755 --- a/install-dist/scripts/apache-release.sh +++ b/install-dist/scripts/apache-release.sh @@ -47,9 +47,7 @@ cd - || exit # step2: copy the binary file (Optional) # Note: it's optional for project to generate binary package (skip this step if not need) -cp -v ../../hugegraph-server/apache-${REPO}-incubating-server-"${RELEASE_VERSION}".tar.gz \ - dist/apache-${REPO} || exit -# TODO: pd & store +cp -v ../../apache-${REPO}-incubating-"${RELEASE_VERSION}".tar.gz dist/apache-${REPO} || exit # step3: sign + hash ##### 3.1 sign in source & binary package diff --git a/pom.xml b/pom.xml index 0f8bc3e22..44be45637 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> + <shell-executable>bash</shell-executable> </properties> <modules>
