royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-asjs] 05/10: fix up poms in hopes that the versions plugin will find all places we use the version
Date Fri, 12 Jan 2018 05:12:40 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch release/0.9.0
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 77ee236508e645d54704a7f44d62bf7ca74f3804
Author: Alex Harui <aharui@apache.org>
AuthorDate: Thu Jan 11 11:57:24 2018 -0800

    fix up poms in hopes that the versions plugin will find all places we use the version
    
    (cherry picked from commit 103a60f3b4d05dbb3f6ec83debb368258893c26d)
---
 examples/express/pom.xml                        |  1 +
 examples/pom.xml                                |  2 +
 examples/royale/DataBindingExample_Flat/pom.xml |  6 +-
 examples/royale/MDLBlogExample/pom.xml          |  2 +-
 examples/royale/MDLDynamicTableExample/pom.xml  |  2 +-
 examples/royale/MDLDynamicTabsExample/pom.xml   |  2 +-
 examples/royale/MDLExample/pom.xml              |  2 +-
 examples/royale/ModuleExample/pom.xml           | 86 -------------------------
 examples/royale/RemoteObjectAMFTest/pom.xml     | 10 +--
 examples/royale/RoyaleTeamPage_MDL/pom.xml      |  2 +-
 examples/royale/pom.xml                         |  4 +-
 11 files changed, 15 insertions(+), 104 deletions(-)

diff --git a/examples/express/pom.xml b/examples/express/pom.xml
index d7f9409..590497b 100644
--- a/examples/express/pom.xml
+++ b/examples/express/pom.xml
@@ -34,6 +34,7 @@
 
   <modules>
     <module>DataBindingExample</module>
+    <module>DataGridExample</module>
   </modules>
 
   <build>
diff --git a/examples/pom.xml b/examples/pom.xml
index 270ce20..abe6159 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -35,6 +35,7 @@
 
   <properties>
     <compiler.output-dir>${basedir}/target/javascript/bin/js-debug</compiler.output-dir>
+    <royale.framework.version>0.9.0-SNAPSHOT</royale.framework.version>
   </properties>
 
   <modules>
@@ -42,6 +43,7 @@
     <module>royale</module>
     <module>native</module>
     <module>node</module>
+    <module>amf</module>
 
     <module>examples-tests</module>
     <module>examples-integrationtests</module>
diff --git a/examples/royale/DataBindingExample_Flat/pom.xml b/examples/royale/DataBindingExample_Flat/pom.xml
index e14b666..35cd17e 100644
--- a/examples/royale/DataBindingExample_Flat/pom.xml
+++ b/examples/royale/DataBindingExample_Flat/pom.xml
@@ -33,11 +33,11 @@
   <parent>
     <groupId>org.apache.royale.examples</groupId>
     <artifactId>examples-royale</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>DataBindingExample_Flat</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.9.1-SNAPSHOT</version>
   <packaging>swf</packaging>
 
   <name>Apache Royale: Examples: Royale: DataBindingExample_Flat</name>
@@ -83,7 +83,7 @@
                 <artifactItem>
                   <groupId>org.apache.royale.framework</groupId>
                   <artifactId>Fonts</artifactId>
-                  <version>0.9.0-SNAPSHOT</version>
+                  <version>${royale.framework.version}</version>
                   <type>war</type>
                   <outputDirectory>${war.source.directory}/fonts</outputDirectory>
                 </artifactItem>
diff --git a/examples/royale/MDLBlogExample/pom.xml b/examples/royale/MDLBlogExample/pom.xml
index f72e1ab..c39a9a4 100644
--- a/examples/royale/MDLBlogExample/pom.xml
+++ b/examples/royale/MDLBlogExample/pom.xml
@@ -56,7 +56,7 @@
         <configuration>
           <mainClass>App.mxml</mainClass>
           <htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
-          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
+          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/royale/MDLDynamicTableExample/pom.xml b/examples/royale/MDLDynamicTableExample/pom.xml
index c52114f..eab44b5 100644
--- a/examples/royale/MDLDynamicTableExample/pom.xml
+++ b/examples/royale/MDLDynamicTableExample/pom.xml
@@ -55,7 +55,7 @@
           <mainClass>MDLDynamicTableExample.mxml</mainClass>
           <targets>JSRoyale</targets>
           <htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
-          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
+          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/royale/MDLDynamicTabsExample/pom.xml b/examples/royale/MDLDynamicTabsExample/pom.xml
index ef2071c..73a347e 100644
--- a/examples/royale/MDLDynamicTabsExample/pom.xml
+++ b/examples/royale/MDLDynamicTabsExample/pom.xml
@@ -50,7 +50,7 @@
           <targets>JSRoyale</targets>
           <removeCirculars>true</removeCirculars>
           <htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
-          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
+          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/royale/MDLExample/pom.xml b/examples/royale/MDLExample/pom.xml
index aa04ad2..1a05f33 100644
--- a/examples/royale/MDLExample/pom.xml
+++ b/examples/royale/MDLExample/pom.xml
@@ -55,7 +55,7 @@
           <mainClass>App.mxml</mainClass>
           <targets>JSRoyale</targets>
           <htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
-          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
+          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/royale/ModuleExample/pom.xml b/examples/royale/ModuleExample/pom.xml
index 6bea753..bbe5ea2 100644
--- a/examples/royale/ModuleExample/pom.xml
+++ b/examples/royale/ModuleExample/pom.xml
@@ -71,92 +71,6 @@
   -->
 
   <dependencies>
-    <!--
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Core</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>swf</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Core</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Language</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>swf</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Language</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>HTML</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>swf</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>HTML</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Collections</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>swf</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Collections</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Binding</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>swf</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Binding</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>Graphics</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>swf</classifier>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.royale.framework</groupId>
-        <artifactId>Graphics</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <type>swc</type>
-        <classifier>js</classifier>
-    </dependency>
-     -->
   </dependencies>
 
 </project>
diff --git a/examples/royale/RemoteObjectAMFTest/pom.xml b/examples/royale/RemoteObjectAMFTest/pom.xml
index 6bc8074..4a1508d 100644
--- a/examples/royale/RemoteObjectAMFTest/pom.xml
+++ b/examples/royale/RemoteObjectAMFTest/pom.xml
@@ -57,7 +57,7 @@
           <mainClass>App.mxml</mainClass>
           <targets>SWF,JSRoyale</targets>
           <!--<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>-->
-          <!--<additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT.swc:defaults.css</additionalCompilerOptions>-->
+          <!--<additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}.swc:defaults.css</additionalCompilerOptions>-->
         </configuration>
       </plugin>
       <plugin>
@@ -80,14 +80,6 @@
       <scope>provided</scope>
     </dependency>
       
-    <!--<dependency>
-      <groupId>org.apache.royale.framework</groupId>
-      <artifactId>MaterialDesignLite</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-      <type>swc</type>
-      <classifier>js</classifier>
-    </dependency>-->
-
     <dependency>
       <groupId>org.apache.royale.framework</groupId>
       <artifactId>Network</artifactId>
diff --git a/examples/royale/RoyaleTeamPage_MDL/pom.xml b/examples/royale/RoyaleTeamPage_MDL/pom.xml
index 26e6e2e..e2972da 100644
--- a/examples/royale/RoyaleTeamPage_MDL/pom.xml
+++ b/examples/royale/RoyaleTeamPage_MDL/pom.xml
@@ -55,7 +55,7 @@
           <mainClass>App.mxml</mainClass>
           <targets>JSRoyale</targets>
           <htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
-          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
+          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/royale/pom.xml b/examples/royale/pom.xml
index 683ae9a..ce78d26 100644
--- a/examples/royale/pom.xml
+++ b/examples/royale/pom.xml
@@ -44,14 +44,16 @@
     <module>DataGridExample</module>
     <module>DateControlsExample</module>
     <module>DesktopMap</module>
+    <module>Flex2Royale</module>
     <module>RoyaleStore</module>
     <module>RoyaleStore_jquery</module>
     <module>RoyaleTeamPage_MDL</module>
     <module>RoyaleWebsiteStatsViewer</module>
     <module>HelloWorld</module>
+    <module>HTMLElements</module>
     <module>ListExample</module>
     <module>MapSearch</module>
-    <!--module>MDLBlogExample</module>-->
+    <module>MDLBlogExample</module>
     <module>MDLDynamicTabsExample</module>
     <module>MDLExample</module>
     <module>MDLDynamicTableExample</module>

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.

Mime
View raw message