Skip to content

Commit

Permalink
- Move to 5.18.0-SNAPSHOT
Browse files Browse the repository at this point in the history 
- Rename Spring Boot artifacts as requested by the Spring Boot team
  • Loading branch information
@jbarrez
jbarrez committed Apr 24, 2015
1 parent d063efc commit 3afa833
Show file tree
Hide file tree
Showing 71 changed files with 119 additions and 96 deletions.
2 changes: 1 addition & 1 deletion modules/activiti-bpmn-converter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-bpmn-layout/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-bpmn-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-camel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-common-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-crystalball/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-diagram-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/DurationHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public DurationHelper(String expressionS, int maxIterations, ClockReader clockRe
end = expression.size() == 1 ? null : parseDate(expression.get(1));
} else {
start = parseDate(expression.get(0));
if (isDuration(expression.get(1))) {
if (isDuration(expression.get(1))) {
period = parsePeriod(expression.get(1));
} else {
end = parseDate(expression.get(1));
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-explorer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-hazelcast-async-executor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-image-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-jmx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-json-converter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-ldap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-modeler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-mule/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-osgi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
10 changes: 5 additions & 5 deletions modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ public class BlueprintBasicTest {
@Configuration
public Option[] createConfiguration() {
Option[] coreBundles = options(
mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-model").version("5.17.1-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-converter").version("5.17.1-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-process-validation").version("5.17.1-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-image-generator").version("5.17.1-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-engine").version("5.17.1-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-model").version("5.18.0-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-converter").version("5.18.0-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-process-validation").version("5.18.0-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-image-generator").version("5.18.0-SNAPSHOT"),
mavenBundle().groupId("org.activiti").artifactId("activiti-engine").version("5.18.0-SNAPSHOT"),
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version("3.3.2"),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.2.3"),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.2.3"),
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-process-validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-simple-workflow-alfresco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-simple-workflow/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions modules/activiti-spring-boot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>


<artifactId>spring-boot</artifactId>
<artifactId>activiti-spring-boot</artifactId>

<packaging>pom</packaging>

Expand Down
6 changes: 3 additions & 3 deletions modules/activiti-spring-boot/spring-boot-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot</artifactId>
<version>5.17.1-SNAPSHOT</version>
<artifactId>activiti-spring-boot</artifactId>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-samples</artifactId>
<artifactId>activiti-spring-boot-samples</artifactId>

<packaging>pom</packaging>
<modules>
Expand Down
6 changes: 3 additions & 3 deletions modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-actuator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-samples</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-sample-actuator</artifactId>
Expand All @@ -14,8 +14,8 @@
<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>5.17.1-SNAPSHOT</version>
<artifactId>activiti-spring-boot-starter-actuator</artifactId>
<version>5.18.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-samples</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-sample-basic</artifactId>

<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-starter-basic</artifactId>
<version>5.17.1-SNAPSHOT</version>
<artifactId>activiti-spring-boot-starter-basic</artifactId>
<version>5.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
6 changes: 3 additions & 3 deletions modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-samples</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-sample-integration</artifactId>

<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
<version>5.17.1-SNAPSHOT</version>
<artifactId>activiti-spring-boot-starter-integration</artifactId>
<version>5.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
6 changes: 3 additions & 3 deletions modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-jpa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-samples</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-sample-jpa</artifactId>

<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-starter-jpa</artifactId>
<version>5.17.1-SNAPSHOT</version>
<artifactId>activiti-spring-boot-starter-jpa</artifactId>
<version>5.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
8 changes: 4 additions & 4 deletions ...les/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-samples</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-sample-rest-api-security</artifactId>
Expand All @@ -14,14 +14,14 @@
<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-starter-rest-api</artifactId>
<version>5.17.1-SNAPSHOT</version>
<artifactId>activiti-spring-boot-starter-rest-api</artifactId>
<version>5.18.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-samples</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-sample-rest-api</artifactId>
Expand All @@ -14,8 +14,8 @@
<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-starter-rest-api</artifactId>
<version>5.17.1-SNAPSHOT</version>
<artifactId>activiti-spring-boot-starter-rest-api</artifactId>
<version>5.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.activiti</groupId>
<artifactId>spring-boot-samples</artifactId>
<version>5.17.1-SNAPSHOT</version>
<version>5.18.0-SNAPSHOT</version>
</parent>

<artifactId>spring-boot-sample-security</artifactId>
Expand Down
Loading

0 comments on commit 3afa833

Please sign in to comment.