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 6c8fe85173cb622eaa55dacab1c1ebad0e94ac14 Author: Glaucia <[email protected]> AuthorDate: Tue Jul 11 23:07:13 2023 +0100 [maven-release-plugin] prepare release 0.7.0 --- pom.xml | 12 ++++++++++++ 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, 48 insertions(+) diff --git a/pom.xml b/pom.xml index 1496ead2..4edcedca 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,11 @@ <groupId>org.apache.wayang</groupId> <artifactId>wayang</artifactId> +<<<<<<< HEAD <version>0.7.1-SNAPSHOT</version> +======= + <version>0.7.0</version> +>>>>>>> e762c50d ([maven-release-plugin] prepare release 0.7.0) <packaging>pom</packaging> <name>Apache Wayang (incubating)</name> @@ -66,7 +70,11 @@ <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> +<<<<<<< HEAD <tag>wayang-0.7.1</tag> +======= + <tag>wayang-0.7.0</tag> +>>>>>>> e762c50d ([maven-release-plugin] prepare release 0.7.0) </scm> <issueManagement> @@ -100,7 +108,11 @@ <maven.kotlin.skip>false</maven.kotlin.skip> <!-- Timestamp for the reproducible builds --> +<<<<<<< HEAD <project.build.outputTimestamp>2023-09-03T17:24:31Z</project.build.outputTimestamp> +======= + <project.build.outputTimestamp>2023-07-11T22:00:44Z</project.build.outputTimestamp> +>>>>>>> e762c50d ([maven-release-plugin] prepare release 0.7.0) <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 4a0020bc..44a2a9f7 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> +>>>>>>> e762c50d ([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 df19ef53..9756f4ad 100644 --- a/wayang-assembly/pom.xml +++ b/wayang-assembly/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> +>>>>>>> e762c50d ([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 2837f8bf..2e341d92 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> +>>>>>>> e762c50d ([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..77d38488 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> +>>>>>>> e762c50d ([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..2ad69e27 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> +>>>>>>> e762c50d ([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..07113270 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> +>>>>>>> e762c50d ([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..acee9f41 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> +>>>>>>> e762c50d ([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..55d40677 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> +>>>>>>> e762c50d ([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..68f683ba 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> +>>>>>>> e762c50d ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-tests-integration</artifactId>
