You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2019/09/04 14:30:19 UTC
[sling-slingstart-maven-plugin] 01/01: SLING-8656 use bnd for Maven
to OSGi version conversion
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/SLING-8656_usebnd-for-version-conversion
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 52bd32988117ca559732ba200a648824f713bcbb
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Sep 4 16:30:07 2019 +0200
SLING-8656 use bnd for Maven to OSGi version conversion
---
pom.xml | 7 ++---
.../maven/slingstart/FeatureModelConverter.java | 30 +++++++++++-----------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e82e5a..a0d365c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,10 +198,11 @@
<version>3.4</version>
<scope>provided</scope>
</dependency>
+ <!-- for converting Maven to OSGi versions -->
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-osgi</artifactId>
- <version>0.2.0</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
index bbb2d19..67e7d92 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
@@ -16,14 +16,24 @@
*/
package org.apache.sling.maven.slingstart;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.maven.MavenExecutionException;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
-import org.apache.maven.shared.osgi.Maven2OsgiConverter;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.builder.FeatureProvider;
@@ -32,17 +42,7 @@ import org.apache.sling.feature.modelconverter.FeatureToProvisioning;
import org.apache.sling.maven.slingstart.ModelPreprocessor.Environment;
import org.apache.sling.maven.slingstart.ModelPreprocessor.ProjectInfo;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import aQute.bnd.version.MavenVersion;
public class FeatureModelConverter {
static final String BUILD_DIR = "provisioning/converted";
@@ -196,7 +196,7 @@ public class FeatureModelConverter {
sb.append('.');
sb.append(dav.getQualifier());
}
- final Maven2OsgiConverter converter = new DefaultMaven2OsgiConverter();
- return converter.getVersion(sb.toString());
+ final MavenVersion mavenVersion = new MavenVersion(sb.toString());
+ return mavenVersion.getOSGiVersion().toString();
}
}