Skip to content

Commit

Permalink
Merge branch 'Markust push origin masterKull-shaded'
Browse files Browse the repository at this point in the history
  • Loading branch information
jsevellec committed May 8, 2015
2 parents d43797a + eec2260 commit baf45ce
Show file tree
Hide file tree
Showing 18 changed files with 391 additions and 128 deletions.
4 changes: 4 additions & 0 deletions cassandra-unit-shaded/LICENSE.txt
@@ -0,0 +1,4 @@
The sourcecode of cassandra-unit-shaded consists solely of the pom. The pom itself is licensed as CC0 (Public Domain, http://creativecommons.org/publicdomain/zero/1.0/).

Any shaded libraries contained in the binary jar retain their original open source license, most times the apache license 2.0.

127 changes: 127 additions & 0 deletions cassandra-unit-shaded/pom.xml
@@ -0,0 +1,127 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit-parent</artifactId>
<version>2.1.3.2-SNAPSHOT</version>
</parent>

<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit-shaded</artifactId>
<version>2.1.3.2-SNAPSHOT</version>
<name>cassandra-unit-shaded</name>
<packaging>jar</packaging>
<description>
cassandra-unit with some shaded dependencies to avoid known version clashes.

Make sure to depend on cassandra-unit-shaded in test-scope only, else
your generated artefact will contain a lot of unneeded dependencies.

cassandra-unit-shaded is a replacement for cassandra-unit only, not also
for cassandra-unit-spring. If you want to use both -shaded and
-spring, then exclude cassandra-unit out of the imported dependencies
of cassandra-unit-spring.
</description>

<properties>
<shade.prefix>org.cassandraunit.shaded</shade.prefix>
</properties>

<dependencies>
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
<version>2.1.3.2-SNAPSHOT</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<minimizeJar>false</minimizeJar>
<dependencyReducedPomLocation>${basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>

<artifactSet>
<includes>
<!-- included only to suppress dependency, not relocated -->
<include>org.cassandraunit:cassandra-unit</include>

<!-- included due to relocated sub-dependencies, but itself not relocated because Class.forName -->
<include>org.apache.cassandra:cassandra-all</include>

<!-- included and relocated due to clash between hector and cassandra itself -->
<include>org.apache.cassandra:cassandra-thrift</include>

<!-- included and relocated due to potential clashes, especially guava -->
<include>com.google.guava:guava</include>
<include>org.antlr:*</include>
<include>org.codehaus.jackson:*</include>
<include>com.yammer.metrics:metrics-core</include>
<include>com.addthis.metrics:*</include>
<include>io.netty:*</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.apache.cassandra.thrift</pattern>
<shadedPattern>${shade.prefix}.org.apache.cassandra.thrift</shadedPattern>
</relocation>
<relocation><!-- guava. With Trailing dot else com.googlecode would also match -->
<pattern>com.google.</pattern>
<shadedPattern>${shade.prefix}.com.google.</shadedPattern>
</relocation>
<relocation>
<pattern>org.antlr</pattern>
<shadedPattern>${shade.prefix}.org.antlr</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus.jackson</pattern>
<shadedPattern>${shade.prefix}.org.codehaus.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>com.yammer.metrics</pattern>
<shadedPattern>${shade.prefix}.com.yammer.metrics</shadedPattern>
</relocation>
<relocation>
<pattern>com.addthis.metrics</pattern>
<shadedPattern>${shade.prefix}.com.addthis.metrics</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>${shade.prefix}.io.netty</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <!-- http://stackoverflow.com/questions/8880361/superfluous-warnings-when-using-maven-shade-plugin -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<forceCreation>true</forceCreation>
</configuration>
</plugin>
</plugins>
</build>
</project>
123 changes: 102 additions & 21 deletions cassandra-unit-spring/pom.xml
Expand Up @@ -5,10 +5,12 @@
<artifactId>cassandra-unit-parent</artifactId>
<version>2.1.3.2-SNAPSHOT</version>
</parent>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit-spring</artifactId>
<packaging>jar</packaging>
<name>cassandra-unit-spring</name>
<description>Spring Test framework to develop with Cassandra</description>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -68,28 +70,107 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${cu.spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${cu.spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- hamcrest could be moved to the test-scope. But as the examples do not declare hamcrest-deps in their pom,
better leave them in compile-scope -->
<dependency> <!-- dont mix self-contained hamcrest-all and hamcrest-submodules -->
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${cu.hamcrest.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${cu.hamcrest.version}</version>
</dependency>

<!-- optional clients. The app defines which one to use and in which version -->
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${cu.cassandra.driver.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hectorclient</groupId>
<artifactId>hector-core</artifactId>
<version>${cu.hector.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion> <!-- using the version of cassandra-unit -->
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-thrift</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- log -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${cu.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${cu.slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${cu.slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>test</scope>
</dependency>

</dependencies>
</project>

0 comments on commit baf45ce

Please sign in to comment.