FELIX-5029 : Update to bnd 3.0.0
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1702306 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/maven-bundle-plugin/pom.xml b/tools/maven-bundle-plugin/pom.xml
index 71a4208..283d402 100644
--- a/tools/maven-bundle-plugin/pom.xml
+++ b/tools/maven-bundle-plugin/pom.xml
@@ -68,14 +68,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
</plugin>
<plugin>
@@ -88,37 +80,9 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>biz.aQute.bnd:*</include>
- </includes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>local</id>
- <layout>default</layout>
- <url>file:${basedir}/src/repo</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -128,7 +92,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>20150713</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
index be323b2..1e1d025 100644
--- a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -120,7 +120,14 @@
}
finally
{
- analyzer.close();
+ try
+ {
+ analyzer.close();
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Error trying to write Manifest to file " + outputFile, e );
+ }
}
}
diff --git a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-javadoc.jar b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-javadoc.jar
deleted file mode 100644
index c0108da..0000000
--- a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-sources.jar b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-sources.jar
deleted file mode 100644
index 7ae6c2f..0000000
--- a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-sources.jar
+++ /dev/null
Binary files differ
diff --git a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.jar b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.jar
deleted file mode 100644
index 7142bee..0000000
--- a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.jar
+++ /dev/null
Binary files differ
diff --git a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.pom b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.pom
deleted file mode 100644
index 7c83be4..0000000
--- a/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.pom
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>20150713/version>
- <description>A Swiss Army Knife for OSGi</description>
- <name>bndlib</name>
- <url>http://bnd.bndtools.org/</url>
- <organization>
- <name>Bndtools</name>
- <url>http://bndtools.org/</url>
- </organization>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.opensource.org/licenses/apache2.0.php</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>https://github.com/bndtools/bnd</url>
- <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
- <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
- </scm>
- <developers>
- <developer>
- <id>peter.kriens@aQute.biz</id>
- <email>peter.kriens@aQute.biz</email>
- </developer>
- <developer>
- <id>njbartlett@gmail.com</id>
- <email>njbartlett@gmail.com</email>
- </developer>
- </developers>
-</project>