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 5b0bca11582d1100d67df961addba2a3be71ceb6 Author: Glaucia <[email protected]> AuthorDate: Wed Jul 12 09:55:02 2023 +0100 [maven-release-plugin] prepare release 0.7.0 --- pom.xml | 7 ++++--- wayang-api/pom.xml | 4 ++++ wayang-assembly/pom.xml | 4 ++++ wayang-benchmark/pom.xml | 4 ++++ 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, 40 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a55f8aef..c36c1ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.wayang</groupId> <artifactId>wayang</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0</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.1</tag> + <tag>wayang-0.7.0-rc2</tag> </scm> <issueManagement> @@ -100,7 +100,8 @@ <maven.kotlin.skip>false</maven.kotlin.skip> <!-- Timestamp for the reproducible builds --> - <project.build.outputTimestamp>2023-09-03T17:24:31Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2023-07-12T08:49:42Z</project.build.outputTimestamp> + <assertj.version>3.17.2</assertj.version> <commons-io.version>2.5</commons-io.version> <guava.version>19.0</guava.version> diff --git a/wayang-api/pom.xml b/wayang-api/pom.xml index 4a0020bc..a7bf101d 100644 --- a/wayang-api/pom.xml +++ b/wayang-api/pom.xml @@ -23,7 +23,11 @@ <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 f4d20195..540b5ee4 100644 --- a/wayang-assembly/pom.xml +++ b/wayang-assembly/pom.xml @@ -21,11 +21,15 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> +<<<<<<< HEAD <<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> ======= <version>0.7.0-SNAPSHOT</version> >>>>>>> deda7467 ([maven-release-plugin] rollback the release of wayang-0.7.0) +======= + <version>0.7.0</version> +>>>>>>> 62037b73 ([maven-release-plugin] prepare release 0.7.0) </parent> <modelVersion>4.0.0</modelVersion> diff --git a/wayang-benchmark/pom.xml b/wayang-benchmark/pom.xml index e7ab91b5..468cf848 100644 --- a/wayang-benchmark/pom.xml +++ b/wayang-benchmark/pom.xml @@ -21,7 +21,11 @@ <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-commons/pom.xml b/wayang-commons/pom.xml index b61c2cef..34ebc439 100644 --- a/wayang-commons/pom.xml +++ b/wayang-commons/pom.xml @@ -23,7 +23,11 @@ <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 38ae608b..ac373f5e 100644 --- a/wayang-platforms/pom.xml +++ b/wayang-platforms/pom.xml @@ -23,7 +23,11 @@ <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 faedc659..283a1251 100644 --- a/wayang-plugins/pom.xml +++ b/wayang-plugins/pom.xml @@ -23,7 +23,11 @@ <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 cb1b2584..685ee23e 100644 --- a/wayang-profiler/pom.xml +++ b/wayang-profiler/pom.xml @@ -24,7 +24,11 @@ <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 5bbf3e87..a3e775e1 100644 --- a/wayang-resources/pom.xml +++ b/wayang-resources/pom.xml @@ -21,7 +21,11 @@ <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 f2a94205..cebecd61 100644 --- a/wayang-tests-integration/pom.xml +++ b/wayang-tests-integration/pom.xml @@ -24,7 +24,11 @@ <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>
