- 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-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9f793c69 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9f793c69 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9f793c69 Branch: refs/heads/feature/chart-work Commit: 9f793c69c8d0260602f9040de47bfc66ad514f8f Parents: d87235f Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Wed Apr 5 13:15:19 2017 +0200 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Wed Apr 5 13:15:19 2017 +0200 ---------------------------------------------------------------------- .../flexjs/extension/FlexJsLanguageSupport.java | 14 ++++++++++++++ .../flexjs/extension/FlexJsScopeDeriver.java | 14 ++++++++++++++ .../flexjs/extension/FlexJsScopeSelector.java | 14 ++++++++++++++ pom.xml | 18 ++++++++++++++---- 4 files changed, 56 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f793c69/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsLanguageSupport.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsLanguageSupport.java b/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsLanguageSupport.java index 054c63a..f3d9266 100644 --- a/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsLanguageSupport.java +++ b/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsLanguageSupport.java @@ -1,3 +1,17 @@ +/* + * Licensed 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. + */ + package org.apache.flex.maven.flexjs.extension; import org.apache.maven.repository.internal.LanguageSupport; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f793c69/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeDeriver.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeDeriver.java b/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeDeriver.java index c57083f..23af0ac 100644 --- a/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeDeriver.java +++ b/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeDeriver.java @@ -1,3 +1,17 @@ +/* + * Licensed 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. + */ + package org.apache.flex.maven.flexjs.extension; import org.eclipse.aether.RepositoryException; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f793c69/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeSelector.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeSelector.java b/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeSelector.java index b58e580..2d7811e 100644 --- a/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeSelector.java +++ b/flexjs-maven-extension/src/main/java/org/apache/flex/maven/flexjs/extension/FlexJsScopeSelector.java @@ -1,3 +1,17 @@ +/* + * Licensed 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. + */ + package org.apache.flex.maven.flexjs.extension; import org.eclipse.aether.RepositoryException; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f793c69/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8a013ad..0f34fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -146,10 +146,20 @@ <exclude>README*</exclude> <exclude>RELEASE_NOTES*</exclude> <!-- Modules which are excluded from the build --> - <exclude>compiler-build-tools/**</exclude> - <exclude>compiler-jburg-types/**</exclude> - <exclude>flexjs-maven-extension/**</exclude> - <exclude>externs/**</exclude> + <!-- 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> + <!-- 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> <!-- Stuff an Ant build might have left behind. --> <exclude>lib/**</exclude> </excludes>