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/06/28 15:58:01 UTC
git commit: [flex-utilities] [refs/heads/mavenizer-refactoring] -
FLEX-34318 - [Mavenizer] Refactor the Mavenizer in preparation of future
mavenized releases of Flex - Updated the pom generation as the first attempt
produced poms that didn't seem to work
Repository: flex-utilities
Updated Branches:
refs/heads/mavenizer-refactoring 4eb49a5e8 -> 07dc11939
FLEX-34318 - [Mavenizer] Refactor the Mavenizer in preparation of future mavenized releases of Flex
- Updated the pom generation as the first attempt produced poms that didn't seem to work.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/07dc1193
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/07dc1193
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/07dc1193
Branch: refs/heads/mavenizer-refactoring
Commit: 07dc1193924edd780b6ea6d4ca901ace21413c01
Parents: 4eb49a5
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Sat Jun 28 15:57:46 2014 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Sat Jun 28 15:57:46 2014 +0200
----------------------------------------------------------------------
.../base/src/main/resources/templates/pom.vm | 24 +++++---------------
.../converter/core/BatchConverter.java | 1 -
2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/07dc1193/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 5ccb0d1..917dff0 100644
--- a/mavenizer/converters/base/src/main/resources/templates/pom.vm
+++ b/mavenizer/converters/base/src/main/resources/templates/pom.vm
@@ -8,18 +8,6 @@
<packaging>${artifact.packaging}</packaging>
#if ( $artifact.hasDependencies() )
- <dependencies>
-#foreach( $dependency in $artifact.dependencies )
- <dependency>
- <groupId>${dependency.groupId}</groupId>
- <artifactId>${dependency.artifactId}</artifactId>
-#if ($dependency.packaging != "jar")
- <type>${dependency.packaging}</type>
-#end
- </dependency>
-#end
- </dependencies>
-
#if ( $artifact.isAtLeastOneDependencyRsl() )
<profiles>
<profile>
@@ -29,7 +17,7 @@
<activeByDefault>true</activeByDefault>
</activation>
- <dependencyManagement>
+ <dependencies>
#foreach( $dependency in $artifact.dependencies )
<dependency>
<groupId>${dependency.groupId}</groupId>
@@ -40,7 +28,7 @@
#end
</dependency>
#end
- </dependencyManagement>
+ </dependencies>
</profile>
<profile>
@@ -53,7 +41,7 @@
</property>
</activation>
- <dependencyManagement>
+ <dependencies>
#foreach( $dependency in $artifact.dependencies )
<dependency>
<groupId>${dependency.groupId}</groupId>
@@ -67,11 +55,11 @@
#end
</dependency>
#end
- </dependencyManagement>
+ </dependencies>
</profile>
</profiles>
#else
- <dependencyManagement>
+ <dependencies>
#foreach( $dependency in $artifact.dependencies )
<dependency>
<groupId>${dependency.groupId}</groupId>
@@ -82,7 +70,7 @@
#end
</dependency>
#end
- </dependencyManagement>
+ </dependencies>
#end
#end
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/07dc1193/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/BatchConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/BatchConverter.java b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/BatchConverter.java
index e1ed2b1..caf14cf 100644
--- a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/BatchConverter.java
+++ b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/BatchConverter.java
@@ -17,7 +17,6 @@
package org.apache.flex.utilities.converter.core;
import org.apache.flex.utilities.converter.air.AirConverter;
-import org.apache.flex.utilities.converter.exceptions.ConverterException;
import org.apache.flex.utilities.converter.flash.FlashConverter;
import org.apache.flex.utilities.converter.flex.FlexConverter;