V2 final

.travis.yml

@@ -44,3 +44,4 @@ notifications:
   slack:
     rooms:
       secure: N6FrJ0l0gw2t1wnty/xPDKvLBZlzOAmkIbHjd4ZrtaC4vLU8iZP+YCRvQd7Vwzc97yDhHIZ41eGtjHjBIIeMX/3rfuS+6GA4VJgyNFGsP0f81YYHxiMOEUlVa2O6LBwbF3LokaFi3l7Iau1c5Op9c3LinhTdE0W6KG+2gxEqSKJkBcVJfK9SZGXg3+6qlq065BWx7xWlzoWgMFyipJJLW1BAqEzP5cc6hHozJ5H/8ucMaJbWQF+nOaIYUJdaop4ChSpe6EFyg0XNp+mIjJ2BxZ6hfYrAs69vwBapBepe4zEoR5xdN1dGUAIDqNY9rr4Npp8InFmBmnlL1xG6FeG73C2qfSr3Y2WziOtwececzmuQWI2Do9ioB5k0KtC4UAV42tpADUODrrwxE8S32tqgr0Pojg8FvgsM6O3twvF1UH3LLEyW7zDzuDpYdtvIROWZGerxyWqQIFI7MzragyL+ZiKKUOG1uKsA8DoeECcMHuUsDEsR/mHalmQGGl2ZNGpphAHg/1HtjB32VDCIuZpFHsqFG7BfMY2dg8Mm+ea4j9imOxM+2TFxbPhoIjIJq1o+/YvolrYviWgmQOpeFw0c1xXWSL5aXmBv2nUnlBaXxfzC9FTl0xmovJmKeYhqJ81TMa33gimsMeccZIDmzcMDsW82idsvtHeNDSX1wil5DXA=
+

Dockerfile

@@ -1,10 +1,10 @@
 FROM openjdk:11
 
 MAINTAINER Cedrick Lunven <cedrick.lunven@datastax.com>
-MAINTAINER Davig Gilardi  <david.gilardi@datastax.com>
+MAINTAINER David Gilardi  <david.gilardi@datastax.com>
 
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/killrvideo-java.jar"]
 EXPOSE 50101
 
 # To create jar file, run `docker run -v ${PWD}:/opt/killrvideo-java -w /opt/killrvideo-java maven mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B`
-COPY ./killrvideo-services/target/killrvideo-java.jar /killrvideo-java.jar
+COPY ./killrvideo-services/target/killrvideo-java.jar /killrvideo-java.jar

README.md

@@ -7,18 +7,6 @@
 A reference application for Java developers looking to learn more about using [Apache Cassandra][cassandra] and
 [DataStax Enterprise][dse] in their applications and services. Learn more at [Killrvideo].
 
-## The latest stable build of KillrVideo Java is [v2.1.0][v2.1.0]. Master is experimental. Please use v2.1.0 if you attempting to follow the instructions in the links below.
-
-## Building Locally
-
-**Docker Way**
-
-`docker run -v ${PWD}:/opt/killrvideo-java -w /opt/killrvideo-java maven mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B`
-
-**Maven Way**
-
-`mvn install`
-
 ## Running Locally
 
 Use these guides to get started running KillrVideo locally on your development machine:
@@ -35,7 +23,7 @@ that you don't see in the code currently, send me a message [@SonicDMG][twitter]
 [here][issues] on GitHub.
 
 ## License
-Copyright 2018 David Gilardi, Cedrick Lunven, derived from original work by Duy Hai Doan
+Copyright 2018 David Gilardi, Cedrick Lunven, Aleksandr Volochnev derived from original work by Duy Hai Doan
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

docker-compose.ci.yml

@@ -19,6 +19,6 @@ services:
       memlock: -1
 
   dse-config: 
-    image: killrvideo/killrvideo-dse-config:3.0.0
+    image: killrvideo/killrvideo-dse-config:3
     depends_on:
       - dse

docker-compose.yml

@@ -1,20 +1,9 @@
 version: '3'
 
-#
-# docker-compose.yaml
-#   Simple compose file for running the Java services in Docker along with other containers comprising the
-#   KillrVideo.
-#   For more complex configuration options including metrics, external volumes, OpsCenter,
-#   etc., see https://github.com/KillrVideo/killrvideo-docker-common
-#
-#   Note: the default configuration here uses the LATEST version of the killrvideo-python
-#   Docker image, which can be built using scripts/docker_build.sh.
-#
-
 services:
 
   web: # Web Interface
-    image: killrvideo/killrvideo-web:3.0.1
+    image: killrvideo/killrvideo-web:3
     ports:
       - "3000:3000" # Exposes port to be available externally
     depends_on:
@@ -60,14 +49,14 @@ services:
 
   # One-Time Bootstrap Container, configures DSE to have required keyspaces etc.
   dse-config: 
-    image: killrvideo/killrvideo-dse-config:3.0.0
+    image: killrvideo/killrvideo-dse-config:3
     depends_on:
       - dse # Needs DSE to be running
 
   # Sample Data Generator, imitates behaviour of users on the killrVideo website. 
   # Adds comments and rates videos, upload new videos and so on.
   generator: 
-    image: killrvideo/killrvideo-generator:3.0.2
+    image: killrvideo/killrvideo-generator:3
     depends_on:
       - backend # Needs Backend to be running
     environment:

killrvideo-commons/pom.xml

@@ -11,71 +11,67 @@
 	<parent>
 		<groupId>com.datastax</groupId>
 		<artifactId>killrvideo-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.1.0</version>
 	</parent>
 
 	<dependencies>
 
-		<!-- Spring, inversion of control -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
-
-		<!-- Logging -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
 		</dependency>
+
+		<!-- Cassandra Driver -->
 		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-		</dependency>
-
-		<!-- Java driver for DSE -->
-		<dependency>
-			<groupId>com.datastax.dse</groupId>
-			<artifactId>dse-java-driver-core</artifactId>
+			<groupId>com.datastax.oss</groupId>
+			<artifactId>java-driver-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.datastax.dse</groupId>
-			<artifactId>dse-java-driver-mapping</artifactId>
+			<groupId>com.datastax.oss</groupId>
+			<artifactId>java-driver-query-builder</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.datastax.dse</groupId>
-			<artifactId>dse-java-driver-extras</artifactId>
+			<groupId>com.datastax.oss</groupId>
+			<artifactId>java-driver-mapper-runtime</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>com.datastax.dse</groupId>
-			<artifactId>dse-java-driver-graph</artifactId>
+		   <groupId>com.evanlennick</groupId>
+		   <artifactId>retry4j</artifactId>
 		</dependency>
-		
-		<!--  Service Discovery -->
+
+		<!-- Spring, inversion of control -->
 		<dependency>
-			<groupId>com.xqbase</groupId>
-			<artifactId>etcd4j</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
 		</dependency>
 
-		<!--  Retry until ETCD and DSE are ready. -->
 		<dependency>
-			<groupId>com.evanlennick</groupId>
-			<artifactId>retry4j</artifactId>
+		 <groupId>commons-codec</groupId>
+		 <artifactId>commons-codec</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
 		<dependency>
-        	<groupId>javax.annotation</groupId>
-        	<artifactId>javax.annotation-api</artifactId>
-    	</dependency>  
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
+			<exclusions>
+				<exclusion>
+                	<groupId>org.openjfx</groupId>
+    				<artifactId>javafx.base</artifactId>
+            	</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish</groupId>
@@ -85,17 +81,17 @@
 			<groupId>javax.el</groupId>
 			<artifactId>javax.el-api</artifactId>
 		</dependency>
-		
+
 		<!-- Generate Common types -->
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
 		</dependency>
 		<dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-all</artifactId>
-        </dependency>
-		
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-all</artifactId>
+		</dependency>
+
 		<!-- Transport Kafka -->
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
@@ -112,84 +108,6 @@
 			<artifactId>guava</artifactId>
 		</dependency>
 
-		<!-- Junit5 + Spring -->
-		<dependency>
-			<groupId>org.junit.platform</groupId>
-			<artifactId>junit-platform-launcher</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.platform</groupId>
-			<artifactId>junit-platform-runner</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.platform</groupId>
-			<artifactId>junit-platform-console-standalone</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-params</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 
-	<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-    <!-- ~ BUILD : Generate Common types in PROTO  ~ -->
-    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-	<build>
-		<plugins> 
-
-			<!-- Add GRPC Sources -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>${build-helper-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>target/generated-sources/protobuf/java</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- Generate Protobuf data -->
-			<plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <version>${protobuf-maven-plugin.version}</version>
-                <configuration>
-                    <protoSourceRoot>${basedir}/src/main/resources/proto</protoSourceRoot>
-                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-                    <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
-                </configuration>
-				<executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>compile-custom</goal>
-                        </goals>
-                    </execution>
-                </executions>
-             </plugin>
-
-		</plugins>
-	</build>
-
-
 </project>