accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo] branch master updated: Fixes #622 - Include version in Jar filenames of Accumulo deps (#667)
Date Tue, 02 Oct 2018 19:28:56 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 6b9bc3e  Fixes #622 - Include version in Jar filenames of Accumulo deps (#667)
6b9bc3e is described below

commit 6b9bc3e9e6de69f6da49ee80370a44bd3612bbf8
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Tue Oct 2 15:28:48 2018 -0400

    Fixes #622 - Include version in Jar filenames of Accumulo deps (#667)
---
 assemble/pom.xml                                   | 32 ----------------------
 assemble/src/main/assemblies/component.xml         |  9 ------
 .../src/main/scripts/generate-versions-listing.sh  | 27 ------------------
 3 files changed, 68 deletions(-)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index 61d9841..b56643d 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -381,42 +381,10 @@
   <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>
               <goal>java</goal>
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 207191e..64f73da 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
@@ -173,14 +172,6 @@
       </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>
       <fileMode>0644</fileMode>
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 0d19254..0000000
--- 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"


Mime
View raw message