commit 11abfc4996ba54453e2fa4f78645dce050736309
author Yishay Weiss <yishayjobs@hotmail.com> Tue May 23 13:59:00 2023 +0300
committer Yishay Weiss <yishayjobs@hotmail.com> Tue May 23 13:59:00 2023 +0300
tree f07d3e456cdedbab833d9f820a99d9303a66feb2
parent dd9a0ef5448e7a8244a6474ca731c0eb92a75ffc
parent 88094458b2b7cbb3d027f64c9e952f1cc93d29c9

Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

releasecandidate.xml

diff --git a/releasecandidate.xml b/releasecandidate.xml
index 660f0ab..391ab3e 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -1091,7 +1091,7 @@
     
 		<fail message="The svn.dist.release property is not set to the working copy for https://dist.apache.org/repos/dist/release."
 			unless="dist.release"/>
-			
+				
 		<exec executable="${svn}" dir="${dist.release}/royale" failonerror="true" >
 			<arg value="update" />
 		</exec>
@@ -1113,7 +1113,7 @@
         <!-- this is intended to merge the tag to master because it should have the right versions in it -->
         <antcall target="merge_rc_to_master" />
         <antcall target="get_head_of_rc_branches" />
-		<!-- <antcall target="release.npm" /> -->
+		<!-- <antcall target="release.npm" /> --> <!-- TODO fix and uncomment -->
         <antcall target="update.versions" />
         <antcall target="merge_rc_to_develop" />
         <antcall target="release.maven.staging.repo" />
@@ -1234,7 +1234,7 @@
             <substitution expression="royale.framework.version&gt;${new.release.version}-SNAPSHOT&lt;"/>
         </replaceregexp>
 	<replaceregexp file="${asjs}/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml" byline="true" encoding="UTF-8">
-            <regexp pattern="royale.framework.version&gt;.*SNAPSHOTSNAPSHOT&lt;"/>
+            <regexp pattern="royale.framework.version&gt;.*SHOTSNAPSHOT&lt;"/>
             <substitution expression="royale.framework.version&gt;${new.release.version}-SNAPSHOT&lt;"/>
         </replaceregexp>
 	<replaceregexp file="${asjs}/examples/amf/SampleAmfWebApp/pom-royale-basic.xml" byline="true" encoding="UTF-8">