This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push: new bfb9a15 HDDS-3875. Package classpath files to the jar files instead of uploading them as artifacts (#1133) bfb9a15 is described below commit bfb9a1517210ac737781e3dddaed2f3e5ff738c6 Author: Elek, Márton <e...@users.noreply.github.com> AuthorDate: Thu Jul 2 09:54:36 2020 +0200 HDDS-3875. Package classpath files to the jar files instead of uploading them as artifacts (#1133) --- hadoop-hdds/pom.xml | 26 +-------- hadoop-ozone/dist/pom.xml | 132 +++------------------------------------------- hadoop-ozone/pom.xml | 26 +-------- 3 files changed, 11 insertions(+), 173 deletions(-) diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index ac854d4..5ad290f 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -279,12 +279,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <executions> <execution> <id>add-classpath-descriptor</id> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>build-classpath</goal> </goals> <configuration> - <outputFile>${project.build.directory}/classpath</outputFile> + <outputFile>${project.build.outputDirectory}/${project.artifactId}.classpath</outputFile> <prefix>$HDDS_LIB_JARS_DIR</prefix> <outputFilterFile>true</outputFilterFile> <includeScope>runtime</includeScope> @@ -293,28 +293,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-classpath-artifact</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/classpath</file> - <type>cp</type> - <classifier>classpath</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index a6b5bfd..840f628 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -41,103 +41,18 @@ <id>copy-classpath-files</id> <phase>prepare-package</phase> <goals> - <goal>copy</goal> + <goal>unpack-dependencies</goal> </goals> <configuration> <outputDirectory> target/ozone-${ozone.version}/share/ozone/classpath </outputDirectory> - <artifactItems> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-server-scm</artifactId> - <version>${hdds.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-hdds-server-scm.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-tools</artifactId> - <version>${hdds.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-hdds-tools.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-s3gateway</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-s3gateway.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-csi</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-csi.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-ozone-manager</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-ozone-manager.classpath - </destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-tools</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-tools.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-filesystem</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-filesystem.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-common</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-common.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-datanode</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-datanode.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-upgrade</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-upgrade.classpath</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-insight</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-insight.classpath</destFileName> - </artifactItem> - </artifactItems> + <includes>*.classpath</includes> + <includeArtifactIds> + hadoop-hdds-server-scm,hadoop-ozone-common,hadoop-ozone-csi,hadoop-ozone-datanode,hadoop-ozone-insight, + hadoop-ozone-ozone-manager,hadoop-ozone-recon,hadoop-ozone-s3gateway,hadoop-ozone-tools, + hadoop-ozone-upgrade + </includeArtifactIds> </configuration> </execution> <execution> @@ -340,39 +255,6 @@ </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-recon-classpath-file</id> - <phase>prepare-package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory> - target/ozone-${ozone.version}/share/ozone/classpath - </outputDirectory> - <artifactItems> - <artifactItem> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-recon</artifactId> - <version>${ozone.version}</version> - <classifier>classpath</classifier> - <type>cp</type> - <destFileName>hadoop-ozone-recon.classpath</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 3cc5df1..58fde64 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -313,12 +313,12 @@ <executions> <execution> <id>add-classpath-descriptor</id> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>build-classpath</goal> </goals> <configuration> - <outputFile>${project.build.directory}/classpath</outputFile> + <outputFile>${project.build.outputDirectory}/${pom.artifactId}.classpath</outputFile> <prefix>$HDDS_LIB_JARS_DIR</prefix> <outputFilterFile>true</outputFilterFile> <includeScope>runtime</includeScope> @@ -327,28 +327,6 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-classpath-artifact</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/classpath</file> - <type>cp</type> - <classifier>classpath</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org