This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cassandra-diff.git
The following commit(s) were added to refs/heads/master by this push: new 9c55826 publish a separate uberjar with the spark job and guava relocated (#5) 9c55826 is described below commit 9c558265c25e855043e8e6b5c8ac5d5aca58ba06 Author: Marcus Eriksson <marc...@apache.org> AuthorDate: Mon Jan 13 13:24:51 2020 +0100 publish a separate uberjar with the spark job and guava relocated (#5) --- README.md | 4 ++-- api-server/pom.xml | 2 +- common/pom.xml | 4 ++-- pom.xml | 3 ++- spark-job/pom.xml | 32 +------------------------------- {spark-job => spark-uberjar}/pom.xml | 31 +++++-------------------------- 6 files changed, 13 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index c79e17d..5fab877 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ $ docker run --name cas-src -d -p 9042:9042 cassandra:3.0.18 $ docker run --name cas-tgt -d -p 9043:9042 cassandra:latest $ docker exec cas-src cassandra-stress write n=1k $ docker exec cas-tgt cassandra-stress write n=1k -$ spark-submit --verbose --files ./spark-job/localconfig.yaml --class org.apache.cassandra.diff.DiffJob spark-job/target/spark-job-0.1-SNAPSHOT.jar localconfig.yaml +$ spark-submit --verbose --files ./spark-job/localconfig.yaml --class org.apache.cassandra.diff.DiffJob spark-uberjar/target/spark-uberjar-0.2-SNAPSHOT.jar localconfig.yaml # ... logs INFO DiffJob:124 - FINISHED: {standard1=Matched Partitions - 1000, Mismatched Partitions - 0, Partition Errors - 0, Partitions Only In Source - 0, Partitions Only In Target - 0, Skipped Partitions - 0, Matched Rows - 1000, Matched Values - 6000, Mismatched Values - 0 } ## start api-server: @@ -138,4 +138,4 @@ $ mvn release:prepare 6. Stage the release for a vote ```shell script $ mvn release:perform - ``` \ No newline at end of file + ``` diff --git a/api-server/pom.xml b/api-server/pom.xml index ab431da..4c67ed1 100644 --- a/api-server/pom.xml +++ b/api-server/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.cassandra.diff</groupId> <artifactId>diff</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/common/pom.xml b/common/pom.xml index f73c4f5..a25cd10 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.cassandra.diff</groupId> <artifactId>diff</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -51,4 +51,4 @@ </dependencies> -</project> \ No newline at end of file +</project> diff --git a/pom.xml b/pom.xml index 16b35b7..82bbf69 100644 --- a/pom.xml +++ b/pom.xml @@ -31,11 +31,12 @@ <groupId>org.apache.cassandra.diff</groupId> <artifactId>diff</artifactId> <packaging>pom</packaging> - <version>0.1-SNAPSHOT</version> + <version>0.2-SNAPSHOT</version> <modules> <module>common</module> <module>spark-job</module> <module>api-server</module> + <module>spark-uberjar</module> </modules> <scm> diff --git a/spark-job/pom.xml b/spark-job/pom.xml index 4d4c8fc..c7df5bd 100644 --- a/spark-job/pom.xml +++ b/spark-job/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.cassandra.diff</groupId> <artifactId>diff</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -68,34 +68,4 @@ </dependency> </dependencies> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.2.1</version> - <executions> - <!-- Run shade goal on package phase --> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <relocations> - <relocation> - <pattern>com.google</pattern> - <shadedPattern>relocated.com.google</shadedPattern> - </relocation> - </relocations> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/spark-job/pom.xml b/spark-uberjar/pom.xml similarity index 76% copy from spark-job/pom.xml copy to spark-uberjar/pom.xml index 4d4c8fc..6bb31d7 100644 --- a/spark-job/pom.xml +++ b/spark-uberjar/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.apache.cassandra.diff</groupId> <artifactId>diff</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>spark-job</artifactId> + <artifactId>spark-uberjar</artifactId> <packaging>jar</packaging> <dependencies> @@ -41,32 +41,11 @@ <version>${project.parent.version}</version> </dependency> - <!-- provided dependencies --> <dependency> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.11</artifactId> - <version>2.3.3</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.11</artifactId> - <version>2.3.2</version> - <scope>provided</scope> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.cassandra.diff</groupId> + <artifactId>spark-job</artifactId> + <version>${project.parent.version}</version> </dependency> - </dependencies> <build> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org