From dc3c12bfe468298175dab026bd93bace063f8130 Mon Sep 17 00:00:00 2001 From: nmenetrier Date: Thu, 20 Jul 2017 15:06:49 +0200 Subject: [PATCH 1/2] Removed unused package: ingest-internal-common --- .../ingest-internal-common/pom.xml | 31 ------------------- .../internal/common/util/package-info.java | 30 ------------------ .../src/test/resources/logback-test.xml | 16 ---------- .../src/test/resources/server-identity.conf | 3 -- .../ingest-internal-rest/pom.xml | 5 --- sources/ingest/ingest-internal/pom.xml | 1 - 6 files changed, 86 deletions(-) delete mode 100644 sources/ingest/ingest-internal/ingest-internal-common/pom.xml delete mode 100644 sources/ingest/ingest-internal/ingest-internal-common/src/main/java/fr/gouv/vitam/ingest/internal/common/util/package-info.java delete mode 100644 sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/logback-test.xml delete mode 100644 sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/server-identity.conf diff --git a/sources/ingest/ingest-internal/ingest-internal-common/pom.xml b/sources/ingest/ingest-internal/ingest-internal-common/pom.xml deleted file mode 100644 index 2772f71c7a7..00000000000 --- a/sources/ingest/ingest-internal/ingest-internal-common/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - fr.gouv.vitam - ingest-internal - 0.20.0 - - - ingest-internal-common - - - - fr.gouv.vitam - common-public - ${project.version} - - - fr.gouv.vitam - logbook-common - ${project.version} - - - junit - junit - test - - - - diff --git a/sources/ingest/ingest-internal/ingest-internal-common/src/main/java/fr/gouv/vitam/ingest/internal/common/util/package-info.java b/sources/ingest/ingest-internal/ingest-internal-common/src/main/java/fr/gouv/vitam/ingest/internal/common/util/package-info.java deleted file mode 100644 index 6a4cf2e0d22..00000000000 --- a/sources/ingest/ingest-internal/ingest-internal-common/src/main/java/fr/gouv/vitam/ingest/internal/common/util/package-info.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2015-2019) - * - * contact.vitam@culture.gouv.fr - * - * This software is a computer program whose purpose is to implement a digital archiving back-office system managing - * high volumetry securely and efficiently. - * - * This software is governed by the CeCILL 2.1 license under French law and abiding by the rules of distribution of free - * software. You can use, modify and/ or redistribute the software under the terms of the CeCILL 2.1 license as - * circulated by CEA, CNRS and INRIA at the following URL "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, - * users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the - * successive licensors have only limited liability. - * - * In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or - * developing or reproducing the software by the user in light of its specific status of free software, that may mean - * that it is complicated to manipulate, and that also therefore means that it is reserved for developers and - * experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the - * software's suitability as regards their requirements in conditions enabling the security of their systems and/or data - * to be ensured and, more generally, to use and operate it in the same conditions as regards security. - * - * The fact that you are presently reading this means that you have had knowledge of the CeCILL 2.1 license and that you - * accept its terms. - *******************************************************************************/ -/** - * Provides Ingest Internal common utility classes - */ -package fr.gouv.vitam.ingest.internal.common.util; 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 deleted file mode 100644 index 45f42b544d9..00000000000 --- a/sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/logback-test.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - %d{ISO8601} [%thread] %-5level %logger - %replace(%caller{1..2}){'Caller\+1 at |\n',''} : %msg %rootException{5}%n - - - - - - - - \ No newline at end of file diff --git a/sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/server-identity.conf b/sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/server-identity.conf deleted file mode 100644 index f92b05af38a..00000000000 --- a/sources/ingest/ingest-internal/ingest-internal-common/src/test/resources/server-identity.conf +++ /dev/null @@ -1,3 +0,0 @@ -identityName: name1 -identityRole: role1 -identityPlatformId: 1 diff --git a/sources/ingest/ingest-internal/ingest-internal-rest/pom.xml b/sources/ingest/ingest-internal/ingest-internal-rest/pom.xml index cccb3a5c5c3..791a56c8a8e 100644 --- a/sources/ingest/ingest-internal/ingest-internal-rest/pom.xml +++ b/sources/ingest/ingest-internal/ingest-internal-rest/pom.xml @@ -146,11 +146,6 @@ storage-engine-client ${project.version} - - fr.gouv.vitam - ingest-internal-common - ${project.version} - fr.gouv.vitam ingest-internal-api diff --git a/sources/ingest/ingest-internal/pom.xml b/sources/ingest/ingest-internal/pom.xml index b7aab01aefa..f68ba385253 100644 --- a/sources/ingest/ingest-internal/pom.xml +++ b/sources/ingest/ingest-internal/pom.xml @@ -13,7 +13,6 @@ pom - ingest-internal-common ingest-internal-api ingest-internal-rest ingest-internal-client From d2fcc149bbb78d735830915e1998b266c511e98d Mon Sep 17 00:00:00 2001 From: nmenetrier Date: Thu, 20 Jul 2017 15:33:01 +0200 Subject: [PATCH 2/2] Fixed siegfried build for debian --- deb/vitam-product/build-siegfried.sh | 2 +- dev-deployment/dev-base/Dockerfile-deb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/deb/vitam-product/build-siegfried.sh b/deb/vitam-product/build-siegfried.sh index 972545714d6..606eda65181 100755 --- 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 index f2aaafdeb44..669754ef7aa 100644 --- 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