You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/09/07 22:40:43 UTC
[42/50] git commit: [flex-falcon] [refs/heads/master] - Removed the
profiles utils and compiler and removed the enforcer rule to check for
profile activation
Removed the profiles utils and compiler and removed the enforcer rule to check for profile activation
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/730f8ed1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/730f8ed1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/730f8ed1
Branch: refs/heads/master
Commit: 730f8ed1bf21e7f90310dcf92508d68af881cb56
Parents: 6c1df69
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Sep 5 10:17:25 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Sep 5 10:17:25 2016 +0200
----------------------------------------------------------------------
pom.xml | 91 ++++++++----------------------------------------------------
1 file changed, 12 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/730f8ed1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb1b0d4..2b3aef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,18 @@
</mailingList>
</mailingLists>
+ <modules>
+ <module>compiler</module>
+ <module>compiler-jx</module>
+ <module>compiler-test-utils</module>
+ <module>debugger</module>
+ <module>flex-compiler-oem</module>
+ <module>flexjs-ant-tasks</module>
+ <!-- Commented out for now -->
+ <!--module>flexjs-maven-extension</module-->
+ <module>flexjs-maven-plugin</module>
+ </modules>
+
<!--
As the compiler needs artifacts that are part of this project, the build
will fail, if the utility artifacts compiler-build-tools or compiler-jburg-types
@@ -104,55 +116,6 @@
-->
<profiles>
<profile>
- <id>utils</id>
- <properties>
- <active-profile>utils</active-profile>
- </properties>
- <modules>
- <module>compiler-build-tools</module>
- <module>compiler-jburg-types</module>
- </modules>
-
- <!-- For now we'll skip RAT for the utils profile -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <includes>
- <include>compiler-build-tools/**</include>
- <include>compiler-jburg-types/**</include>
- </includes>
- <excludes/>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>compiler</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <active-profile>compiler</active-profile>
- </properties>
- <modules>
- <module>compiler</module>
- <module>compiler-jx</module>
- <module>compiler-test-utils</module>
- <module>debugger</module>
- <module>flex-compiler-oem</module>
- <module>flexjs-ant-tasks</module>
- <!-- Commented out for now -->
- <!--module>flexjs-maven-extension</module-->
- <module>flexjs-maven-plugin</module>
- </modules>
- </profile>
-
- <profile>
<id>apache-release</id>
<properties>
<website.path>${project.version}</website.path>
@@ -208,36 +171,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- <executions>
- <execution>
- <id>enforce at least one profile activation</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <!--
- The profiles are only available if they are defined in the
- current pom. So we would have to define all profiles in each
- child pom. Using a property defined in the profiles makes this
- property available in all children, so we use this to check
- if a profile was selected.
- -->
- <requireProperty>
- <property>active-profile</property>
- <message>You must select one of the profiles 'utils', 'compiler' or 'externs' using the '-P{profilename}' commandline option</message>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>