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 2014/07/12 14:21:18 UTC
git commit: [flex-utilities] [refs/heads/mavenizer-refactoring] -
FLEX-34318 - [Mavenizer] Refactor the Mavenizer in preparation of future
mavenized releases of Flex - Removed the rsl profile as this would probably
cause a lot of maven problems. - Adjust
Repository: flex-utilities
Updated Branches:
refs/heads/mavenizer-refactoring d68f5fa3c -> 7583e96ed
FLEX-34318 - [Mavenizer] Refactor the Mavenizer in preparation of future mavenized releases of Flex
- Removed the rsl profile as this would probably cause a lot of maven problems.
- Adjusted the pom that it can be used to manage dependency versions as well as import dependencies themselves.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/7583e96e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/7583e96e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/7583e96e
Branch: refs/heads/mavenizer-refactoring
Commit: 7583e96edba93f46da2dd35c257b3e3de74f76d6
Parents: d68f5fa
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Sat Jul 12 14:21:02 2014 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Sat Jul 12 14:21:02 2014 +0200
----------------------------------------------------------------------
.../base/src/main/resources/templates/pom.vm | 60 +++-----------------
1 file changed, 9 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/7583e96e/mavenizer/converters/base/src/main/resources/templates/pom.vm
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/src/main/resources/templates/pom.vm b/mavenizer/converters/base/src/main/resources/templates/pom.vm
index 917dff0..6287cbe 100644
--- a/mavenizer/converters/base/src/main/resources/templates/pom.vm
+++ b/mavenizer/converters/base/src/main/resources/templates/pom.vm
@@ -8,57 +8,6 @@
<packaging>${artifact.packaging}</packaging>
#if ( $artifact.hasDependencies() )
-#if ( $artifact.isAtLeastOneDependencyRsl() )
- <profiles>
- <profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <dependencies>
-#foreach( $dependency in $artifact.dependencies )
- <dependency>
- <groupId>${dependency.groupId}</groupId>
- <artifactId>${dependency.artifactId}</artifactId>
- <version>${dependency.version}</version>
-#if ($dependency.packaging != "jar")
- <type>${dependency.packaging}</type>
-#end
- </dependency>
-#end
- </dependencies>
- </profile>
-
- <profile>
- <id>flex-rsl</id>
-
- <activation>
- <property>
- <name>flex.framework.scope</name>
- <value>rsl</value>
- </property>
- </activation>
-
- <dependencies>
-#foreach( $dependency in $artifact.dependencies )
- <dependency>
- <groupId>${dependency.groupId}</groupId>
- <artifactId>${dependency.artifactId}</artifactId>
- <version>${dependency.version}</version>
-#if ($dependency.packaging != "jar")
- <type>${dependency.packaging}</type>
-#end
-#if ($dependency.packaging == "swc" && $dependency.hasBinaryArtifact('rsl'))
- <scope>rsl</scope>
-#end
- </dependency>
-#end
- </dependencies>
- </profile>
- </profiles>
-#else
<dependencies>
#foreach( $dependency in $artifact.dependencies )
<dependency>
@@ -71,7 +20,16 @@
</dependency>
#end
</dependencies>
+
+ <dependencyManagement>
+#foreach( $dependency in $artifact.dependencies )
+ <dependency>
+ <groupId>${dependency.groupId}</groupId>
+ <artifactId>${dependency.artifactId}</artifactId>
+ <version>${dependency.version}</version>
+ </dependency>
#end
+ </dependencyManagement>
#end
</project>