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/08 20:12:16 UTC
[royale-asjs] branch develop updated: archetypes: some fixes and
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 c358fa9 archetypes: some fixes and improvements
c358fa9 is described below
commit c358fa9dc9c5386423576411c1a48c9ff90e6012
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Sep 8 22:12:04 2020 +0200
archetypes: some fixes and improvements
---
.../archetype-resources/.vscode/tasks.json | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 18 ++++++++----
.../archetype-resources/.vscode/tasks.json | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 17 ++++++++----
.../src/main/resources/archetype-resources/pom.xml | 32 ++++++++++++++++++----
5 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json
index f442989..597385f 100644
--- a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json
+++ b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json
@@ -12,7 +12,7 @@
"args": [
"clean",
"install",
- "-P option-with-swf",
+ // "-P option-with-swf",
"-DskipTests"
],
"group": "build",
diff --git a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
index 4b5e286..4cce7e3 100644
--- a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -23,6 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ <relativePath />
+ </parent>
+
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
@@ -56,11 +63,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
- <plugin>
<groupId>nl.geodienstencentrum.maven</groupId>
<artifactId>sass-maven-plugin</artifactId>
<version>3.7.2</version>
@@ -95,6 +97,7 @@
<artifactId>Core</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -102,6 +105,7 @@
<artifactId>Basic</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -109,6 +113,7 @@
<artifactId>Jewel</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -125,6 +130,7 @@
<artifactId>Icons</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<!-- Needed for JavaScript compilation -->
@@ -133,7 +139,9 @@
<artifactId>HTML</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
+
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Language</artifactId>
diff --git a/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json b/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json
index f442989..597385f 100644
--- a/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json
+++ b/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/.vscode/tasks.json
@@ -12,7 +12,7 @@
"args": [
"clean",
"install",
- "-P option-with-swf",
+ // "-P option-with-swf",
"-DskipTests"
],
"group": "build",
diff --git a/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/pom.xml
index 3343fe1..2d14bb6 100644
--- a/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-jewel-crux-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -23,6 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ <relativePath />
+ </parent>
+
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
@@ -64,11 +71,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
- <plugin>
<groupId>nl.geodienstencentrum.maven</groupId>
<artifactId>sass-maven-plugin</artifactId>
<version>3.7.2</version>
@@ -103,6 +105,7 @@
<artifactId>Core</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -110,6 +113,7 @@
<artifactId>Basic</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -117,6 +121,7 @@
<artifactId>Jewel</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -133,6 +138,7 @@
<artifactId>Icons</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -165,6 +171,7 @@
<artifactId>HTML</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
diff --git a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
index d75b94e..6e3cca3 100644
--- a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -22,6 +22,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ <relativePath />
+ </parent>
+
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
@@ -53,11 +60,6 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
</plugins>
</build>
@@ -67,6 +69,7 @@
<artifactId>Core</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -74,6 +77,7 @@
<artifactId>Basic</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<!-- Needed for JavaScript compilation -->
@@ -82,7 +86,9 @@
<artifactId>HTML</artifactId>
<version>${royale.framework.version}</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
+
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Language</artifactId>
@@ -111,6 +117,22 @@
<type>swc</type>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>${royale.framework.version}</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
</dependencies>
</profile>
</profiles>