felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1702306 - in /felix/trunk/tools/maven-bundle-plugin: pom.xml src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java src/repo/
Date Thu, 10 Sep 2015 18:35:00 GMT
Author: cziegeler
Date: Thu Sep 10 18:35:00 2015
New Revision: 1702306

URL: http://svn.apache.org/r1702306
Log:
FELIX-5029 : Update to bnd 3.0.0

Removed:
    felix/trunk/tools/maven-bundle-plugin/src/repo/
Modified:
    felix/trunk/tools/maven-bundle-plugin/pom.xml
    felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java

Modified: felix/trunk/tools/maven-bundle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/pom.xml?rev=1702306&r1=1702305&r2=1702306&view=diff
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/pom.xml (original)
+++ felix/trunk/tools/maven-bundle-plugin/pom.xml Thu Sep 10 18:35:00 2015
@@ -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>

Modified: felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java?rev=1702306&r1=1702305&r2=1702306&view=diff
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
(original)
+++ felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
Thu Sep 10 18:35:00 2015
@@ -120,7 +120,14 @@ public class ManifestPlugin extends Bund
         }
         finally
         {
-            analyzer.close();
+            try 
+            {
+                analyzer.close();
+            }
+            catch ( IOException e )
+            {
+                throw new MojoExecutionException( "Error trying to write Manifest to file
" + outputFile, e );
+            }
         }
     }
 



Mime
View raw message