Merge branch 'fix_ingest_internal_common' into 'release_iteration_20'

Fix ingest internal common See merge request !2688
ProgrammeVitam · Jul 20, 2017 · 72641dd · 72641dd
2 parents 75b9d31 + d2fcc14
commit 72641dd
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 88 deletions.
diff --git a/deb/vitam-product/build-siegfried.sh b/deb/vitam-product/build-siegfried.sh
@@ -2,7 +2,7 @@
 
 SIEGFRIED_VERSION="1.6.5"
 WORKING_FOLDER=$(dirname $0)
-GO_PROGRAM="/usr/lib/go-1.6/bin/go"
+GO_PROGRAM="go"
 #GO_PROGRAM="/usr/bin/go"
 
 # Inspired by RPM build script as dh-make-golang seems to have vendors dependencies issues since go 1.6

diff --git a/dev-deployment/dev-base/Dockerfile-deb b/dev-deployment/dev-base/Dockerfile-deb
@@ -83,6 +83,9 @@ RUN curl http://wwwftp.ciril.fr/pub/apache/maven/maven-3/3.3.9/binaries/apache-m
 ENV M2_HOME /opt/maven
 ENV PATH ${M2_HOME}/bin:${JAVA_HOME}/bin:${PATH}
 
+# Add golang-1.6 to PATH
+ENV PATH ${PATH}:/usr/lib/go-1.6/bin
+
 ################################  Install ansible  ###############################
 # for sudo in automatic deployment ; note : ansible needs epel repo
 
@@ -93,7 +96,7 @@ RUN apt-get update && apt-get install -y sudo net-tools \
 # Editor & unzip
 RUN apt-get install -y vim unzip wget
 
-RUN apt-get install -y golang golang-1.6 
+RUN apt-get install -y golang-1.6
 
 #RUN apt-get install -y -t jessie-backports node-gyp nodejs-dev libssl1.0.0
 

diff --git a/sources/ingest/ingest-internal/ingest-internal-common/pom.xml b/sources/ingest/ingest-internal/ingest-internal-common/pom.xml
diff --git a/...internal-common/src/main/java/fr/gouv/vitam/ingest/internal/common/util/package-info.java b/...internal-common/src/main/java/fr/gouv/vitam/ingest/internal/common/util/package-info.java
diff --git a/sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/logback-test.xml b/sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/logback-test.xml
diff --git a/...ces/ingest/ingest-internal/ingest-internal-common/src/test/resources/server-identity.conf b/...ces/ingest/ingest-internal/ingest-internal-common/src/test/resources/server-identity.conf
diff --git a/sources/ingest/ingest-internal/ingest-internal-rest/pom.xml b/sources/ingest/ingest-internal/ingest-internal-rest/pom.xml
@@ -146,11 +146,6 @@
         <artifactId>storage-engine-client</artifactId>
         <version>${project.version}</version>
     </dependency>
-    <dependency>
-        <groupId>fr.gouv.vitam</groupId>
-        <artifactId>ingest-internal-common</artifactId>
-        <version>${project.version}</version>
-    </dependency>
     <dependency>
         <groupId>fr.gouv.vitam</groupId>
         <artifactId>ingest-internal-api</artifactId>

diff --git a/sources/ingest/ingest-internal/pom.xml b/sources/ingest/ingest-internal/pom.xml
@@ -13,7 +13,6 @@
     <packaging>pom</packaging>
 
     <modules>
-      	<module>ingest-internal-common</module>
         <module>ingest-internal-api</module>
         <module>ingest-internal-rest</module>
         <module>ingest-internal-client</module>