You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/02/09 23:15:33 UTC
svn commit: r505528 - in /maven/sandbox/plugins/maven-bundle-plugin/src:
main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
Author: carlos
Date: Fri Feb 9 14:15:32 2007
New Revision: 505528
URL: http://svn.apache.org/viewvc?view=rev&rev=505528
Log:
Handle dated snapshot versions
Modified:
maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
maven/sandbox/plugins/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
Modified: maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java?view=diff&rev=505528&r1=505527&r2=505528
==============================================================================
--- maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java (original)
+++ maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java Fri Feb 9 14:15:32 2007
@@ -289,8 +289,22 @@
return version;
}
+ osgiVersion = version;
+
+ /* check for dated snapshot versions with only major or major and minor */
+ Pattern DATED_SNAPSHOT = Pattern.compile("([0-9])(\\.([0-9]))?\\-([0-9]{8}\\.[0-9]{6}\\-[0-9]*)");
+ m = DATED_SNAPSHOT.matcher(osgiVersion);
+ if (m.matches()) {
+ int i = m.groupCount();
+ String major = m.group(1);
+ String minor = ( m.group( 3 ) != null ) ? m.group( 3 ) : "0";
+ String service = "0";
+ String qualifier = m.group(4).replaceAll( "-", "_" ).replaceAll( "\\.", "_" );
+ osgiVersion = major + "." + minor + "." + service + "." + qualifier;
+ }
+
/* else transform first - to . and others to _ */
- osgiVersion = version.replaceFirst( "-", "\\." );
+ osgiVersion = osgiVersion.replaceFirst( "-", "\\." );
osgiVersion = osgiVersion.replaceAll( "-", "_" );
m = OSGI_VERSION_PATTERN.matcher(osgiVersion);
if (m.matches()) {
Modified: maven/sandbox/plugins/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java?view=diff&rev=505528&r1=505527&r2=505528
==============================================================================
--- maven/sandbox/plugins/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java (original)
+++ maven/sandbox/plugins/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java Fri Feb 9 14:15:32 2007
@@ -78,6 +78,12 @@
osgiVersion = plugin.convertVersionToOsgi( "1.0-alpha-16-20070122.203121-13" );
assertEquals( "1.0.0.alpha_16_20070122_203121_13", osgiVersion );
+
+ osgiVersion = plugin.convertVersionToOsgi( "1.0-20070119.021432-1" );
+ assertEquals( "1.0.0.20070119_021432_1", osgiVersion );
+
+ osgiVersion = plugin.convertVersionToOsgi( "1-20070119.021432-1" );
+ assertEquals( "1.0.0.20070119_021432_1", osgiVersion );
}
public void testReadExportedModules()