[GitHub] mikewalch closed pull request #667: Fixes #622 - Include version in Jar filenames of Accumulo deps

[GitBox <gi...@apache.org>]

mikewalch closed pull request #667: Fixes #622 - Include version in Jar filenames of Accumulo deps
URL: https://github.com/apache/accumulo/pull/667
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assemble/pom.xml b/assemble/pom.xml
index 61d98412c8..b56643da59 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -380,42 +380,10 @@
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <!-- generate version listing for packaged dependencies -->
-            <id>generate-dependencies-raw</id>
-            <goals>
-              <goal>list</goal>
-            </goals>
-            <phase>compile</phase>
-            <configuration>
-              <outputFile>${project.build.directory}/dependencies.raw.txt</outputFile>
-              <outputScope>false</outputScope>
-              <sort>true</sort>
-              <!-- this list should match that in src/main/assemblies/component.xml -->
-              <includeArtifactIds>commons-cli,commons-codec,commons-collections,commons-configuration,commons-io,commons-lang,commons-logging,commons-math3,commons-vfs2,gson,guava,htrace-core,htrace-core4,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12,log4j</includeArtifactIds>
-              <excludeTransitive>true</excludeTransitive>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <executions>
-          <execution>
-            <id>generate-dependencies-listing</id>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <executable>${basedir}/src/main/scripts/generate-versions-listing.sh</executable>
-            </configuration>
-          </execution>
           <execution>
             <id>client-props-file</id>
             <goals>
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 207191e0dc..64f73daf24 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -23,7 +23,6 @@
       <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
       <useProjectArtifact>false</useProjectArtifact>
-      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
         <!-- if you update this list, you should also update the assembly
@@ -172,14 +171,6 @@
         <include>BUILD.md</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>lib</outputDirectory>
-      <fileMode>0644</fileMode>
-      <includes>
-        <include>VERSIONS</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>src/main/resources</directory>
       <directoryMode>0755</directoryMode>
diff --git a/assemble/src/main/scripts/generate-versions-listing.sh b/assemble/src/main/scripts/generate-versions-listing.sh
deleted file mode 100755
index 0d192542d2..0000000000
--- a/assemble/src/main/scripts/generate-versions-listing.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script will generate a DEPENDENCIES listing of packaged dependencies
-
-in=target/dependencies.raw.txt
-out=target/VERSIONS
-
-echo 'This build bundles the following jars, identified by their maven' > "$out"
-echo 'address: <groupId>:<artifactId>:<version>' >> "$out"
-echo '' >> "$out"
-
-cat "$in" | grep '^   [a-z]' | sed 's/:jar:/:/' >> "$out"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services