flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-falcon] [refs/heads/featue/flexjs-ant-tasks] - - Updated the apache parent version to 18 - Decoupled the compiler-build-tools, compiler-jburg-types and flexjs-maven-plugin from the main build (changed the parent to apache:18) to allow s
Date Sat, 09 Jul 2016 10:27:10 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/featue/flexjs-ant-tasks dfe370ad8 -> b77ea32df


- Updated the apache parent version to 18
- Decoupled the compiler-build-tools, compiler-jburg-types and flexjs-maven-plugin from the
main build (changed the parent to apache:18) to allow separate maven released of the modules
- Updated the versions of compiler-build-tools and compiler-jburg-types to 1.0.0-SNAPSHOT
as they will probably only be released once (at least for now)


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

Branch: refs/heads/featue/flexjs-ant-tasks
Commit: b77ea32df49fad869f0902bfffa27fb6f6bfaa37
Parents: dfe370a
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Sat Jul 9 12:26:33 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Sat Jul 9 12:26:33 2016 +0200

----------------------------------------------------------------------
 compiler-build-tools/pom.xml |  8 ++++----
 compiler-jburg-types/pom.xml |  8 ++++----
 compiler/pom.xml             |  6 +++---
 debugger/pom.xml             |  8 ++++----
 externs/js/pom.xml           |  2 +-
 flexjs-maven-plugin/pom.xml  | 10 +++++++---
 pom.xml                      |  5 ++++-
 7 files changed, 27 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b77ea32d/compiler-build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/compiler-build-tools/pom.xml b/compiler-build-tools/pom.xml
index 42e0541..cf3a89f 100644
--- a/compiler-build-tools/pom.xml
+++ b/compiler-build-tools/pom.xml
@@ -22,14 +22,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.flex.flexjs</groupId>
-    <artifactId>flexjs-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>18</version>
   </parent>
 
   <groupId>org.apache.flex.flexjs.compiler</groupId>
   <artifactId>compiler-build-tools</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Flex - FlexJS: Build Tools</name>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b77ea32d/compiler-jburg-types/pom.xml
----------------------------------------------------------------------
diff --git a/compiler-jburg-types/pom.xml b/compiler-jburg-types/pom.xml
index 4d9b6bd..5be3595 100644
--- a/compiler-jburg-types/pom.xml
+++ b/compiler-jburg-types/pom.xml
@@ -22,14 +22,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.flex.flexjs</groupId>
-    <artifactId>flexjs-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>18</version>
   </parent>
 
   <groupId>org.apache.flex.flexjs.compiler</groupId>
   <artifactId>compiler-jburg-types</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 
   <name>Apache Flex - FlexJS: JBurg Types</name>
   <description>Types needed by JBurg to perform it's code generation.</description>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b77ea32d/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 8872035..168d4ff 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -202,7 +202,7 @@
           <dependency>
             <groupId>org.apache.flex.flexjs.compiler</groupId>
             <artifactId>compiler-jburg-types</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
+            <version>${compiler-jburg-types.version}</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -250,7 +250,7 @@
       <plugin>
         <groupId>org.apache.flex.flexjs.compiler</groupId>
         <artifactId>compiler-build-tools</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>${compiler-build-tools.version}</version>
         <executions>
           <execution>
             <id>generate-unknown-tree-handler</id>
@@ -371,7 +371,7 @@
     <dependency>
       <groupId>org.apache.flex.flexjs.compiler</groupId>
       <artifactId>compiler-jburg-types</artifactId>
-      <version>0.7.0-SNAPSHOT</version>
+      <version>${compiler-jburg-types.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.flex</groupId>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b77ea32d/debugger/pom.xml
----------------------------------------------------------------------
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 465108e..7d2dea4 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -73,7 +73,7 @@ Do all the JBurg code generation.
           <dependency>
             <groupId>org.apache.flex.flexjs.compiler</groupId>
             <artifactId>compiler-jburg-types</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
+            <version>${compiler-build-tools.version}</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -118,12 +118,12 @@ Do all the JBurg code generation.
       <version>0.0-20150902-b129bb9e</version>
     </dependency>
 
-    <dependency>
+    <!--dependency>
       <groupId>org.apache.flex.flexjs.compiler</groupId>
       <artifactId>compiler-build-tools</artifactId>
-      <version>0.7.0-SNAPSHOT</version>
+      <version>${compiler-build-tools.version}</version>
       <scope>test</scope>
-    </dependency>
+    </dependency-->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b77ea32d/externs/js/pom.xml
----------------------------------------------------------------------
diff --git a/externs/js/pom.xml b/externs/js/pom.xml
index 0ab1c3c..1d7d614 100644
--- a/externs/js/pom.xml
+++ b/externs/js/pom.xml
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.flex.flexjs.compiler</groupId>
         <artifactId>compiler-build-tools</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>${compiler-build-tools.version}</version>
         <executions>
           <execution>
             <id>unpack-closure-externs</id>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b77ea32d/flexjs-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/pom.xml b/flexjs-maven-plugin/pom.xml
index 06e593c..31f1994 100644
--- a/flexjs-maven-plugin/pom.xml
+++ b/flexjs-maven-plugin/pom.xml
@@ -22,9 +22,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.flex.flexjs</groupId>
-    <artifactId>flexjs-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>18</version>
   </parent>
 
   <groupId>org.apache.flex.flexjs.compiler</groupId>
@@ -34,6 +34,10 @@
 
   <name>Apache Flex - FlexJS: Maven Plugin</name>
 
+  <properties>
+    <maven.version>3.3.1</maven.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>javax.inject</groupId>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b77ea32d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c81eec6..7ff50bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>17</version>
+    <version>18</version>
   </parent>
 
   <groupId>org.apache.flex.flexjs</groupId>
@@ -51,6 +51,9 @@
     <flash.version>20.0</flash.version>
     <air.version>20.0</air.version>
 
+    <compiler-build-tools.version>1.0.0-SNAPSHOT</compiler-build-tools.version>
+    <compiler-jburg-types.version>1.0.0-SNAPSHOT</compiler-jburg-types.version>
+
     <!-- URL of the ASF SonarQube server -->
     <sonar.host.url>https://analysis.apache.org/</sonar.host.url>
     <!-- Tell sonar where the coverage reports are located -->


Mime
View raw message