accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From md...@apache.org
Subject [2/6] git commit: ACCUMULO-2281 copy dependencies to correct dir
Date Tue, 04 Mar 2014 13:37:21 GMT
ACCUMULO-2281 copy dependencies to correct dir

Use project.parent.basedir instead of relative paths for copying
dependencies for packaging and assembly.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8bbb916
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8bbb916
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8bbb916

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a8bbb916c2796d7f2bbc64ef82291034bbb3810d
Parents: 57b2e5c
Author: Mike Drob <mdrob@cloudera.com>
Authored: Mon Mar 3 12:05:55 2014 -0500
Committer: Mike Drob <mdrob@cloudera.com>
Committed: Mon Mar 3 12:05:55 2014 -0500

----------------------------------------------------------------------
 pom.xml                     |  2 +-
 src/examples/simple/pom.xml | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8bbb916/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92d8106..4c8e5bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>../../lib</outputDirectory>
+              <outputDirectory>${project.parent.basedir}/lib</outputDirectory>
               <!-- just grab the non-provided runtime dependencies -->
               <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
               <excludeTransitive>true</excludeTransitive>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8bbb916/src/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/simple/pom.xml b/src/examples/simple/pom.xml
index 6ef7741..44f6b88 100644
--- a/src/examples/simple/pom.xml
+++ b/src/examples/simple/pom.xml
@@ -124,6 +124,22 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.parent.parent.basedir}/lib</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <configuration>
           <outputDirectory>../../../lib</outputDirectory>


Mime
View raw message