flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - - Added the express example to the maven build - Updated the tomcat version used in the integration test module - Made the tomcat download url more resilient against new versions - Fine-tuned the RAT exclusi
Date Wed, 05 Apr 2017 11:15:27 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop bacc59b71 -> 11ef21aae


- Added the express example to the maven build
- Updated the tomcat version used in the integration test module
- Made the tomcat download url more resilient against new versions
- Fine-tuned the RAT exclusions to be more resilient when compiling with different sets of
modules in the reactor
- Added some missing license headers


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/11ef21aa
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/11ef21aa
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/11ef21aa

Branch: refs/heads/develop
Commit: 11ef21aaefab6c4fe80612dfe19143b7c0c457a8
Parents: bacc59b
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Wed Apr 5 13:15:19 2017 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Wed Apr 5 13:15:19 2017 +0200

----------------------------------------------------------------------
 examples/examples-integrationtests/pom.xml  |  4 +-
 examples/express/DataBindingExample/pom.xml |  6 +-
 examples/express/pom.xml                    | 95 ++++++++++++++++++++++++
 examples/pom.xml                            |  1 +
 pom.xml                                     | 35 ++++-----
 5 files changed, 117 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/11ef21aa/examples/examples-integrationtests/pom.xml
----------------------------------------------------------------------
diff --git a/examples/examples-integrationtests/pom.xml b/examples/examples-integrationtests/pom.xml
index 36f2ddd..2c13b79 100644
--- a/examples/examples-integrationtests/pom.xml
+++ b/examples/examples-integrationtests/pom.xml
@@ -35,7 +35,7 @@
   <name>Apache Flex - FlexJS: Examples: Integrationtests</name>
 
   <properties>
-    <tomcat.version>8.5.12</tomcat.version>
+    <tomcat.version>8.5.13</tomcat.version>
   </properties>
 
   <profiles>
@@ -93,7 +93,7 @@
                 <containerId>tomcat8x</containerId>
                 <log>${project.build.directory}/tomcat8x/container.log</log>
                 <zipUrlInstaller>
-                  <url>http://www-us.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
+                  <url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url>
                   <extractDir>${java.io.tmpdir}/cargo/installs</extractDir>
                 </zipUrlInstaller>
                 <!-- 3 Minutes -->

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/11ef21aa/examples/express/DataBindingExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/express/DataBindingExample/pom.xml b/examples/express/DataBindingExample/pom.xml
index 58ff0fa..958cda3 100644
--- a/examples/express/DataBindingExample/pom.xml
+++ b/examples/express/DataBindingExample/pom.xml
@@ -24,15 +24,15 @@
 
   <parent>
     <groupId>org.apache.flex.flexjs.examples</groupId>
-    <artifactId>examples-flexjs</artifactId>
+    <artifactId>examples-express</artifactId>
     <version>0.8.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>DataBindingExample</artifactId>
+  <artifactId>DataBindingExample-Express</artifactId>
   <version>0.8.0-SNAPSHOT</version>
   <packaging>swf</packaging>
 
-  <name>Apache Flex - FlexJS: Examples: FlexJS: DataBindingExample</name>
+  <name>Apache Flex - FlexJS: Examples: Express: DataBindingExample</name>
 
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/11ef21aa/examples/express/pom.xml
----------------------------------------------------------------------
diff --git a/examples/express/pom.xml b/examples/express/pom.xml
new file mode 100644
index 0000000..e991497
--- /dev/null
+++ b/examples/express/pom.xml
@@ -0,0 +1,95 @@
+<?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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.flex.flexjs.examples</groupId>
+    <artifactId>examples</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>examples-express</artifactId>
+  <version>0.8.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>Apache Flex - FlexJS: Examples: Express</name>
+
+  <modules>
+    <module>DataBindingExample</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <id>tests-default</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <!-- Run the tests from the 'examples-tests' artifact -->
+              <dependenciesToScan>
+                <dependency>org.apache.flex.flexjs.examples:examples-tests</dependency>
+              </dependenciesToScan>
+              <systemPropertyVariables>
+                <artifactId>${project.artifactId}</artifactId>
+                <version>${project.version}</version>
+                <type>${project.packaging}</type>
+                <buildDirectory>${project.build.directory}</buildDirectory>
+              </systemPropertyVariables>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.flex.flexjs.framework</groupId>
+      <artifactId>Express</artifactId>
+      <version>0.8.0-SNAPSHOT</version>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.flex.flexjs.framework</groupId>
+      <artifactId>Language</artifactId>
+      <version>0.8.0-SNAPSHOT</version>
+      <type>swc</type>
+    </dependency>
+
+    <!-- Import the shared unit-tests we want to run on all examples -->
+    <dependency>
+      <groupId>org.apache.flex.flexjs.examples</groupId>
+      <artifactId>examples-tests</artifactId>
+      <version>0.8.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/11ef21aa/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index d5aba43..412ce1a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -39,6 +39,7 @@
   </properties>
 
   <modules>
+    <module>express</module>
     <module>flexjs</module>
     <module>native</module>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/11ef21aa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b7fb24..b882ead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,9 @@
   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">
+<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>
@@ -161,14 +163,6 @@
         </executions>
         <configuration>
           <excludes>
-            <!--
-              As the examples and distribution are not build in every case, we
-              have to exclude them. This skips the checks if they are not included
-              but if they are included, the checks inside distribution and examples
-              kick in and do the checks.
-            -->
-            <exclude>distribution/**</exclude>
-            <exclude>examples/**</exclude>
             <!-- JSON files can't contain comments -->
             <exclude>**/*.json</exclude>
             <!-- This is appended to the LICENSE file for binary packages-->
@@ -177,19 +171,22 @@
             <!-- Stuff that needs to be removed -->
             <exclude>fxg2svg/**</exclude>
             <exclude>vf2js/**</exclude>
-            <!-- frameworks/fb.properties contains Alex' path entries and should be removed
-->
-            <exclude>fb.properties</exclude>
             <!-- Should probably also be removed -->
             <exclude>js/*jshint*</exclude>
-            <!-- If checked in, they should have apache headers -->
+            <!-- FlashBuilder settings. frameworks/fb.properties contains Alex' path entries
and should be removed -->
+            <exclude>fb.properties</exclude>
+            <!-- FlashBuilder / Eclipse settings. If checked in, they should have apache
headers -->
             <exclude>**/.settings/**</exclude>
-            <!-- Examples needs to be fixed -->
-            <exclude>native/**</exclude>
-            <!-- After running the testsuite, the target directory is full of non-header
files -->
-            <exclude>testsuite/**</exclude>
-			<!-- Ignore IntelliJ IDEA project files -->
-			<exclude>**/*.iml</exclude>
-			<exclude>**/.idea/**</exclude>
+            <!-- Ignore IntelliJ IDEA project files -->
+            <exclude>**/*.iml</exclude>
+            <exclude>**/.idea/**</exclude>
+            <!--
+                Exclude any eventually existing content of target directories.
+                Some times when building with a bigger maven reactor and then
+                with a smaller one, RAT will complain about stuff still in the
+                target directories. We don't want that.
+            -->
+            <exclude>**/target/**</exclude>
           </excludes>
         </configuration>
         <dependencies>


Mime
View raw message