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 2007/04/23 18:17:46 UTC
svn commit: r531522 - in
/geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde:
BundleManifestMojo.java InstallPluginDependenciesMojo.java
Author: sppatel
Date: Mon Apr 23 09:17:45 2007
New Revision: 531522
URL: http://svn.apache.org/viewvc?view=rev&rev=531522
Log:
ignore if snapshot not included in bundle version
Modified:
geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/BundleManifestMojo.java
geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
Modified: geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/BundleManifestMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/BundleManifestMojo.java?view=diff&rev=531522&r1=531521&r2=531522
==============================================================================
--- geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/BundleManifestMojo.java (original)
+++ geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/BundleManifestMojo.java Mon Apr 23 09:17:45 2007
@@ -65,7 +65,11 @@
Manifest manifest = new Manifest(fis);
attributes = manifest.getMainAttributes();
validate(Constants.BUNDLE_SYMBOLICNAME, project.getName() + ";singleton:=true");
- validate(Constants.BUNDLE_VERSION, project.getVersion());
+ String version = project.getVersion();
+ if(project.getVersion().endsWith("-SNAPSHOT")) {
+ version = version.substring(0,version.indexOf("-SNAPSHOT"));
+ }
+ validate(Constants.BUNDLE_VERSION, version);
validateBundleClasspath();
fis.close();
} catch (Exception e) {
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?view=diff&rev=531522&r1=531521&r2=531522
==============================================================================
--- 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 Mon Apr 23 09:17:45 2007
@@ -133,7 +133,7 @@
Dependency dependency = (Dependency) i.next();
if (GROUP_ID.equals(dependency.getGroupId())) {
getLog().debug("\n");
- getLog().debug("========== Processing Plug-in Dependency: " + dependency.getArtifactId() + "==========");
+ getLog().debug("========== Processing Plug-in Dependency: " + dependency.getArtifactId() + " ==========");
if ("org.eclipse.swt".equals(dependency.getArtifactId())) {
Dependency fragment = getSWTFragmentDependency(dependency);
processDependency(fragment);