From 852259ca56ae08b839dfbcf3824d3626c4f5b7aa Mon Sep 17 00:00:00 2001 From: jx-activiti-cloud <jx-activiti-cloud@alfresco.com> Date: Sat, 12 Jan 2019 11:16:36 +0000 Subject: [PATCH] release 7.0.15 --- VERSION | 1 + charts/activiti-cloud-modeling/Chart.yaml | 2 +- charts/activiti-cloud-modeling/values.yaml | 2 +- .../durable-8ca08f6a/jenkins-log.txt | 5 + .../durable-8ca08f6a/script.sh | 2 + pom.xml | 2 +- pom.xml.versionsBackup | 135 ++++++++++++++++++ 7 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 VERSION create mode 100644 charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/jenkins-log.txt create mode 100755 charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/script.sh create mode 100644 pom.xml.versionsBackup diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..8bbbfc0b --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +7.0.15 diff --git a/charts/activiti-cloud-modeling/Chart.yaml b/charts/activiti-cloud-modeling/Chart.yaml index b79f2a8c..7252604b 100644 --- a/charts/activiti-cloud-modeling/Chart.yaml +++ b/charts/activiti-cloud-modeling/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: A Helm chart for Kubernetes icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/master/images/java.png name: activiti-cloud-modeling -version: 0.4.0 +version: 7.0.15 diff --git a/charts/activiti-cloud-modeling/values.yaml b/charts/activiti-cloud-modeling/values.yaml index ec714339..8ee2932a 100755 --- a/charts/activiti-cloud-modeling/values.yaml +++ b/charts/activiti-cloud-modeling/values.yaml @@ -69,7 +69,7 @@ backend: other: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dsun.zip.disableMemoryMapping=true -XX:+UseParallelGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 image: repository: activiti/activiti-cloud-modeling - tag: 7.0.1 + tag: 7.0.15 pullPolicy: Always resources: limits: diff --git a/charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/jenkins-log.txt b/charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/jenkins-log.txt new file mode 100644 index 00000000..e1b4a412 --- /dev/null +++ b/charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/jenkins-log.txt @@ -0,0 +1,5 @@ ++ make tag +sed -i -e "s/version:.*/version: 7.0.15/" Chart.yaml +#sed -i -e "s/tag: 7\.0\.[1-9]\d*/tag: 7.0.15/" values.yaml +export RELEASE_VERSION=7.0.15 && perl -0777 -pi -e '$version = $ENV{'RELEASE_VERSION'};s/repository: activiti\/activiti-cloud-modeling\n\s*tag: ([0-9]|[a-zA-Z]|\.)*/repository: activiti\/activiti-cloud-modeling\n tag: $version/' values.yaml +git add --all diff --git a/charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/script.sh b/charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/script.sh new file mode 100755 index 00000000..3c3be81f --- /dev/null +++ b/charts/activiti-cloud-modeling@tmp/durable-8ca08f6a/script.sh @@ -0,0 +1,2 @@ +#!/bin/sh -xe +make tag \ No newline at end of file diff --git a/pom.xml b/pom.xml index f8d097d4..ccc49104 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>org.activiti.cloud.examples</groupId> <artifactId>activiti-cloud-modeling</artifactId> - <version>1.0.0</version> + <version>7.0.15</version> <name>Activiti Cloud :: Modeling</name> <url>http://activiti.org</url> <scm> diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup new file mode 100644 index 00000000..f8d097d4 --- /dev/null +++ b/pom.xml.versionsBackup @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.activiti.cloud.examples</groupId> + <artifactId>activiti-cloud-modeling</artifactId> + <version>1.0.0</version> + <name>Activiti Cloud :: Modeling</name> + <url>http://activiti.org</url> + <scm> + <url>https://github.com/Activiti/${project.artifactId}</url> + <connection>scm:git:https://github.com/Activiti/${project.artifactId}.git</connection> + <developerConnection>scm:git:https://github.com/Activiti/${project.artifactId}.git</developerConnection> + <tag>HEAD</tag> + </scm> + <properties> + <java.version>1.8</java.version> + <activiti-cloud-modeling-dependencies.version>7.0.38</activiti-cloud-modeling-dependencies.version> + <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> + <maven-failsafe-plugin.version>2.18.1</maven-failsafe-plugin.version> + <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> <!-- required for jx --> + </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.activiti.cloud.dependencies</groupId> + <artifactId>activiti-cloud-modeling-dependencies</artifactId> + <version>${activiti-cloud-modeling-dependencies.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> + <groupId>org.activiti.cloud.process.model</groupId> + <artifactId>activiti-cloud-starter-process-model</artifactId> + </dependency> + <dependency> + <groupId>org.activiti.cloud.modeling</groupId> + <artifactId>activiti-cloud-starter-org</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-starter-contract-verifier</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin.version}</version> + <configuration> + <source>${java.version}</source> + <target>${java.version}</target> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <optimize>true</optimize> + </configuration> + </plugin> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>${maven-deploy-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>${maven-failsafe-plugin.version}</version> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0-M1</version></plugin> + </plugins> + </build> + <repositories> + <repository> + <id>activiti-releases</id> + <name>Activiti Releases</name> + <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases/</url> + </repository> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/milestone/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> +</project>