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 2017/12/09 17:23:59 UTC
[maven-osgi] 37/44: upgraded parent pom
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit c64147f061e67f3768b8835f17fee13c0a18bfb6
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Thu Oct 30 06:40:10 2014 +0000
upgraded parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1635405 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce2e59b..1d7d790 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
index 9bc9949..08f40f7 100644
--- a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
+++ b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
@@ -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() )
{
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.