release: 2.6.2

Author: jvanmalder

JenkinsfileSCM

@@ -65,9 +65,19 @@ pipeline {
     }
     stage('tests') {
       steps {
-          configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
-            sh "mvn -s $MAVEN_SETTINGS_RSB clean deploy -Ddependency-check.skip=true"
+        configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+          script {
+            echo "working on branch ${env.BRANCH_NAME}"
+            if (env.BRANCH_NAME.startsWith('release/') || env.BRANCH_NAME.startsWith('PR-')) {
+              sh "mvn -s $MAVEN_SETTINGS_RSB clean install -Ddependency-check.skip=true"
+            } else {
+              sh "mvn -s $MAVEN_SETTINGS_RSB clean deploy -Ddependency-check.skip=true"
+            }
           }
+        }
+      }
+      post {
+        always {
           publishHTML([
             reportDir: 'rdepot-app/target/site/', reportFiles: 'failsafe-report.html',
             reportName: 'Integration Test / App Test Report',
@@ -88,6 +98,7 @@ pipeline {
             reportDir: 'target/', reportFiles: 'dependency-check-report.html',
             reportName: 'OWASP Dependency Analysis Report',
             allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true])
+        }
       }
     }
     stage('build images') {

demo/docker-compose.yaml

@@ -28,7 +28,7 @@ services:
     networks:
     - oa-rdepot
   backend:
-    image: openanalytics/rdepot-app:2.6.1
+    image: openanalytics/rdepot-app:2.6.2
     restart: unless-stopped
     hostname: oa-rdepot-backend
     container_name: oa-rdepot-backend
@@ -52,7 +52,7 @@ services:
       timeout: 10s
       retries: 10
   repo:
-    image: openanalytics/rdepot-repo:2.6.1
+    image: openanalytics/rdepot-repo:2.6.2
     restart: unless-stopped
     hostname: oa-rdepot-repo
     container_name: oa-rdepot-repo
@@ -63,7 +63,7 @@ services:
     - oa-rdepot
   frontend:
     container_name: oa-rdepot-frontend
-    image: openanalytics/rdepot-client:2.6.1
+    image: openanalytics/rdepot-client:2.6.2
     restart: unless-stopped
     networks:
     - oa-rdepot

docker-compose.yaml

@@ -32,7 +32,7 @@ services:
     build:
       dockerfile: docker/build/app-standalone/Dockerfile
       cache_from:
-      - openanalytics/rdepot-app:2.6.1
+      - openanalytics/rdepot-app:2.6.2
     restart: unless-stopped
     hostname: oa-rdepot-backend
     container_name: oa-rdepot-backend
@@ -59,7 +59,7 @@ services:
     build:
       dockerfile: docker/build/repo-standalone/Dockerfile
       cache_from:
-      - openanalytics/rdepot-repo:2.6.1
+      - openanalytics/rdepot-repo:2.6.2
     restart: unless-stopped
     hostname: oa-rdepot-repo
     container_name: oa-rdepot-repo
@@ -70,7 +70,7 @@ services:
     - oa-rdepot
   frontend:
     container_name: oa-rdepot-frontend
-    image: openanalytics/rdepot-client:2.6.1
+    image: openanalytics/rdepot-client:2.6.2
     restart: unless-stopped
     networks:
     - oa-rdepot

docker/build/app-standalone/Dockerfile

@@ -1,6 +1,6 @@
-FROM registry.openanalytics.eu/openanalytics/rdepot-app-it:2.6.1
+FROM registry.openanalytics.eu/openanalytics/rdepot-app-it:2.6.2
 
-COPY ./rdepot-app/target/rdepot-app-2.6.1.war /opt/rdepot/rdepot.war
+COPY ./rdepot-app/target/rdepot-app-2.6.2.war /opt/rdepot/rdepot.war
 COPY ./docker/build/app-standalone/application.yml /opt/rdepot/application.yml
 
 ENTRYPOINT exec java $JAVA_OPTS -jar /opt/rdepot/rdepot.war --spring.config.location=classpath:/application.yml --spring.config.additional-location=file:/opt/rdepot/application.yml

docker/build/repo-standalone/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.openanalytics.eu/openanalytics/rdepot-repo-it:2.6.1
+FROM registry.openanalytics.eu/openanalytics/rdepot-repo-it:2.6.2
 
-COPY ./rdepot-repo/target/rdepot-repo-2.6.1.jar /opt/repo/rdepot-repo.jar
+COPY ./rdepot-repo/target/rdepot-repo-2.6.2.jar /opt/repo/rdepot-repo.jar
 COPY ./docker/build/repo-standalone/application.yml /opt/repo/application.yml

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.openanalytics</groupId>
 	<artifactId>rdepot</artifactId>
-	<version>2.6.1</version>
+	<version>2.6.2</version>
 	<packaging>pom</packaging>
 	<name>RDepot</name>
 	<description>Enterprise Management of Package Repositories</description>