updates to new artifactory path

c2e2f465 · Benguria Elguezabal, Gorka · f75720f8 · c2e2f465 · c2e2f465 · c2e2f465
Commit c2e2f465 authored Feb 17, 2020 by Benguria Elguezabal, Gorka
--- a/ACSmI/Discovery/eu.decideh2020.int.acsmi.backend.services.server.src.dvp/src/main/docker/settings.xml
+++ b/ACSmI/Discovery/eu.decideh2020.int.acsmi.backend.services.server.src.dvp/src/main/docker/settings.xml
@@ -199,13 +199,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
        <repository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
      </repositories>
      <pluginRepositories>
@@ -215,13 +215,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
        <pluginRepository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
      </pluginRepositories>
      <id>artifactory</id>

--- a/ACSmI/Discovery/eu.decideh2020.int.acsmi.frontend.server.src.dvp/src/main/docker/settings.xml
+++ b/ACSmI/Discovery/eu.decideh2020.int.acsmi.frontend.server.src.dvp/src/main/docker/settings.xml
@@ -199,13 +199,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
        <repository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
      </repositories>
      <pluginRepositories>
@@ -215,13 +215,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
        <pluginRepository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
      </pluginRepositories>
      <id>artifactory</id>

--- a/ACSmI/Discovery/eu.decideh2020.int.acsmi.registry.server.src.dvp/src/main/docker/settings.xml
+++ b/ACSmI/Discovery/eu.decideh2020.int.acsmi.registry.server.src.dvp/src/main/docker/settings.xml
@@ -199,13 +199,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
        <repository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
      </repositories>
      <pluginRepositories>
@@ -215,13 +215,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
        <pluginRepository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
      </pluginRepositories>
      <id>artifactory</id>

--- a/ACSmI/Discovery/eu.decideh2020.springboot.server.repo.src.dvp/src/main/docker/settings.xml
+++ b/ACSmI/Discovery/eu.decideh2020.springboot.server.repo.src.dvp/src/main/docker/settings.xml
@@ -199,13 +199,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
        <repository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
      </repositories>
      <pluginRepositories>
@@ -215,13 +215,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
        <pluginRepository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
      </pluginRepositories>
      <id>artifactory</id>

--- a/ACSmI/Monitoring/eu.decideh2020.int.acsmi.monitoring.management.server.src.dvp/src/main/docker/settings.xml
+++ b/ACSmI/Monitoring/eu.decideh2020.int.acsmi.monitoring.management.server.src.dvp/src/main/docker/settings.xml
@@ -199,13 +199,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
        <repository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
      </repositories>
      <pluginRepositories>
@@ -215,13 +215,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
        <pluginRepository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
      </pluginRepositories>
      <id>artifactory</id>

--- a/ADAPT/Monitoring/eu.decideh2020.int.adapt.monitoring.management.server.src.dvp/src/main/docker/settings.xml
+++ b/ADAPT/Monitoring/eu.decideh2020.int.adapt.monitoring.management.server.src.dvp/src/main/docker/settings.xml
@@ -199,13 +199,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
        <repository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </repository>
      </repositories>
      <pluginRepositories>
@@ -215,13 +215,13 @@ under the License.
          </snapshots>
          <id>central</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
        <pluginRepository>
          <snapshots />
          <id>snapshots</id>
          <name>${env.ARTIFACTORY_MAVEN_REPO}</name>
-          <url>https://artifact.tecnalia.com:443/${env.ARTIFACTORY_MAVEN_REPO}</url>
+          <url>${env.ARTIFACTORY_MAVEN_REPO}</url>
        </pluginRepository>
      </pluginRepositories>
      <id>artifactory</id>

--- a/DevOpsFramework/app-description-service/bin/bootstrap.yml
+++ b/DevOpsFramework/app-description-service/bin/bootstrap.yml
+spring:
+  application:
+    name: app-description-service
+
+server:
+  context-path: /appdesc
+  port: 8084
+       
+ribbon:
+  eureka:
+    enabled: true
+  ReadTimeout: 20000
+  ConnectTimeout: 20000
+    
+            
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      #defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://registry:8761/eureka/
\ No newline at end of file
--- a/DevOpsFramework/app-description-service/bin/eu/decideh2020/devopsframework/appdescription/AppDescriptionServiceApplication.class
+++ b/DevOpsFramework/app-description-service/bin/eu/decideh2020/devopsframework/appdescription/AppDescriptionServiceApplication.class
--- a/DevOpsFramework/app-description-service/bin/eu/decideh2020/devopsframework/appdescription/controller/AppDescriptionRestController.class
+++ b/DevOpsFramework/app-description-service/bin/eu/decideh2020/devopsframework/appdescription/controller/AppDescriptionRestController.class
--- a/DevOpsFramework/architect-service/bin/bootstrap.yml
+++ b/DevOpsFramework/architect-service/bin/bootstrap.yml
+spring:
+  application:
+    name: architect-service
+
+feign:
+  hystrix:
+    enabled: false
+    
+server:
+  context-path: /architect-service
+  port: 8085
+       
+ribbon:
+  eureka:
+    enabled: true
+  ReadTimeout: 20000
+  ConnectTimeout: 20000
+    
+            
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      #defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://registry:8761/eureka/
\ No newline at end of file
--- a/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/ArchitectServiceApplication.class
+++ b/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/ArchitectServiceApplication.class
--- a/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/controller/ArchitectServiceRestController.class
+++ b/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/controller/ArchitectServiceRestController.class
--- a/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/domain/NFR.class
+++ b/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/domain/NFR.class
--- a/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/domain/Page.class
+++ b/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/domain/Page.class
--- a/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/domain/Pattern.class
+++ b/DevOpsFramework/architect-service/bin/eu/decideh2020/devopsframework/architect/domain/Pattern.class
--- a/DevOpsFramework/gateway/bin/bootstrap.yml
+++ b/DevOpsFramework/gateway/bin/bootstrap.yml
+spring:
+  application:
+    name: gateway
+    
+ribbon:
+  eureka:
+    enabled: true
+  ReadTimeout: 20000
+  ConnectTimeout: 20000
+
+
+zuul:
+  ignoredServices: '*'
+  host:
+    connect-timeout-millis: 20000
+    socket-timeout-millis: 20000
+    
+  routes:
+    hello-service:
+        path: /hello/**
+        serviceId: hello-service
+        stripPrefix: false
+        sensitiveHeaders:
+        
+    jenkins-service:
+        path: /jenkins/**
+        serviceId: jenkins-service
+        stripPrefix: false
+        sensitiveHeaders:
+        
+    app-description-service:
+        path: /appdesc/**
+        serviceId: app-description-service
+        stripPrefix: false
+        sensitiveHeaders:
+        
+    architect-service:
+        path: /architect-service/**
+        serviceId: architect-service
+        stripPrefix: false
+        sensitiveHeaders:
+        
+    optimus-service:
+        path: /optimus/**
+        serviceId: optimus-service
+        stripPrefix: false
+        sensitiveHeaders:
+        
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      #defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://registry:8761/eureka/
+
+# Increase the Hystrix timeout to 60s (for jenkins , architect, and app description services)
+hystrix:
+  command:
+    architect-service:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+    jenkins-service:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+    app-description-service:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+    optimus-service:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+
+server:
+  port: 4000
+      
\ No newline at end of file
--- a/DevOpsFramework/gateway/bin/eu/decideh2020/devopsframework/gateway/DecideApplication.class
+++ b/DevOpsFramework/gateway/bin/eu/decideh2020/devopsframework/gateway/DecideApplication.class
--- a/DevOpsFramework/gateway/bin/eu/decideh2020/devopsframework/gateway/ViewController.class
+++ b/DevOpsFramework/gateway/bin/eu/decideh2020/devopsframework/gateway/ViewController.class
--- a/DevOpsFramework/gateway/bin/static/assets/css/demo.css
+++ b/DevOpsFramework/gateway/bin/static/assets/css/demo.css
+my-app .main-panel .main-content .card{
+    animation-duration: 750ms;
+    opacity: 0;
+    animation-name: fadeIn;
+    animation-fill-mode: forwards;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+@media (min-width: 992px){
+    .typo-line{
+        padding-left: 140px;
+        margin-bottom: 40px;
+        position: relative;
+    }
+
+    .typo-line .category{
+        transform: translateY(-50%);
+        top: 50%;
+        left: 0px;
+        position: absolute;
+    }
+}
+
+#map{
+    position:relative;
+    width:100%;
+    height: calc(100% - 60px);
+    margin-top: 70px;
+}
+
+.places-buttons .btn{
+    margin-bottom: 30px
+}
+
+.space-70{
+    height: 70px;
+    display: block;
+}
+
+.sidebar .nav > li.active-pro{
+    position: absolute;
+    width: 100%;
+    bottom: 10px;
+}
+@media (max-width: 991px) {
+    .sidebar .nav > li.active-pro{
+        position: relative;
+        width: 100%;
+        bottom: 10px;
+    }
+    .sidebar .nav > li.active-pro > a{
+        margin-top: 20px;
+
+    }
+}
+
+.tim-row{
+    margin-bottom: 20px;
+}
+
+.tim-typo{
+    padding-left: 25%;
+    margin-bottom: 40px;
+    position: relative;
+}
+.tim-typo .tim-note{
+    bottom: 10px;
+    color: #c0c1c2;
+    display: block;
+    font-weight: 400;
+    font-size: 13px;
+    line-height: 13px;
+    left: 0;
+    margin-left: 20px;
+    position: absolute;
+    width: 260px;
+}
+.tim-row{
+    padding-top: 50px;
+}
+.tim-row h3{
+    margin-top: 0;
+}
--- a/DevOpsFramework/gateway/bin/static/assets/img/angular2-logo-red.png
+++ b/DevOpsFramework/gateway/bin/static/assets/img/angular2-logo-red.png