This is an automated email from the ASF dual-hosted git repository. glauesppen pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git
commit 193ab3891bfe3a4ef2687c885bcb6011d28155d1 Author: Glaucia <[email protected]> AuthorDate: Wed Jul 12 09:55:56 2023 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- wayang-api/pom.xml | 4 ---- wayang-assembly/pom.xml | 4 ++++ wayang-benchmark/pom.xml | 6 +----- wayang-commons/pom.xml | 4 ---- wayang-platforms/pom.xml | 4 ---- wayang-plugins/pom.xml | 4 ---- wayang-profiler/pom.xml | 4 ---- wayang-resources/pom.xml | 4 ---- wayang-tests-integration/pom.xml | 4 ---- 10 files changed, 8 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index c36c1ca0..790ac722 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.wayang</groupId> <artifactId>wayang</artifactId> - <version>0.7.0</version> + <version>0.7.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Wayang (incubating)</name> @@ -66,7 +66,7 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-wayang.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/incubator-wayang.git</developerConnection> <url>https://github.com/apache/incubator-wayang</url> - <tag>wayang-0.7.0-rc2</tag> + <tag>rel/0.7.0</tag> </scm> <issueManagement> @@ -100,7 +100,7 @@ <maven.kotlin.skip>false</maven.kotlin.skip> <!-- Timestamp for the reproducible builds --> - <project.build.outputTimestamp>2023-07-12T08:49:42Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2023-07-12T08:55:56Z</project.build.outputTimestamp> <assertj.version>3.17.2</assertj.version> <commons-io.version>2.5</commons-io.version> diff --git a/wayang-api/pom.xml b/wayang-api/pom.xml index a7bf101d..4a0020bc 100644 --- a/wayang-api/pom.xml +++ b/wayang-api/pom.xml @@ -23,11 +23,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> -<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-api</artifactId> diff --git a/wayang-assembly/pom.xml b/wayang-assembly/pom.xml index 540b5ee4..b33e83ef 100644 --- a/wayang-assembly/pom.xml +++ b/wayang-assembly/pom.xml @@ -22,6 +22,7 @@ <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> ======= @@ -30,6 +31,9 @@ ======= <version>0.7.0</version> >>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) +======= + <version>0.7.1-SNAPSHOT</version> +>>>>>>> 0d802dec ([maven-release-plugin] prepare for next development iteration) </parent> <modelVersion>4.0.0</modelVersion> diff --git a/wayang-benchmark/pom.xml b/wayang-benchmark/pom.xml index 468cf848..2837f8bf 100644 --- a/wayang-benchmark/pom.xml +++ b/wayang-benchmark/pom.xml @@ -21,11 +21,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> -<<<<<<< HEAD - <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) + <version>0.7.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/wayang-commons/pom.xml b/wayang-commons/pom.xml index 34ebc439..b61c2cef 100644 --- a/wayang-commons/pom.xml +++ b/wayang-commons/pom.xml @@ -23,11 +23,7 @@ <parent> <groupId>org.apache.wayang</groupId> <artifactId>wayang</artifactId> -<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-commons</artifactId> diff --git a/wayang-platforms/pom.xml b/wayang-platforms/pom.xml index ac373f5e..38ae608b 100644 --- a/wayang-platforms/pom.xml +++ b/wayang-platforms/pom.xml @@ -23,11 +23,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> -<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-platforms</artifactId> diff --git a/wayang-plugins/pom.xml b/wayang-plugins/pom.xml index 283a1251..faedc659 100644 --- a/wayang-plugins/pom.xml +++ b/wayang-plugins/pom.xml @@ -23,11 +23,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> -<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-plugins</artifactId> diff --git a/wayang-profiler/pom.xml b/wayang-profiler/pom.xml index 685ee23e..cb1b2584 100644 --- a/wayang-profiler/pom.xml +++ b/wayang-profiler/pom.xml @@ -24,11 +24,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> -<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-profiler</artifactId> diff --git a/wayang-resources/pom.xml b/wayang-resources/pom.xml index a3e775e1..5bbf3e87 100644 --- a/wayang-resources/pom.xml +++ b/wayang-resources/pom.xml @@ -21,11 +21,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> -<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <modelVersion>4.0.0</modelVersion> diff --git a/wayang-tests-integration/pom.xml b/wayang-tests-integration/pom.xml index cebecd61..f2a94205 100644 --- a/wayang-tests-integration/pom.xml +++ b/wayang-tests-integration/pom.xml @@ -24,11 +24,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> -<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> -======= - <version>0.7.0</version> ->>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-tests-integration</artifactId>
