You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/10/07 17:36:03 UTC
[royale-asjs] branch develop updated (36d1397 -> ecbe6ae)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 36d1397 Re-enabling this for now... will aim to resolve that before next release if it is somehow blocking release.
new 1d178fc typedefs also has a build.properties now
new 3cf897d need to update this in pom
new ecbe6ae fix a few version numbers that don't get updated because commented out or similar reasons
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/amf/SampleAmfWebApp/README.txt | 2 +-
examples/amf/SampleAmfWebApp/pom-royale-basic.xml | 6 +++---
examples/amf/SampleAmfWebApp/pom-royale-jewel.xml | 6 +++---
examples/amf/SampleAmfWebApp/pom.xml | 2 +-
examples/royale/FileProxy/pom.xml | 10 +++++-----
examples/royale/RemoteObjectAMFTestBasic/pom.xml | 12 ++++++------
examples/royale/TourDeJewel/pom.xml | 6 +++---
.../royale/TourDeJewel/src/main/royale/WelcomeSection.mxml | 2 +-
frameworks/projects/Ace/pom.xml | 8 ++++----
pom.xml | 2 +-
releasecandidate.xml | 9 +++++++++
11 files changed, 37 insertions(+), 28 deletions(-)
[royale-asjs] 01/03: typedefs also has a build.properties now
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 1d178fc6ad3817a2074ade3e8df95ed87d0a3f3f
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Oct 7 10:24:59 2019 -0700
typedefs also has a build.properties now
---
releasecandidate.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index da15d3e..044359a 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -1256,6 +1256,12 @@ ${my.name}
<arg value="update version to ${new.release.version}" />
</exec>
<echo>updating royale-typedefs</echo>
+ <replace file="${typedefs}/build.properties"
+ token="release.version=${release.version}"
+ value="release.version=${new.release.version}" />
+ <replace file="${typedefs}/build.properties"
+ token="releaseversion=${release.version}"
+ value="releaseversion=${new.release.version}" />
<replaceregexp file="${typedefs}/pom.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.compiler.version>.*<"/>
<substitution expression="royale.compiler.version>${new.release.version}-SNAPSHOT<"/>
[royale-asjs] 03/03: fix a few version numbers that don't get
updated because commented out or similar reasons
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit ecbe6ae7d115e21197c93f9165337700729b5344
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Oct 7 10:35:49 2019 -0700
fix a few version numbers that don't get updated because commented out or similar reasons
---
examples/amf/SampleAmfWebApp/README.txt | 2 +-
examples/amf/SampleAmfWebApp/pom-royale-basic.xml | 6 +++---
examples/amf/SampleAmfWebApp/pom-royale-jewel.xml | 6 +++---
examples/amf/SampleAmfWebApp/pom.xml | 2 +-
examples/royale/FileProxy/pom.xml | 10 +++++-----
examples/royale/RemoteObjectAMFTestBasic/pom.xml | 12 ++++++------
examples/royale/TourDeJewel/pom.xml | 6 +++---
.../royale/TourDeJewel/src/main/royale/WelcomeSection.mxml | 2 +-
frameworks/projects/Ace/pom.xml | 8 ++++----
pom.xml | 2 +-
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/examples/amf/SampleAmfWebApp/README.txt b/examples/amf/SampleAmfWebApp/README.txt
index 37c1e7e..8442f92 100644
--- a/examples/amf/SampleAmfWebApp/README.txt
+++ b/examples/amf/SampleAmfWebApp/README.txt
@@ -44,7 +44,7 @@ Note: At this time some parts of the example only can be build with maven, we'll
2. Build SampleAmfWebApp with maven using "mvn clean install". This generates the Java Web App with AMF support and will overlay the RemoteObjectAMFTest client compiled in the previous step
(this project)
-3. Launch SampleAmfWebApp in the embedded Jetty web server with "java -jar target/SampleAmfWebApp-0.9.6-SNAPSHOT-exec.war". You should be in root SampleAmfWebApp folder. Notice: that SNAPSHOT number is just an example and can be different
+3. Launch SampleAmfWebApp in the embedded Jetty web server with "java -jar target/SampleAmfWebApp-0.9.7-SNAPSHOT-exec.war". You should be in root SampleAmfWebApp folder. Notice: that SNAPSHOT number is just an example and can be different
4. In a browser launch "http://localhost:8080" and try the examples.
diff --git a/examples/amf/SampleAmfWebApp/pom-royale-basic.xml b/examples/amf/SampleAmfWebApp/pom-royale-basic.xml
index 61be27f..9bfc24d 100644
--- a/examples/amf/SampleAmfWebApp/pom-royale-basic.xml
+++ b/examples/amf/SampleAmfWebApp/pom-royale-basic.xml
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.royale.examples</groupId>
<artifactId>examples-amf-webapps</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>SampleAmfWebApp</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>war</packaging>
<name>Apache Royale: Examples: AMF Web Apps: SampleAmfWebApp</name>
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.apache.royale.examples</groupId>
<artifactId>RemoteObjectAMFTestBasic</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>war</type>
</dependency>
diff --git a/examples/amf/SampleAmfWebApp/pom-royale-jewel.xml b/examples/amf/SampleAmfWebApp/pom-royale-jewel.xml
index 5e95e40..c7946b1 100644
--- a/examples/amf/SampleAmfWebApp/pom-royale-jewel.xml
+++ b/examples/amf/SampleAmfWebApp/pom-royale-jewel.xml
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.royale.examples</groupId>
<artifactId>examples-amf-webapps</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>SampleAmfWebApp</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>war</packaging>
<name>Apache Royale: Examples: AMF Web Apps: SampleAmfWebApp</name>
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.apache.royale.examples</groupId>
<artifactId>RemoteObjectAMFTest</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>war</type>
</dependency>
diff --git a/examples/amf/SampleAmfWebApp/pom.xml b/examples/amf/SampleAmfWebApp/pom.xml
index 5a15174..611031e 100644
--- a/examples/amf/SampleAmfWebApp/pom.xml
+++ b/examples/amf/SampleAmfWebApp/pom.xml
@@ -146,7 +146,7 @@
<!-- <dependency>
<groupId>org.apache.royale.examples</groupId>
<artifactId>RemoteObjectAMFTest</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>war</type>
</dependency> -->
diff --git a/examples/royale/FileProxy/pom.xml b/examples/royale/FileProxy/pom.xml
index c5da54c..155920d 100644
--- a/examples/royale/FileProxy/pom.xml
+++ b/examples/royale/FileProxy/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.examples</groupId>
<artifactId>examples-royale</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>FileProxy</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>swf</packaging>
<name>Apache Royale: Examples: Royale: FileProxy</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Basic</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
</dependency>
@@ -84,14 +84,14 @@
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Basic</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>BasicTheme</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<scope>theme</scope>
</dependency>
diff --git a/examples/royale/RemoteObjectAMFTestBasic/pom.xml b/examples/royale/RemoteObjectAMFTestBasic/pom.xml
index 04e0943..3972121 100644
--- a/examples/royale/RemoteObjectAMFTestBasic/pom.xml
+++ b/examples/royale/RemoteObjectAMFTestBasic/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.examples</groupId>
<artifactId>examples-royale</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>RemoteObjectAMFTestBasic</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>swf</packaging>
<name>Apache Royale: Examples: Royale: RemoteObjectAMFTestBasic</name>
@@ -74,14 +74,14 @@
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Reflection</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
</dependency>
@@ -93,14 +93,14 @@
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Reflection</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
diff --git a/examples/royale/TourDeJewel/pom.xml b/examples/royale/TourDeJewel/pom.xml
index 54048e4..a7d7b57 100644
--- a/examples/royale/TourDeJewel/pom.xml
+++ b/examples/royale/TourDeJewel/pom.xml
@@ -145,7 +145,7 @@
<!-- <dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Jewel-Light-NoFlat-Primary-Blue-Theme</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<scope>theme</scope>
<classifier>js</classifier>
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Jewel-Light-NoFlat-Secondary-Topaz-Theme</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<scope>theme</scope>
<classifier>js</classifier>
@@ -161,7 +161,7 @@
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Jewel-Light-NoFlat-Emphasized-Emerald-Theme</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<scope>theme</scope>
</dependency> -->
diff --git a/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml b/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
index 767c863..aff9bb7 100644
--- a/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
@@ -40,7 +40,7 @@ limitations under the License.
<j:Image src="assets/apache-royale-logo.svg" height="300"/>
- <html:H1 text="Welcome to Apache Royale Tour de Jewel Component Explorer v.0.9.6">
+ <html:H1 text="Welcome to Apache Royale Tour de Jewel Component Explorer v.0.9.7">
<html:beads>
<j:TextAlign align="center"/>
</html:beads>
diff --git a/frameworks/projects/Ace/pom.xml b/frameworks/projects/Ace/pom.xml
index a74b61b..f42a15e 100644
--- a/frameworks/projects/Ace/pom.xml
+++ b/frameworks/projects/Ace/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
<artifactId>projects</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>JQuery</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>swc</packaging>
<name>Apache Royale: Framework: Libs: JQuery</name>
@@ -95,14 +95,14 @@
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Core</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Basic</artifactId>
- <version>0.9.6-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
diff --git a/pom.xml b/pom.xml
index cf180e7..dd46c00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -460,7 +460,7 @@
<profile>
<id>release-swcs</id>
<properties>
- <repo.compiler.options>-metadata.date="${royale.swc-date}";-metadata.dateFormat="MM/dd/yy HH:mm Z";-swf-debugfile-alias=/org/apache/royale/0.9.6;</repo.compiler.options>
+ <repo.compiler.options>-metadata.date="${royale.swc-date}";-metadata.dateFormat="MM/dd/yy HH:mm Z";-swf-debugfile-alias=/org/apache/royale/0.9.7;</repo.compiler.options>
<source.map>false</source.map>
</properties>
<build>
[royale-asjs] 02/03: need to update this in pom
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 3cf897d6b6327efe3173f7cb4f94a832690ce8a2
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Oct 7 10:33:23 2019 -0700
need to update this in pom
---
releasecandidate.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 044359a..ccbdcb4 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -1210,6 +1210,9 @@ ${my.name}
<include name="royale/StorageExample/StorageExample-app.xml" />
</fileset>
</replace>
+ <replace file="${asjs}/pom.xml"
+ token="-swf-debugfile-alias=/org/apache/royale/${release.version}"
+ value="-swf-debugfile-alias=/org/apache/royale/${new.release.version}" />
<replaceregexp file="${asjs}/pom.xml" byline="true" encoding="UTF-8">
<regexp pattern="royale.compiler.version>.*<"/>
<substitution expression="royale.compiler.version>${new.release.version}-SNAPSHOT<"/>