You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2014/03/03 18:11:36 UTC
[1/3] git commit: ACCUMULO-2281 copy dependencies to correct dir
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 57b2e5c77 -> a8bbb916c
refs/heads/1.5.1-SNAPSHOT 7eeff02c7 -> a3c2f61f4
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.4.5-SNAPSHOT
Commit: a8bbb916c2796d7f2bbc64ef82291034bbb3810d
Parents: 57b2e5c
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 3 12:05:55 2014 -0500
Committer: Mike Drob <md...@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>
[3/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3c2f61f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3c2f61f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3c2f61f
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: a3c2f61f450f21f37c7d71f17d3ff020efc1e823
Parents: 7eeff02 a8bbb91
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 3 12:09:28 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 3 12:09:28 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2281 copy dependencies to correct dir
Posted by md...@apache.org.
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.5.1-SNAPSHOT
Commit: a8bbb916c2796d7f2bbc64ef82291034bbb3810d
Parents: 57b2e5c
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 3 12:05:55 2014 -0500
Committer: Mike Drob <md...@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>