Merge branch 'master' into sonarcloud

Conflicts: .travis.yml com.examples.school/com.examples.school clean package.launch com.examples.school/com.examples.school clean verify.launch com.examples.school/pom.xml
LorenzoBettini · Nov 16, 2017 · 8be1821 · 8be1821
2 parents f0e8c29 + 0ccd062
commit 8be1821
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 159 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,4 +25,4 @@ install:
 
 script:
  - mvn -f com.examples.school/pom.xml jacoco:prepare-agent test jacoco:prepare-agent-integration verify jacoco:report jacoco:report-integration sonar:sonar coveralls:report
-
+ - mvn -f com.examples.school/pom.xml verify -Pdocker-compose
diff --git a/com.examples.school/.dockerignore b/com.examples.school/.dockerignore
diff --git a/com.examples.school/launches/com.examples.school clean package.launch b/com.examples.school/launches/com.examples.school clean package.launch
@@ -12,6 +12,5 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="bad_container_name" value="/com.examples.school clean package"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.examples.school.mongo}"/>
 </launchConfiguration>
diff --git a/com.examples.school/launches/com.examples.school clean verify.launch b/com.examples.school/launches/com.examples.school clean verify.launch
@@ -12,6 +12,5 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="bad_container_name" value="/com.examples.school clean verify"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.examples.school.mongo}"/>
 </launchConfiguration>
diff --git a/com.examples.school/launches/com.examples.school verify (docker-compose).launch b/com.examples.school/launches/com.examples.school verify (docker-compose).launch
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="verify"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="docker-compose"/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.examples.school.mongo}"/>
+</launchConfiguration>