Release v1.2.0

devhub-tud · Jan 19, 2016 · dc02ac1 · dc02ac1
1 parent d8e9a72
commit dc02ac1
Show file tree

Hide file tree

Showing 11 changed files with 178 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
 language: java
 jdk:
   - oraclejdk8
+after_success:
+  - mvn clean test jacoco:report coveralls:report versioneye:update
diff --git a/README.md b/README.md
@@ -1,3 +1,7 @@
+[![Stories in Ready](https://badge.waffle.io/devhub-tud/devhub.png?label=ready&title=Ready)](https://waffle.io/devhub-tud/devhub)
+[![Build Status](https://travis-ci.org/devhub-tud/build-server.svg?branch=master)](https://travis-ci.org/devhub-tud/build-server)
+[![Coverage Status](https://coveralls.io/repos/github/devhub-tud/build-server/badge.svg?branch=master)](https://coveralls.io/github/devhub-tud/build-server?branch=master)
+[![Dependency Status](https://www.versioneye.com/user/projects/569e8ac3ec6e6a000e1bb98e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/569e8ac3ec6e6a000e1bb98e)
 DevHub Build-server
 ======
 DevHub is a software system designed to give students a simple practical introduction into modern software development. It provides an environment in which they can work on practical assignments without setting up their own (private) code repository or a Continuous Integration server. The environment is also designed to give students a working simple workflow largely based on GitHub's pull requests system. 

diff --git a/build-client/pom.xml b/build-client/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>nl.tudelft.ewi.build</groupId>
 		<artifactId>build-server-parent</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<dependencies>
@@ -33,7 +33,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.6</version>
 				<configuration>
 					<useDefaultManifestFile>true</useDefaultManifestFile>
 				</configuration>

diff --git a/build-client/src/main/resources/versioneye.properties b/build-client/src/main/resources/versioneye.properties
@@ -0,0 +1,3 @@
+# Properties for http://www.VersionEye.com
+#Tue Jan 19 20:09:47 CET 2016
+project_id=569e8ac8ec6e6a000e1bb9e9
diff --git a/build-models/pom.xml b/build-models/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>nl.tudelft.ewi.build</groupId>
     <artifactId>build-server-parent</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <artifactId>build-models</artifactId>
 </project>
diff --git a/build-models/src/main/resources/versioneye.properties b/build-models/src/main/resources/versioneye.properties
@@ -0,0 +1,3 @@
+# Properties for http://www.VersionEye.com
+#Tue Jan 19 20:09:43 CET 2016
+project_id=569e8ac4ec6e6a000e1bb9bd
diff --git a/build-server/pom.xml b/build-server/pom.xml
@@ -7,14 +7,10 @@
 	<parent>
 		<groupId>nl.tudelft.ewi.build</groupId>
 		<artifactId>build-server-parent</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.2.0</version>
 		<relativePath>../</relativePath>
 	</parent>
 
-	<properties>
-		<jetty.version>9.1.1.v20140108</jetty.version>
-	</properties>
-
 	<dependencies>
 		<!-- Web -->
 		<dependency>
@@ -29,21 +25,25 @@
 		</dependency>
 
 		<!-- Utilities -->
-
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.9.10</version>
+		</dependency>
 		<dependency>
 		  <groupId>com.spotify</groupId>
 		  <artifactId>docker-client</artifactId>
-		  <version>2.7.19</version>
+		  <version>3.5.9</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
-			<version>3.2.0.201312181205-r</version>
+			<version>4.1.1.201511131810-r</version>
 		</dependency>
 		<dependency>
 			<groupId>nl.tudelft.ewi.build</groupId>
 			<artifactId>build-models</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.xeustechnologies</groupId>
@@ -75,34 +75,10 @@
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<annotationProcessors>
-						<annotationProcessor>lombok.core.AnnotationProcessor</annotationProcessor>
-					</annotationProcessors>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>nl.tudelft.ewi.build.BuildServer</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.6</version>
 				<configuration>
 					<descriptors>
 						<descriptor>
@@ -123,7 +99,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.6</version>
 				<configuration>
 					<archive>
 						<manifest>

diff --git a/build-server/src/main/java/nl/tudelft/ewi/build/builds/BuildManager.java b/build-server/src/main/java/nl/tudelft/ewi/build/builds/BuildManager.java
@@ -271,6 +271,7 @@ public ContainerExit call() throws Exception {
 			ContainerConfig.Builder configBuilder = ContainerConfig.builder()
 					.image(buildInstructionInterpreter.getImage(buildInstruction))
 					.cmd(buildInstructionInterpreter.getCommand(buildInstruction).split(" "))
+					.hostConfig(HostConfig.builder().binds(volume).build())
 					.user(config.getDockerUser())
 					.volumes(volume)
 					.workingDir(WORK_DIR);
@@ -283,7 +284,7 @@ public ContainerExit call() throws Exception {
 				id = creation.id();
 				containerId.set(id);
 				log.info("Starting container {}", id);
-				dockerClient.startContainer(id, HostConfig.builder().binds(volume).build());
+				dockerClient.startContainer(id);
 			}
 			catch (DockerException | InterruptedException e) {
 				logger.println("[FATAL] Failed to provision build environment");

diff --git a/build-server/src/main/resources/versioneye.properties b/build-server/src/main/resources/versioneye.properties
@@ -0,0 +1,3 @@
+# Properties for http://www.VersionEye.com
+#Tue Jan 19 20:09:45 CET 2016
+project_id=569e8ac6ec6e6a000a1b4cd5
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.tudelft.ewi.build</groupId>
 	<artifactId>build-server-parent</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.2.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -12,19 +12,56 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<guice.version>3.0</guice.version>
-		<hibernate.version>4.2.7.Final</hibernate.version>
-		<jackson.version>2.3.0</jackson.version>
-		<resteasy.version>3.0.4.Final</resteasy.version>
-		<slf4j.version>1.7.5</slf4j.version>
+		<guice.version>[3.0,)</guice.version>
+		<jackson.version>2.6.3</jackson.version>
+		<jetty.version>9.3.7.v20160115</jetty.version>
+		<resteasy.version>3.0.14.Final</resteasy.version>
+		<slf4j.version>1.7.13</slf4j.version>
+		<lombok.version>1.16.6</lombok.version>
+		<guava.version>19.0</guava.version>
+		<jacoco.version>0.7.5.201505241946</jacoco.version>
 	</properties>
 
-        <distributionManagement>
-                <repository>
-                        <id>devhub</id>
-                        <url>https://devhub.ewi.tudelft.nl/nexus/content/repositories/releases/</url>
-                </repository>
-        </distributionManagement>
+	<description>A private docker-based build server.</description>
+
+	<organization>
+		<name>TU Delft</name>
+		<url>http://ewi.tudelft.nl</url>
+	</organization>
+
+	<scm>
+		<connection>scm:git:git@github.com:devhub-tud/build-server.git</connection>
+		<developerConnection>scm:git:git@github.com:devhub-tud/build-server</developerConnection>
+		<url>https://github.com/devhub-tud/build-server</url>
+		<tag>HEAD</tag>
+	</scm>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>A business-friendly OSS license</comments>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<name>Michael de Jong</name>
+			<email>M.deJong-2@student.tudelft.nl</email>
+		</developer>
+		<developer>
+			<name>Jan-Willem Gmelig Meyling</name>
+			<email>j.gmeligmeyling@student.tudelft.nl</email>
+		</developer>
+	</developers>
+
+	<distributionManagement>
+			<repository>
+					<id>devhub</id>
+					<url>https://devhub.ewi.tudelft.nl/nexus/content/repositories/releases/</url>
+			</repository>
+	</distributionManagement>
 
 	<dependencies>
 		<!-- Web -->
@@ -66,7 +103,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.0.13</version>
+			<version>1.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -89,34 +126,119 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.9.5</version>
+			<version>1.10.19</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- Utilities -->
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.8</version>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.14.8</version>
+			<version>${lombok.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>15.0</version>
+			<version>${guava.version}</version>
 		</dependency>
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.versioneye</groupId>
+				<artifactId>versioneye-maven-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<apiKey>3d8f08d518ddab52c31a</apiKey>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eluder.coveralls</groupId>
+				<artifactId>coveralls-maven-plugin</artifactId>
+				<version>4.1.0</version>
+				<configuration>
+					<repoToken>uVFTYgNsdNZN6VkyzR96JiljINE55Joar</repoToken>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco.version}</version>
+				<executions>
+					<execution>
+						<id>prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.8.1</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.3</version>
+				<configuration>
+					<failOnError>false</failOnError>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<id>default</id>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<configuration>
+					<linkJavadoc>true</linkJavadoc>
+				</configuration>
+				<version>2.5</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>3.0.3</version>
+			</plugin>
+
+			<plugin> <!-- JUnit report -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.19.1</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco.version}</version>
+			</plugin>
+
+		</plugins>
+	</reporting>
+
 	<modules>
 		<module>build-server</module>
 		<module>build-models</module>

diff --git a/src/main/resources/versioneye.properties b/src/main/resources/versioneye.properties
@@ -0,0 +1,3 @@
+# Properties for http://www.VersionEye.com
+#Tue Jan 19 20:09:41 CET 2016
+project_id=569e8ac3ec6e6a000e1bb98e