debian/changelog

+maven-bundle-plugin (3.5.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Standards-Version updated to 4.1.5
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 30 Jul 2018 14:34:12 +0200
+
 maven-bundle-plugin (3.5.0-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -21,9 +21,9 @@ Build-Depends-Indep: bnd (>= 3.5.0),
                      libplexus-archiver-java,
                      libplexus-container-default1.5-java,
                      libplexus-utils2-java
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-bundle-plugin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-bundle-plugin.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/maven-bundle-plugin.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-bundle-plugin
 Homepage: http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
 
 Package: libmaven-bundle-plugin-java

debian/copyright

@@ -5,11 +5,17 @@ Source: http://www.apache.org/dist/felix/
 Files-Excluded: *.jar *.class
 
 Files: *
-Copyright: 2006-2015, The Apache Software Foundation
+Copyright: 2006-2018, The Apache Software Foundation
 License: Apache-2.0
 
 Files: debian/*
 Copyright: 2011, Damien Raude-Morvan <drazzib@debian.org>
+           2014, Timo Aaltonen <tjaalton@debian.org>
+           2014-2018, Emmanuel Bourg <ebourg@apache.org>
+           2015-2017, Miguel Landaeta <nomadium@debian.org>
+           2015, Markus Koschany <apo@debian.org>
+           2017, tony mancill <tmancill@debian.org>
+           2018, Kai-Chung Yan (殷啟聰) <seamlikok@gmail.com>
 License: Apache-2.0
 
 Files: debian/patches/0001-Port-to-current-maven-dependency-tree.patch

debian/rules

 #!/usr/bin/make -f
 
-export JAVA_HOME = /usr/lib/jvm/default-java
-
 %:
-	dh $@ --buildsystem=maven
-
-get-orig-source:
-	uscan --download-current-version --force-download --repack --compression xz
+	dh $@

pom.xml

@@ -28,7 +28,7 @@
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1</version>
  <packaging>maven-plugin</packaging>
 
  <name>Maven Bundle Plugin</name>
@@ -42,9 +42,9 @@
  <url>http://felix.apache.org/components/bundle-plugin/</url>
 
  <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-3.5.0</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-3.5.0</developerConnection>
-     <url>http://svn.apache.org/viewvc/felix/releases/maven-bundle-plugin-3.5.0</url>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-3.5.1</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-3.5.1</developerConnection>
+     <url>http://svn.apache.org/viewvc/felix/releases/maven-bundle-plugin-3.5.1</url>
  </scm>
 
  <!-- Support for publishing the mvn site. -->

src/main/java/org/apache/felix/bundleplugin/BundleInfo.java

@@ -28,7 +28,7 @@ import org.apache.maven.artifact.Artifact;
  * Information result of the bundling process
  *
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
- * @version $Id$
+ * @version $Id: BundleInfo.java 1786059 2017-03-08 19:30:10Z sseifert $
  */
 public class BundleInfo
 {

src/main/java/org/apache/felix/bundleplugin/JpaPlugin.java

@@ -27,6 +27,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -134,7 +135,7 @@ System.err.println("Output: " + set.toString());
 
     public Set<String> analyze( InputStream in ) throws Exception
     {
-        Set<String> refers = new HashSet<String>();
+        Set<String> refers = new LinkedHashSet<String>();
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         javax.xml.transform.Result r = new StreamResult( bout );
         javax.xml.transform.Source s = new StreamSource( in );

src/main/resources/org/apache/felix/bundleplugin/jpa.xsl

@@ -136,19 +136,31 @@
     <xsl:template name="service-capability">
         <xsl:param name="interface"/>
         <xsl:param name="attributes" select="''"/>
+        <xsl:choose>
+            <xsl:when test="string-length($attributes)>0">
                 <xsl:value-of select="concat('Provide-Capability: osgi.service;effective:=active;',
-                                         'objectClass=', $interface, ';',
-                                         $attributes,
-                                         $nl)"/>
+                                         'objectClass=', $interface, ';', $attributes, $nl)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="concat('Provide-Capability: osgi.service;effective:=active;',
+                                         'objectClass=', $interface, $nl)"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     <xsl:template name="service-requirement">
         <xsl:param name="interface"/>
         <xsl:param name="attributes" select="''"/>
+        <xsl:choose>
+            <xsl:when test="string-length($attributes)>0">
+                <xsl:value-of select="concat('Require-Capability: osgi.service;effective:=active;',
+                                         'objectClass=', $interface, ';', $attributes, $nl)"/>
+            </xsl:when>
+            <xsl:otherwise>
                 <xsl:value-of select="concat('Require-Capability: osgi.service;effective:=active;',
-                                         'objectClass=', $interface, ';',
-                                         $attributes,
-                                         $nl)"/>
+                                         'objectClass=', $interface, $nl)"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
 </xsl:stylesheet>

src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java

@@ -42,7 +42,7 @@ import org.apache.maven.project.ProjectBuilderConfiguration;
  * Common methods for bundle plugin testing
  * 
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
- * @version $Id$
+ * @version $Id: AbstractBundlePluginTest.java 1785857 2017-03-07 16:43:30Z sseifert $
  */
 public abstract class AbstractBundlePluginTest extends AbstractMojoTestCase
 {

src/test/java/org/apache/felix/bundleplugin/JpaPluginTest.java

@@ -35,7 +35,7 @@ public class JpaPluginTest {
                         "        <jta-data-source>osgi:service/jdbc/h2DS</jta-data-source>\n" +
                         "    </persistence-unit>\n" +
                         "</persistence>";
-        String expectedReqs = "osgi.extender;osgi.extender=aries.jpa,osgi.service;effective:=active;objectClass=javax.transaction.TransactionManager;";
+        String expectedReqs = "osgi.extender;osgi.extender=aries.jpa,osgi.service;effective:=active;objectClass=javax.transaction.TransactionManager";
         assertTransformation(xmlStr, expectedReqs);
     }
 
@@ -46,7 +46,7 @@ public class JpaPluginTest {
                         "        <jta-data-source>osgi:service/javax.sql.DataSource/(&amp;(db=mydb)(version=3.1))</jta-data-source>\n" +
                         "    </persistence-unit>\n" +
                         "</persistence>";
-        String expectedReqs = "osgi.extender;osgi.extender=aries.jpa,osgi.service;effective:=active;objectClass=javax.sql.DataSource;filter:=\"(&(db=mydb)(version=3.1))\",osgi.service;effective:=active;objectClass=javax.transaction.TransactionManager;";
+        String expectedReqs = "osgi.extender;osgi.extender=aries.jpa,osgi.service;effective:=active;objectClass=javax.transaction.TransactionManager,osgi.service;effective:=active;objectClass=javax.sql.DataSource;filter:=\"(&(db=mydb)(version=3.1))\"";
         assertTransformation(xmlStr, expectedReqs);
     }
 
@@ -68,5 +68,6 @@ public class JpaPluginTest {
         plugin.analyzeJar(analyzer);
 
         assertEquals(expectedReqs, analyzer.getProperty("Require-Capability"));
+
     }
 }

src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java

@@ -28,7 +28,7 @@ import org.codehaus.plexus.PlexusTestCase;
  * Test for {@link DefaultMaven2OsgiConverter}
  *
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
- * @version $Id$
+ * @version $Id: Maven2OsgiConverterTest.java 1679513 2015-05-15 08:53:36Z cziegeler $
  */
 public class Maven2OsgiConverterTest
     extends PlexusTestCase