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 489b489395b2f8d6f59bccd11f5ea2730a82c8c7 Author: Glaucia <[email protected]> AuthorDate: Wed Jul 12 09:19:11 2023 +0100 [maven-release-plugin] rollback the release of wayang-0.7.0 --- pom.xml | 13 ------------- 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, 1 insertion(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index 4edcedca..11ee4f58 100644 --- a/pom.xml +++ b/pom.xml @@ -28,11 +28,7 @@ <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> @@ -70,11 +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> -<<<<<<< HEAD <tag>wayang-0.7.1</tag> -======= - <tag>wayang-0.7.0</tag> ->>>>>>> e762c50d ([maven-release-plugin] prepare release 0.7.0) </scm> <issueManagement> @@ -108,12 +100,7 @@ <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> <guava.version>19.0</guava.version> diff --git a/wayang-api/pom.xml b/wayang-api/pom.xml index 44a2a9f7..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> ->>>>>>> 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 9756f4ad..df19ef53 100644 --- a/wayang-assembly/pom.xml +++ b/wayang-assembly/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> ->>>>>>> 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 2e341d92..e7ab91b5 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> ->>>>>>> e762c50d ([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 77d38488..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> ->>>>>>> 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 2ad69e27..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> ->>>>>>> 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 07113270..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> ->>>>>>> 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 acee9f41..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> ->>>>>>> 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 55d40677..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> ->>>>>>> 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 68f683ba..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> ->>>>>>> e762c50d ([maven-release-plugin] prepare release 0.7.0) </parent> <artifactId>wayang-tests-integration</artifactId>
