geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r963922 - in /geronimo/devtools/maven-plugins/trunk: ./ maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/
Date Wed, 14 Jul 2010 01:58:17 GMT
Author: delos
Date: Wed Jul 14 01:58:17 2010
New Revision: 963922

URL: http://svn.apache.org/viewvc?rev=963922&view=rev
Log:
GERONIMODEVTOOLS-658 update maven-eclipsepde-plugin to version 1.1

Modified:
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java
    geronimo/devtools/maven-plugins/trunk/pom.xml

Modified: geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java?rev=963922&r1=963921&r2=963922&view=diff
==============================================================================
--- geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
(original)
+++ geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
Wed Jul 14 01:58:17 2010
@@ -169,8 +169,9 @@ public class InstallPluginDependenciesMo
 				fragment.setArtifactId(id.concat(".gtk.linux.ppc"));
 			else
 				fragment.setArtifactId(id.concat(".gtk.linux.x86"));
-		} else if (platform.startsWith("Mac")) {
-			fragment.setArtifactId(id.concat(".carbon.macosx"));
+		} else if (platform.startsWith("Mac")) {   
+		    //from eclipse 3.6, it only support mac cocoa, so here just use cocoa.macosx	    
+		    fragment.setArtifactId(id.concat(".cocoa.macosx"));
 		} else if (platform.startsWith("SunOS")) {
 			if (arch.startsWith("x86") || arch.startsWith("amd"))
 				fragment.setArtifactId(id.concat(".gtk.solaris.x86"));

Modified: geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java?rev=963922&r1=963921&r2=963922&view=diff
==============================================================================
--- geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java
(original)
+++ geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java
Wed Jul 14 01:58:17 2010
@@ -143,6 +143,11 @@ public class ManifestDependenciesMojo ex
 				for (int i = 0; i < elements.length; i++) {
 					ManifestElement element = elements[i];
 					String bundleId = element.getValue();
+					
+					//skip optional bundle.Since it's marked as optional, we don't have to compile against
it.
+					String resolution = element.getDirective(Constants.RESOLUTION_DIRECTIVE);
+					if (Constants.RESOLUTION_OPTIONAL.equals(resolution)) continue;
+					
 					if (exportedEntriesOnly) {
 						String visibility = element.getDirective(Constants.VISIBILITY_DIRECTIVE);
 						if (Constants.VISIBILITY_REEXPORT.equals(visibility)) {

Modified: geronimo/devtools/maven-plugins/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/pom.xml?rev=963922&r1=963921&r2=963922&view=diff
==============================================================================
--- geronimo/devtools/maven-plugins/trunk/pom.xml (original)
+++ geronimo/devtools/maven-plugins/trunk/pom.xml Wed Jul 14 01:58:17 2010
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>4</version>
+        <version>6</version>
     </parent>
 
     <description>Apache Geronimo Devtools Maven Plugins</description>
@@ -144,7 +144,8 @@
     </repositories>
 
     <modules>
-        <module>maven-emf-plugin</module>
+        <!--maven-emf-plugin is not in use any more-->
+        <!--module>maven-emf-plugin</module-->
         <module>maven-eclipsepde-plugin</module>
     </modules>
 



Mime
View raw message