Forráskód Böngészése

HDDS-1510. Classpath files are deployed to the maven repository as pom/jar files. Contributed by Elek, Marton. (#900)

Elek, Márton 6 éve
szülő
commit
97607f3dce
3 módosított fájl, 57 hozzáadás és 2 törlés
  1. 23 1
      hadoop-hdds/pom.xml
  2. 11 0
      hadoop-ozone/dist/pom.xml
  3. 23 1
      hadoop-ozone/pom.xml

+ 23 - 1
hadoop-hdds/pom.xml

@@ -320,7 +320,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
               <goal>build-classpath</goal>
             </goals>
             <configuration>
-              <attach>true</attach>
+              <outputFile>${project.build.directory}/classpath</outputFile>
               <prefix>$HDDS_LIB_JARS_DIR</prefix>
               <outputFilterFile>true</outputFilterFile>
               <includeScope>runtime</includeScope>
@@ -328,6 +328,28 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
           </execution>
         </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>

+ 11 - 0
hadoop-ozone/dist/pom.xml

@@ -52,6 +52,7 @@
                   <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>
@@ -59,6 +60,7 @@
                   <artifactId>hadoop-hdds-tools</artifactId>
                   <version>${hdds.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-hdds-tools.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -66,6 +68,7 @@
                   <artifactId>hadoop-ozone-s3gateway</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-s3gateway.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -73,6 +76,7 @@
                   <artifactId>hadoop-ozone-csi</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-csi.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -80,6 +84,7 @@
                   <artifactId>hadoop-ozone-ozone-manager</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-ozone-manager.classpath
                   </destFileName>
                 </artifactItem>
@@ -88,6 +93,7 @@
                   <artifactId>hadoop-ozone-tools</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-tools.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -95,6 +101,7 @@
                   <artifactId>hadoop-ozone-filesystem</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-filesystem.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -102,6 +109,7 @@
                   <artifactId>hadoop-ozone-common</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-common.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -109,6 +117,7 @@
                   <artifactId>hadoop-ozone-datanode</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-datanode.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -116,6 +125,7 @@
                   <artifactId>hadoop-ozone-recon</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-recon.classpath</destFileName>
                 </artifactItem>
                 <artifactItem>
@@ -123,6 +133,7 @@
                   <artifactId>hadoop-ozone-upgrade</artifactId>
                   <version>${ozone.version}</version>
                   <classifier>classpath</classifier>
+                  <type>cp</type>
                   <destFileName>hadoop-ozone-upgrade.classpath</destFileName>
                 </artifactItem>
               </artifactItems>

+ 23 - 1
hadoop-ozone/pom.xml

@@ -309,7 +309,7 @@
               <goal>build-classpath</goal>
             </goals>
             <configuration>
-              <attach>true</attach>
+              <outputFile>${project.build.directory}/classpath</outputFile>
               <prefix>$HDDS_LIB_JARS_DIR</prefix>
               <outputFilterFile>true</outputFilterFile>
               <includeScope>runtime</includeScope>
@@ -317,6 +317,28 @@
           </execution>
         </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>