You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/07/20 15:21:11 UTC
[1/3] cassandra git commit: Fix build.xml to not download
non-existent source jars, cleanup duplicate artifacts
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 8d87c2822 -> a65953d59
refs/heads/trunk 074452efa -> a66863861
Fix build.xml to not download non-existent source jars, cleanup duplicate artifacts
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9845
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a65953d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a65953d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a65953d5
Branch: refs/heads/cassandra-2.2
Commit: a65953d595386e5a19730151320127a41a1a7c0b
Parents: 8d87c28
Author: Robert Stupp <sn...@snazy.de>
Authored: Mon Jul 20 15:16:07 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Mon Jul 20 15:16:07 2015 +0200
----------------------------------------------------------------------
build.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 50 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a65953d5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index de57f04..8c5c64aa 100644
--- a/build.xml
+++ b/build.xml
@@ -364,12 +364,21 @@
<exclusion groupId="org.eclipse.jdt" artifactId="core"/>
<exclusion groupId="ant" artifactId="ant"/>
</dependency>
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
- <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3">
+ <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 -->
+ </dependency>
+ <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1">
+ <exclusion groupId="org.mortbay.jetty" artifactId="jetty"/>
+ <exclusion groupId="hsqldb" artifactId="hsqldb"/> <!-- outdated version -->
+ <exclusion groupId="antlr" artifactId="antlr"/> <!-- outdated version -->
+ </dependency>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
<dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
<exclusion groupId="xerces" artifactId="xercesImpl"/>
+ <exclusion groupId="org.mortbay.jetty" artifactId="jetty"/> <!-- older version, also via hadoop-core + pig -->
+ <exclusion groupId="org.mortbay.jetty" artifactId="jetty-util"/> <!-- older version, also via hadoop-core + pig -->
+ <exclusion groupId="org.apache.ant" artifactId="ant"/> <!-- older version 1.8.3 -->
</dependency>
<dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
<dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
@@ -450,6 +459,33 @@
<dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>
<dependency groupId="org.apache.ant" artifactId="ant-junit" version="1.9.4" />
</artifact:pom>
+ <!-- this build-deps-pom-sources "artifact" is the same as build-deps-pom but only with those
+ artifacts that have "-source.jar" files -->
+ <artifact:pom id="build-deps-pom-sources"
+ artifactId="cassandra-build-deps">
+ <parent groupId="org.apache.cassandra"
+ artifactId="cassandra-parent"
+ version="${version}"/>
+ <dependency groupId="junit" artifactId="junit"/>
+ <dependency groupId="org.apache.pig" artifactId="pig">
+ <exclusion groupId="xmlenc" artifactId="xmlenc"/>
+ <exclusion groupId="tomcat" artifactId="jasper-runtime"/>
+ <exclusion groupId="tomcat" artifactId="jasper-compiler"/>
+ <exclusion groupId="org.eclipse.jdt" artifactId="core"/>
+ <exclusion groupId="net.sf.kosmosfs" artifactId="kfs"/>
+ <exclusion groupId="hsqldb" artifactId="hsqldb"/>
+ <exclusion groupId="antlr" artifactId="antlr"/>
+ </dependency>
+ <!-- TODO CASSANDRA-9543
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded"/>
+ -->
+ <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
+ <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess"/>
+ <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>
+ <dependency groupId="org.apache.ant" artifactId="ant-junit" version="1.9.4" />
+ </artifact:pom>
<artifact:pom id="coverage-deps-pom"
artifactId="cassandra-coverage-deps">
@@ -570,15 +606,24 @@
</target>
<target name="maven-ant-tasks-retrieve-build" depends="maven-declare-dependencies" unless="without.maven">
+ <!-- retrieve artifacts -->
<artifact:dependencies pomRefId="build-deps-pom"
- filesetId="build-dependency-jars"
- sourcesFilesetId="build-dependency-sources"
- cacheDependencyRefs="true"
+ filesetId="build-dependency-jars"
+ cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
<remoteRepository refid="central"/>
<remoteRepository refid="apache"/>
<remoteRepository refid="java.net2"/>
</artifact:dependencies>
+ <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
+ <artifact:dependencies pomRefId="build-deps-pom-sources"
+ sourcesFilesetId="build-dependency-sources"
+ cacheDependencyRefs="true"
+ dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
+ <remoteRepository refid="central"/>
+ <remoteRepository refid="apache"/>
+ <remoteRepository refid="java.net2"/>
+ </artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="build-dependency-jars"/>
<mapper type="flatten"/>
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6686386
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6686386
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6686386
Branch: refs/heads/trunk
Commit: a66863861136a29dc04d7bc3b319f9f8fae0f49f
Parents: 074452e a65953d
Author: Robert Stupp <sn...@snazy.de>
Authored: Mon Jul 20 15:17:22 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Mon Jul 20 15:17:22 2015 +0200
----------------------------------------------------------------------
build.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 50 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6686386/build.xml
----------------------------------------------------------------------
[2/3] cassandra git commit: Fix build.xml to not download
non-existent source jars, cleanup duplicate artifacts
Posted by sn...@apache.org.
Fix build.xml to not download non-existent source jars, cleanup duplicate artifacts
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9845
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a65953d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a65953d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a65953d5
Branch: refs/heads/trunk
Commit: a65953d595386e5a19730151320127a41a1a7c0b
Parents: 8d87c28
Author: Robert Stupp <sn...@snazy.de>
Authored: Mon Jul 20 15:16:07 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Mon Jul 20 15:16:07 2015 +0200
----------------------------------------------------------------------
build.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 50 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a65953d5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index de57f04..8c5c64aa 100644
--- a/build.xml
+++ b/build.xml
@@ -364,12 +364,21 @@
<exclusion groupId="org.eclipse.jdt" artifactId="core"/>
<exclusion groupId="ant" artifactId="ant"/>
</dependency>
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
- <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3">
+ <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 -->
+ </dependency>
+ <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1">
+ <exclusion groupId="org.mortbay.jetty" artifactId="jetty"/>
+ <exclusion groupId="hsqldb" artifactId="hsqldb"/> <!-- outdated version -->
+ <exclusion groupId="antlr" artifactId="antlr"/> <!-- outdated version -->
+ </dependency>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
<dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
<exclusion groupId="xerces" artifactId="xercesImpl"/>
+ <exclusion groupId="org.mortbay.jetty" artifactId="jetty"/> <!-- older version, also via hadoop-core + pig -->
+ <exclusion groupId="org.mortbay.jetty" artifactId="jetty-util"/> <!-- older version, also via hadoop-core + pig -->
+ <exclusion groupId="org.apache.ant" artifactId="ant"/> <!-- older version 1.8.3 -->
</dependency>
<dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
<dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
@@ -450,6 +459,33 @@
<dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>
<dependency groupId="org.apache.ant" artifactId="ant-junit" version="1.9.4" />
</artifact:pom>
+ <!-- this build-deps-pom-sources "artifact" is the same as build-deps-pom but only with those
+ artifacts that have "-source.jar" files -->
+ <artifact:pom id="build-deps-pom-sources"
+ artifactId="cassandra-build-deps">
+ <parent groupId="org.apache.cassandra"
+ artifactId="cassandra-parent"
+ version="${version}"/>
+ <dependency groupId="junit" artifactId="junit"/>
+ <dependency groupId="org.apache.pig" artifactId="pig">
+ <exclusion groupId="xmlenc" artifactId="xmlenc"/>
+ <exclusion groupId="tomcat" artifactId="jasper-runtime"/>
+ <exclusion groupId="tomcat" artifactId="jasper-compiler"/>
+ <exclusion groupId="org.eclipse.jdt" artifactId="core"/>
+ <exclusion groupId="net.sf.kosmosfs" artifactId="kfs"/>
+ <exclusion groupId="hsqldb" artifactId="hsqldb"/>
+ <exclusion groupId="antlr" artifactId="antlr"/>
+ </dependency>
+ <!-- TODO CASSANDRA-9543
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded"/>
+ -->
+ <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
+ <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess"/>
+ <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>
+ <dependency groupId="org.apache.ant" artifactId="ant-junit" version="1.9.4" />
+ </artifact:pom>
<artifact:pom id="coverage-deps-pom"
artifactId="cassandra-coverage-deps">
@@ -570,15 +606,24 @@
</target>
<target name="maven-ant-tasks-retrieve-build" depends="maven-declare-dependencies" unless="without.maven">
+ <!-- retrieve artifacts -->
<artifact:dependencies pomRefId="build-deps-pom"
- filesetId="build-dependency-jars"
- sourcesFilesetId="build-dependency-sources"
- cacheDependencyRefs="true"
+ filesetId="build-dependency-jars"
+ cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
<remoteRepository refid="central"/>
<remoteRepository refid="apache"/>
<remoteRepository refid="java.net2"/>
</artifact:dependencies>
+ <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
+ <artifact:dependencies pomRefId="build-deps-pom-sources"
+ sourcesFilesetId="build-dependency-sources"
+ cacheDependencyRefs="true"
+ dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
+ <remoteRepository refid="central"/>
+ <remoteRepository refid="apache"/>
+ <remoteRepository refid="java.net2"/>
+ </artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="build-dependency-jars"/>
<mapper type="flatten"/>