This is an automated email from the ASF dual-hosted git repository.
cdutz 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 edb8700 - Added the ACE framework module to the Maven build -
Fine-Tuned the distribtuion: Added missing libraries
edb8700 is described below
commit edb870030f5d03b2a682753f811d7f561e631ecd
Author: Christofer Dutz <[email protected]>
AuthorDate: Mon Feb 22 12:06:03 2021 +0100
- Added the ACE framework module to the Maven build
- Fine-Tuned the distribtuion: Added missing libraries
---
distribution/pom.xml | 146 +++++++++++++++++++++++++++++++----
frameworks/projects/Ace/pom.xml | 14 ++++
frameworks/projects/pom.xml | 3 +-
frameworks/themes/JewelTheme/pom.xml | 37 ++++-----
4 files changed, 166 insertions(+), 34 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 889a223..c1b91d8 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -89,6 +89,20 @@
<!-- Add the framework js-swc modules -->
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Ace</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>Binding</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
@@ -124,6 +138,13 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Crux</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>DragDrop</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
@@ -194,6 +215,27 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Icons</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>JewelTheme</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>JQuery</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
@@ -222,14 +264,14 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
+ <artifactId>MXRoyale</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Icons</artifactId>
+ <artifactId>Network</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
@@ -243,35 +285,56 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Storage</artifactId>
+ <artifactId>RoyaleSite</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>XML</artifactId>
+ <artifactId>RoyaleUnit</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>TLF</artifactId>
+ <artifactId>RoyaleUnitUI</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
+ <artifactId>SparkRoyale</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Crux</artifactId>
+ <artifactId>Storage</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Text</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>TLF</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>XML</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
@@ -280,6 +343,13 @@
<!-- Add dependencies to the externs from the compiler module -->
<dependency>
<groupId>org.apache.royale.typedefs</groupId>
+ <artifactId>royale-typedefs-ace</artifactId>
+ <version>${royale.typedefs.version}</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.typedefs</groupId>
<artifactId>royale-typedefs-cordova</artifactId>
<version>${royale.typedefs.version}</version>
<type>swc</type>
@@ -575,6 +645,12 @@
<!-- Add the framework swc modules -->
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>Binding</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
@@ -605,6 +681,12 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Crux</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>DragDrop</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
@@ -665,6 +747,24 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Icons</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>JewelTheme</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>JQuery</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
@@ -689,13 +789,13 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
+ <artifactId>MXRoyale</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Icons</artifactId>
+ <artifactId>Network</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
</dependency>
@@ -707,31 +807,49 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Storage</artifactId>
+ <artifactId>RoyaleSite</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>XML</artifactId>
+ <artifactId>RoyaleUnit</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>TLF</artifactId>
+ <artifactId>RoyaleUnitUI</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
+ <artifactId>SparkRoyale</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Crux</artifactId>
+ <artifactId>Storage</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Text</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>TLF</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>XML</artifactId>
<version>0.9.8-SNAPSHOT</version>
<type>swc</type>
</dependency>
diff --git a/frameworks/projects/Ace/pom.xml b/frameworks/projects/Ace/pom.xml
index 9d4b0b2..ae47e04 100644
--- a/frameworks/projects/Ace/pom.xml
+++ b/frameworks/projects/Ace/pom.xml
@@ -78,6 +78,13 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>JQuery</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.royale.typedefs</groupId>
@@ -107,6 +114,13 @@
<type>swc</type>
<classifier>swf</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>JQuery</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
</dependencies>
</profile>
</profiles>
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index ef4742d..9e09e3f 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -44,8 +44,7 @@
<name>Apache Royale: Framework: Libs</name>
<modules>
- <!-- Disabled because it requires an ACE typedef and that isn't available
in the Maven build yet -->
- <!--module>Ace</module-->
+ <module>Ace</module>
<module>Basic</module>
<module>Binding</module>
<module>Charts</module>
diff --git a/frameworks/themes/JewelTheme/pom.xml
b/frameworks/themes/JewelTheme/pom.xml
index cc68b29..372a8c4 100644
--- a/frameworks/themes/JewelTheme/pom.xml
+++ b/frameworks/themes/JewelTheme/pom.xml
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
---><project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
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>
