Skip to content

Commit

Permalink
Merge branch 'release/0.9.0'
Browse files Browse the repository at this point in the history
# Conflicts:
#	bom/pom.xml
#	modules/builder/pom.xml
#	modules/core-annotationprocessor/pom.xml
#	modules/core/pom.xml
#	modules/dynamic/pom.xml
#	modules/objectadapter/generator/annotations/pom.xml
#	modules/objectadapter/generator/pom.xml
#	modules/objectadapter/generator/processors/pom.xml
#	modules/objectadapter/generator/testusage/pom.xml
#	modules/objectadapter/pom.xml
#	modules/pom.xml
#	modules/static/generated/annotations/pom.xml
#	modules/static/generated/pom.xml
#	modules/static/generated/processors/pom.xml
#	modules/static/generated/testusage/pom.xml
#	modules/static/pom.xml
#	modules/static/runtime/pom.xml
#	pom.xml
  • Loading branch information
svenruppert committed Sep 28, 2017
2 parents 496dea1 + ce5ded5 commit 65c0cfa
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>rapidpm-proxybuilder</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,7 +14,7 @@

<!--Change parent pom too !!-->
<properties>
<rapidpm-proxybuilder.version>0.8.1</rapidpm-proxybuilder.version>
<rapidpm-proxybuilder.version>0.9.0</rapidpm-proxybuilder.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion modules/builder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.rapidpm.proxybuilder</groupId>
<artifactId>rapidpm-proxybuilder-modules</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>

</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/core-annotationprocessor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/dynamic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/objectadapter/generator/annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.rapidpm.proxybuilder</groupId>
<artifactId>rapidpm-proxybuilder-modules-objectadapter-generator</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>

</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/objectadapter/generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.rapidpm.proxybuilder</groupId>
<artifactId>rapidpm-proxybuilder-modules-objectadapter</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>

<artifactId>rapidpm-proxybuilder-modules-objectadapter-generator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/objectadapter/generator/processors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.rapidpm.proxybuilder</groupId>
<artifactId>rapidpm-proxybuilder-modules-objectadapter-generator</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>

</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/objectadapter/generator/testusage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules-objectadapter-generator</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/objectadapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.rapidpm.proxybuilder</groupId>
<artifactId>rapidpm-proxybuilder-modules</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/static/generated/annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules-static-generated</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/static/generated/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules-static</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/static/generated/processors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules-static-generated</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/static/generated/testusage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules-static-generated</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/static/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/static/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>rapidpm-proxybuilder-modules-static</artifactId>
<groupId>org.rapidpm.proxybuilder</groupId>
<version>0.8.1</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<parent>
<groupId>org.rapidpm</groupId>
<artifactId>rapidpm-dependencies</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</parent>


<groupId>org.rapidpm.proxybuilder</groupId>
<artifactId>rapidpm-proxybuilder</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>

<packaging>pom</packaging>
<modules>
Expand Down Expand Up @@ -83,7 +83,7 @@

<!--Change BOM too !!-->
<properties>
<rapidpm-proxybuilder.version>0.8.1</rapidpm-proxybuilder.version>
<rapidpm-proxybuilder.version>0.9.0</rapidpm-proxybuilder.version>
</properties>

<dependencies>
Expand Down

0 comments on commit 65c0cfa

Please sign in to comment.