Author: gnodet
Date: Thu Jul 9 19:43:27 2015
New Revision: 1690151
URL: http://svn.apache.org/r1690151
Log:
[FELIX-4956] Embed latest bndlib
Added:
felix/trunk/bundleplugin/src/repo/
felix/trunk/bundleplugin/src/repo/biz/
felix/trunk/bundleplugin/src/repo/biz/aQute/
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.jar
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.pom
Modified:
felix/trunk/bundleplugin/doc/changelog.txt
felix/trunk/bundleplugin/pom.xml
Modified: felix/trunk/bundleplugin/doc/changelog.txt
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/doc/changelog.txt?rev=1690151&r1=1690150&r2=1690151&view=diff
==============================================================================
--- felix/trunk/bundleplugin/doc/changelog.txt (original)
+++ felix/trunk/bundleplugin/doc/changelog.txt Thu Jul 9 19:43:27 2015
@@ -3,6 +3,9 @@ Changes from 2.5.4 to 2.5.5
** Bug
* [FELIX-4882] - Correctly use Maven Plugin Tools Java 5 annotations
instead of javadoc tags
+ * [FELIX-4892] NPE in maven-bundle-plugin
+ * [FELIX-4874] IllegalArgumentException: Invalid syntax for version:
0.1-SNAPSHOT
+ * [FELIX-4956] Embed latest bndlib
Changes from 2.5.3 to 2.5.4
Modified: felix/trunk/bundleplugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/pom.xml?rev=1690151&r1=1690150&r2=1690151&view=diff
==============================================================================
--- felix/trunk/bundleplugin/pom.xml (original)
+++ felix/trunk/bundleplugin/pom.xml Thu Jul 9 19:43:27 2015
@@ -87,9 +87,37 @@
</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>
@@ -99,7 +127,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>2.4.1</version>
+ <version>20150709</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Added:
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.jar?rev=1690151&view=auto
==============================================================================
Binary files
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.jar
(added) and
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.jar
Thu Jul 9 19:43:27 2015 differ
Added:
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.pom
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.pom?rev=1690151&view=auto
==============================================================================
---
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.pom
(added)
+++
felix/trunk/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150709/biz.aQute.bndlib-20150709.pom
Thu Jul 9 19:43:27 2015
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>20150709</version>
+ <description>POM was created from install:install-file</description>
+</project>
