[Git][java-team/maven-bundle-plugin][master] 5 commits: Standards-Version updated to 4.1.5
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Jul 30 13:35:58 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-bundle-plugin
Commits:
30ed3d33 by Emmanuel Bourg at 2018-07-30T12:15:58Z
Standards-Version updated to 4.1.5
- - - - -
f7c5afc4 by Emmanuel Bourg at 2018-07-30T12:16:06Z
Use salsa.debian.org Vcs-* URLs
- - - - -
af0251e5 by Emmanuel Bourg at 2018-07-30T12:16:52Z
New upstream version 3.5.1
- - - - -
a524c623 by Emmanuel Bourg at 2018-07-30T12:16:52Z
Update upstream source from tag 'upstream/3.5.1'
Update to upstream version '3.5.1'
with Debian dir 2ea169f3f9c27d2e51433fcdf06407857db1e742
- - - - -
8a6c1363 by Emmanuel Bourg at 2018-07-30T12:34:27Z
Upload to unstable
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- pom.xml
- src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
- src/main/java/org/apache/felix/bundleplugin/JpaPlugin.java
- src/main/resources/org/apache/felix/bundleplugin/jpa.xsl
- src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
- src/test/java/org/apache/felix/bundleplugin/JpaPluginTest.java
- src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 at 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
=====================================
--- a/debian/control
+++ b/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
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,20 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Felix Maven Bundle Plugin
Upstream-Contact: http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
Source: http://www.apache.org/dist/felix/
-Files-Excluded: *.jar *.class
+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 at debian.org>
+ 2014, Timo Aaltonen <tjaalton at debian.org>
+ 2014-2018, Emmanuel Bourg <ebourg at apache.org>
+ 2015-2017, Miguel Landaeta <nomadium at debian.org>
+ 2015, Markus Koschany <apo at debian.org>
+ 2017, tony mancill <tmancill at debian.org>
+ 2018, Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
License: Apache-2.0
Files: debian/patches/0001-Port-to-current-maven-dependency-tree.patch
@@ -49,4 +55,4 @@ License: MIT
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
\ No newline at end of file
+ SOFTWARE.
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,4 @@
#!/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
=====================================
--- a/pom.xml
+++ b/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
=====================================
--- a/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
+++ b/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 at 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
=====================================
--- a/src/main/java/org/apache/felix/bundleplugin/JpaPlugin.java
+++ b/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
=====================================
--- a/src/main/resources/org/apache/felix/bundleplugin/jpa.xsl
+++ b/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:value-of select="concat('Provide-Capability: osgi.service;effective:=active;',
- 'objectClass=', $interface, ';',
- $attributes,
- $nl)"/>
+ <xsl:choose>
+ <xsl:when test="string-length($attributes)>0">
+ <xsl:value-of select="concat('Provide-Capability: osgi.service;effective:=active;',
+ '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:value-of select="concat('Require-Capability: osgi.service;effective:=active;',
- 'objectClass=', $interface, ';',
- $attributes,
- $nl)"/>
+ <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, $nl)"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
</xsl:stylesheet>
=====================================
src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
=====================================
--- a/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
+++ b/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 at 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
=====================================
--- a/src/test/java/org/apache/felix/bundleplugin/JpaPluginTest.java
+++ b/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/(&(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
=====================================
--- a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
+++ b/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 at apache.org">Carlos Sanchez</a>
- * @version $Id$
+ * @version $Id: Maven2OsgiConverterTest.java 1679513 2015-05-15 08:53:36Z cziegeler $
*/
public class Maven2OsgiConverterTest
extends PlexusTestCase
View it on GitLab: https://salsa.debian.org/java-team/maven-bundle-plugin/compare/b2fa9c408d0d4f855a1192845d7c663745be4ad5...8a6c1363fdf603d18e12510307a76023c11ef540
--
View it on GitLab: https://salsa.debian.org/java-team/maven-bundle-plugin/compare/b2fa9c408d0d4f855a1192845d7c663745be4ad5...8a6c1363fdf603d18e12510307a76023c11ef540
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180730/191917cc/attachment.html>
More information about the pkg-java-commits
mailing list