You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/30 07:40:10 UTC
svn commit: r1635405 - in /maven/shared/trunk/maven-osgi: pom.xml
src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
Author: hboutemy
Date: Thu Oct 30 06:40:10 2014
New Revision: 1635405
URL: http://svn.apache.org/r1635405
Log:
upgraded parent pom
Modified:
maven/shared/trunk/maven-osgi/pom.xml
maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
Modified: maven/shared/trunk/maven-osgi/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi/pom.xml?rev=1635405&r1=1635404&r2=1635405&view=diff
==============================================================================
--- maven/shared/trunk/maven-osgi/pom.xml (original)
+++ maven/shared/trunk/maven-osgi/pom.xml Thu Oct 30 06:40:10 2014
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
Modified: maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java?rev=1635405&r1=1635404&r2=1635405&view=diff
==============================================================================
--- maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java (original)
+++ maven/shared/trunk/maven-osgi/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java Thu Oct 30 06:40:10 2014
@@ -56,6 +56,14 @@ public class DefaultMaven2OsgiConverter
/** pattern that matches strings that contain only numbers */
private static final Pattern ONLY_NUMBERS = Pattern.compile( "[0-9]+" );
+ private static final Pattern DATED_SNAPSHOT =
+ Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9]))?\\-([0-9]{8}\\.[0-9]{6}\\-[0-9]*)" );
+
+ private static final Pattern DOTS_IN_QUALIFIER =
+ Pattern.compile( "([0-9])(\\.[0-9])?\\.([0-9A-Za-z_-]+)\\.([0-9A-Za-z_-]+)" );
+
+ private static final Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9A-Za-z_-]+))?" );
+
private static final String FILE_SEPARATOR = System.getProperty( "file.separator" );
private String getBundleSymbolicName( String groupId, String artifactId )
@@ -251,7 +259,6 @@ public class DefaultMaven2OsgiConverter
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]))?\\-([0-9]{8}\\.[0-9]{6}\\-[0-9]*)" );
m = DATED_SNAPSHOT.matcher( osgiVersion );
if ( m.matches() )
{
@@ -272,7 +279,6 @@ public class DefaultMaven2OsgiConverter
}
/* remove dots in the middle of the qualifier */
- Pattern DOTS_IN_QUALIFIER = Pattern.compile( "([0-9])(\\.[0-9])?\\.([0-9A-Za-z_-]+)\\.([0-9A-Za-z_-]+)" );
m = DOTS_IN_QUALIFIER.matcher( osgiVersion );
if ( m.matches() )
{
@@ -298,8 +304,6 @@ public class DefaultMaven2OsgiConverter
* 1 -> 1.0.0
* 1.1 -> 1.1.0
*/
- //Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?\\.([0-9A-Za-z_-]+)" );
- Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9A-Za-z_-]+))?" );
m = NEED_TO_FILL_ZEROS.matcher( osgiVersion );
if ( m.matches() )
{