You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/03/14 23:02:19 UTC
svn commit: r385907 - in /geronimo/devtools/eclipse-plugin/trunk:
maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
pom.xml
Author: sppatel
Date: Tue Mar 14 14:02:19 2006
New Revision: 385907
URL: http://svn.apache.org/viewcvs?rev=385907&view=rev
Log:
m2 fix building single modules
Modified:
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
geronimo/devtools/eclipse-plugin/trunk/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java?rev=385907&r1=385906&r2=385907&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java Tue Mar 14 14:02:19 2006
@@ -47,7 +47,7 @@
public class InstallPluginDependenciesMojo extends AbstractMojo {
private static final String GROUP_ID = "org.eclipse.plugins";
-
+
/**
* @parameter expression="${project}"
*/
@@ -78,6 +78,11 @@
* @readonly
*/
protected ArtifactRepository localRepository;
+
+ /**
+ * @parameter expression="${useDistributionVersions}"
+ */
+ protected boolean useDistributionVersion;
public InstallPluginDependenciesMojo() {
super();
@@ -144,7 +149,8 @@
File bundle = getBundle(file, depth);
if (getArtifactID(file, bundle).equals(dependency.getArtifactId())) {
install(file, bundle);
- if ("DISTRO".equals(dependency.getVersion()))
+ //if ("DISTRO".equals(dependency.getVersion()))
+ if(useDistributionVersion)
dependency.setVersion(getBundleVersion(bundle));
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=385907&r1=385906&r2=385907&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Tue Mar 14 14:02:19 2006
@@ -130,7 +130,7 @@
<wtpUrl>http://download.eclipse.org/webtools/downloads/drops/R-1.0.1-200602171228/wtp-sdk-R-1.0.1-200602171228.zip</wtpUrl>
<!-- Eclipse Project Distro Versions -->
<platformVersion>3.1.2</platformVersion>
- <emfVersion>2.1.2</emfVersion>
+ <emfVersion>[2.1.0,2.1.2)</emfVersion>
<jemVersion>3.1.1</jemVersion>
<wtpVersion>1.1.0.1</wtpVersion>
<!-- Eclipse Platform Dependencies -->