This is an automated email from the ASF dual-hosted git repository. yishayw pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 8749d151f2493a78879ba43b0f5204a569196057 Author: Yishay Weiss <[email protected]> AuthorDate: Thu Jul 22 10:11:27 2021 +0300 Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 12a17f2e000e97b093244099b07bb8bd6b98d877. --- manualtests/UnitTests/pom.xml | 18 +++++++------- manualtests/pom.xml | 56 ------------------------------------------- pom.xml | 2 +- 3 files changed, 10 insertions(+), 66 deletions(-) diff --git a/manualtests/UnitTests/pom.xml b/manualtests/UnitTests/pom.xml index 2c78092..ec02f02 100644 --- a/manualtests/UnitTests/pom.xml +++ b/manualtests/UnitTests/pom.xml @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.royale.manualtests</groupId> <artifactId>manualtests</artifactId> - <version>0.9.9-SNAPSHOT</version> + <version>0.9.8-SNAPSHOT</version> </parent> <artifactId>UnitTests</artifactId> - <version>0.9.9-SNAPSHOT</version> + <version>0.9.8-SNAPSHOT</version> <packaging>swf</packaging> <name>Apache Royale: ManualTests: UnitTests</name> @@ -85,28 +85,28 @@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>MXRoyale</artifactId> - <version>${royale.framework.version}</version> + <version>0.9.8-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> - <version>${royale.framework.version}</version> + <version>0.9.8-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Network</artifactId> - <version>${royale.framework.version}</version> + <version>0.9.8-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>XML</artifactId> - <version>${royale.framework.version}</version> + <version>0.9.8-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> </dependency> @@ -207,21 +207,21 @@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>MXRoyale</artifactId> - <version>${royale.framework.version}</version> + <version>0.9.8-SNAPSHOT</version> <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> - <version>${royale.framework.version}</version> + <version>0.9.8-SNAPSHOT</version> <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Network</artifactId> - <version>${royale.framework.version}</version> + <version>0.9.8-SNAPSHOT</version> <type>swc</type> <classifier>swf</classifier> </dependency> diff --git a/manualtests/pom.xml b/manualtests/pom.xml index a0a981b..368d019 100644 --- a/manualtests/pom.xml +++ b/manualtests/pom.xml @@ -75,154 +75,98 @@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Language</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Language</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> -<<<<<<< HEAD - <version>${royale.framework.version}</version> -======= <version>0.9.8-SNAPSHOT</version> ->>>>>>> parent of 12a17f2e0 ([maven-release-plugin] prepare for next development iteration) <type>swc</type> <classifier>js</classifier> </dependency> diff --git a/pom.xml b/pom.xml index e6e4579..833253b 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/royale-asjs.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/royale-asjs.git</developerConnection> <url>https://github.com/apache/royale-asjs</url> - <tag>HEAD</tag> + <tag>release/0.9.8</tag> </scm> <properties>
