You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/05/19 08:28:25 UTC
[2/2] git commit: [flex-falcon] [refs/heads/develop] - - Removed the
usage of the generated manifests in the build
- Removed the usage of the generated manifests in the build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/177ec8e2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/177ec8e2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/177ec8e2
Branch: refs/heads/develop
Commit: 177ec8e214d6b0d7a473e1c60b07758e9d23ed05
Parents: a5c9118
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu May 19 10:28:06 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu May 19 10:28:06 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java | 4 ++--
.../src/main/resources/META-INF/plexus/components.xml | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/177ec8e2/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
index 3bffef1..0b8b9df 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@ -100,7 +100,7 @@ public class CompileAppMojo
/**
* @return list of the explicitly defined as well as the automatically detected namespaces.
*/
- @Override
+ /*@Override
@SuppressWarnings("unchecked")
protected Namespace[] getNamespaces() {
File namespaceDir = new File(outputDirectory, namespaceDirectory);
@@ -142,7 +142,7 @@ public class CompileAppMojo
}
}
return super.getNamespaces();
- }
+ }*/
@Override
protected boolean includeLibrary(Artifact library) {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/177ec8e2/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index 384e3b3..477a2bb 100644
--- a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -75,9 +75,6 @@
<lifecycle>
<id>default</id>
<phases>
- <generate-resources>
- org.apache.flex.flexjs.compiler:flexjs-maven-plugin:generate-manifests
- </generate-resources>
<process-resources>
org.apache.maven.plugins:maven-resources-plugin:resources
</process-resources>