|
 |
ad18db |
From e0ba1232e2e65ffb4745901c7111ab3f4e82ac67 Mon Sep 17 00:00:00 2001
|
|
|
ad18db |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
ad18db |
Date: Wed, 12 Oct 2016 23:43:00 +0200
|
|
|
ad18db |
Subject: [PATCH 4/4] Use Maven 3 APIs
|
|
|
ad18db |
|
|
|
ad18db |
---
|
|
|
ad18db |
pom.xml | 17 +++++++++++------
|
|
|
ad18db |
.../org/apache/felix/bundleplugin/BundlePlugin.java | 4 ++--
|
|
|
ad18db |
2 files changed, 13 insertions(+), 8 deletions(-)
|
|
|
ad18db |
|
|
|
ad18db |
diff --git a/pom.xml b/pom.xml
|
|
|
ad18db |
index ca63d8d..ac8ca9a 100644
|
|
|
ad18db |
--- a/pom.xml
|
|
|
ad18db |
+++ b/pom.xml
|
|
|
ad18db |
@@ -177,7 +177,17 @@
|
|
|
ad18db |
<dependency>
|
|
|
ad18db |
<groupId>org.apache.maven</groupId>
|
|
|
ad18db |
<artifactId>maven-core</artifactId>
|
|
|
ad18db |
- <version>2.2.0</version>
|
|
|
ad18db |
+ <version>3.3.9</version>
|
|
|
ad18db |
+ </dependency>
|
|
|
ad18db |
+ <dependency>
|
|
|
ad18db |
+ <groupId>org.apache.maven</groupId>
|
|
|
ad18db |
+ <artifactId>maven-compat</artifactId>
|
|
|
ad18db |
+ <version>3.3.9</version>
|
|
|
ad18db |
+ </dependency>
|
|
|
ad18db |
+ <dependency>
|
|
|
ad18db |
+ <groupId>org.apache.maven.reporting</groupId>
|
|
|
ad18db |
+ <artifactId>maven-reporting-impl</artifactId>
|
|
|
ad18db |
+ <version>2.4</version>
|
|
|
ad18db |
</dependency>
|
|
|
ad18db |
<dependency>
|
|
|
ad18db |
<groupId>org.apache.maven</groupId>
|
|
|
ad18db |
@@ -221,11 +231,6 @@
|
|
|
ad18db |
<version>1.1</version>
|
|
|
ad18db |
<scope>test</scope>
|
|
|
ad18db |
</dependency>
|
|
|
ad18db |
- <dependency>
|
|
|
ad18db |
- <groupId>org.jdom</groupId>
|
|
|
ad18db |
- <artifactId>jdom</artifactId>
|
|
|
ad18db |
- <version>1.1</version>
|
|
|
ad18db |
- </dependency>
|
|
|
ad18db |
</dependencies>
|
|
|
ad18db |
|
|
|
ad18db |
<reporting>
|
|
|
ad18db |
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
|
|
ad18db |
index 9ebd1a4..27d9dc4 100644
|
|
|
ad18db |
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
|
|
ad18db |
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
|
|
ad18db |
@@ -46,7 +46,6 @@ import java.util.TreeMap;
|
|
|
ad18db |
import java.util.jar.Attributes;
|
|
|
ad18db |
import java.util.jar.Manifest;
|
|
|
ad18db |
|
|
|
ad18db |
-import org.apache.felix.bundleplugin.pom.PomWriter;
|
|
|
ad18db |
import org.apache.maven.archiver.ManifestSection;
|
|
|
ad18db |
import org.apache.maven.archiver.MavenArchiveConfiguration;
|
|
|
ad18db |
import org.apache.maven.archiver.MavenArchiver;
|
|
|
ad18db |
@@ -63,6 +62,7 @@ import org.apache.maven.model.Exclusion;
|
|
|
ad18db |
import org.apache.maven.model.License;
|
|
|
ad18db |
import org.apache.maven.model.Model;
|
|
|
ad18db |
import org.apache.maven.model.Resource;
|
|
|
ad18db |
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
|
|
|
ad18db |
import org.apache.maven.plugin.AbstractMojo;
|
|
|
ad18db |
import org.apache.maven.plugin.MojoExecutionException;
|
|
|
ad18db |
import org.apache.maven.plugin.MojoFailureException;
|
|
|
ad18db |
@@ -861,7 +861,7 @@ public class BundlePlugin extends AbstractMojo
|
|
|
ad18db |
|
|
|
ad18db |
try
|
|
|
ad18db |
{
|
|
|
ad18db |
- PomWriter.write( w, model, true );
|
|
|
ad18db |
+ new MavenXpp3Writer().write( w, model );
|
|
|
ad18db |
}
|
|
|
ad18db |
finally
|
|
|
ad18db |
{
|
|
|
ad18db |
--
|
|
|
ad18db |
2.9.3
|
|
|
ad18db |
|