You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/09/13 19:15:52 UTC

[royale-asjs] branch develop updated: maven-archetypes: "royale-jewel-module-application-archetype" more improvements

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/develop by this push:
     new 5ff7172  maven-archetypes: "royale-jewel-module-application-archetype" more improvements
5ff7172 is described below

commit 5ff717272871748eed2cb980f51ff8b0607f8ee5
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Sep 13 21:15:40 2020 +0200

    maven-archetypes: "royale-jewel-module-application-archetype" more improvements
---
 .../archetype-resources/__application__/pom.xml    |  12 +++
 .../archetype-resources/__module__/pom.xml         |  12 +++
 .../src/main/resources/archetype-resources/pom.xml | 101 +++++++++++----------
 3 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
index baf1d50..7f0b914 100644
--- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
+++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
@@ -48,6 +48,18 @@
           <additionalCompilerOptions>-source-map=true;-js-compiler-option=--variable_map_output_file gccvars.txt;-js-compiler-option+=--property_map_output_file gccprops.txt</additionalCompilerOptions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>nl.geodienstencentrum.maven</groupId>
+        <artifactId>sass-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-css-using-sass</id>
+            <goals>
+                <goal>update-stylesheets</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
index 07118aa..a5639b8 100644
--- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
+++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
@@ -47,6 +47,18 @@
           <additionalCompilerOptions>-source-map=true;-js-compiler-option=--variable_map_input_file ../../../../../${application}/target/javascript/bin/js-release/gccvars.txt;-js-compiler-option+=--property_map_input_file ../../../../../${application}/target/javascript/bin/js-release/gccprops.txt</additionalCompilerOptions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>nl.geodienstencentrum.maven</groupId>
+        <artifactId>sass-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-css-using-sass</id>
+            <goals>
+                <goal>update-stylesheets</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
       <!-- copy module files from Module target folder to Application target folder-->
       <plugin>
diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml
index 6a305fd..fd8f894 100644
--- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -45,58 +45,59 @@
   <properties>
     <compiler.debug>true</compiler.debug>
   </properties>
-
-
+  
   <build>
     <sourceDirectory>src/main/royale</sourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.royale.compiler</groupId>
-        <artifactId>royale-maven-plugin</artifactId>
-        <version>${royale.compiler.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <mainClass>App.mxml</mainClass>
-          <targets>JSRoyale</targets>
-          <debug>false</debug>
-          <htmlTemplate>${dollar}{basedir}/src/main/resources/jewel-example-index-template.html</htmlTemplate>
-          <additionalCompilerOptions>-source-map=true;</additionalCompilerOptions>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.royale.compiler</groupId>
-            <artifactId>compiler-jx</artifactId>
-            <version>${royale.compiler.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>nl.geodienstencentrum.maven</groupId>
-        <artifactId>sass-maven-plugin</artifactId>
-        <version>3.7.2</version>
-        <configuration>
-          <resources>
-            <resource>
-              <source>
-                <directory>${dollar}{basedir}/src/main/sass</directory>
-                <includes>
-                  <include>**/*.sass</include>
-                </includes>
-              </source>
-              <destination>${dollar}{basedir}/src/main/resources</destination>
-            </resource>
-          </resources>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-css-using-sass</id>
-            <goals>
-                <goal>update-stylesheets</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.royale.compiler</groupId>
+          <artifactId>royale-maven-plugin</artifactId>
+          <version>${royale.compiler.version}</version>
+          <extensions>true</extensions>
+          <configuration>
+            <mainClass>App.mxml</mainClass>
+            <targets>JSRoyale</targets>
+            <debug>false</debug>
+            <htmlTemplate>${dollar}{basedir}/src/main/resources/jewel-example-index-template.html</htmlTemplate>
+            <additionalCompilerOptions>-source-map=true;</additionalCompilerOptions>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.royale.compiler</groupId>
+              <artifactId>compiler-jx</artifactId>
+              <version>${royale.compiler.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>nl.geodienstencentrum.maven</groupId>
+          <artifactId>sass-maven-plugin</artifactId>
+          <version>3.7.2</version>
+          <configuration>
+            <resources>
+              <resource>
+                <source>
+                  <directory>${dollar}{basedir}/src/main/sass</directory>
+                  <includes>
+                    <include>**/*.sass</include>
+                  </includes>
+                </source>
+                <destination>${dollar}{basedir}/src/main/resources</destination>
+              </resource>
+            </resources>
+          </configuration>
+          <executions>
+            <execution>
+              <id>generate-css-using-sass</id>
+              <goals>
+                  <goal>update-stylesheets</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <dependencies>