[Git][java-team/jmdns][upstream] New upstream version 3.5.5

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / jmdns


Commits:
61a1d2a9 by Emmanuel Bourg at 2019-01-11T12:20:48Z
New upstream version 3.5.5
- - - - -


11 changed files:

- README.md
- p2/features/org.jmdns.feature/feature.xml
- p2/features/org.jmdns.feature/pom.xml
- p2/features/pom.xml
- p2/pom.xml
- p2/repository/pom.xml
- p2/targetplatform/pom.xml
- pom.xml
- + setversion.sh
- src/main/java/javax/jmdns/impl/DNSIncoming.java
- src/main/java/javax/jmdns/impl/JmDNSImpl.java


Changes:

=====================================
README.md
=====================================
@@ -1,4 +1,4 @@
-![build status](https://travis-ci.org/openhab/jmdns.svg)
+![build status](https://travis-ci.org/jmdns/jmdns.svg)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jmdns/jmdns/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.jmdns/jmdns)
 [![Javadocs](http://www.javadoc.io/badge/org.jmdns/jmdns.svg)](http://www.javadoc.io/doc/org.jmdns/jmdns)
 


=====================================
p2/features/org.jmdns.feature/feature.xml
=====================================
@@ -1,7 +1,7 @@
 <feature
     id="org.jmdns.feature"
     label="JmDNS"
-    version="3.5.4"
+    version="3.5.5"
     provider-name="JmDNS.org">
 
     <description>


=====================================
p2/features/org.jmdns.feature/pom.xml
=====================================
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jmdns.p2</groupId>
         <artifactId>features</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.5</version>
     </parent>
 
     <artifactId>org.jmdns.feature</artifactId>


=====================================
p2/features/pom.xml
=====================================
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jmdns.p2</groupId>
         <artifactId>pom</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.5</version>
     </parent>
 
     <artifactId>features</artifactId>


=====================================
p2/pom.xml
=====================================
@@ -6,7 +6,7 @@
 
     <groupId>org.jmdns.p2</groupId>
     <artifactId>pom</artifactId>
-    <version>3.5.4</version>
+    <version>3.5.5</version>
     <packaging>pom</packaging>
 
     <name>JmDNS p2</name>
@@ -39,7 +39,7 @@
         <my.encoding>UTF-8</my.encoding>
         <tycho.groupId>org.eclipse.tycho</tycho.groupId>
         <tycho.extras.groupId>org.eclipse.tycho.extras</tycho.extras.groupId>
-        <tycho.version>0.23.1</tycho.version>
+        <tycho.version>1.1.0</tycho.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
     </properties>


=====================================
p2/repository/pom.xml
=====================================
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jmdns.p2</groupId>
         <artifactId>pom</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.5</version>
     </parent>
 
     <artifactId>org.jmdns.repository</artifactId>


=====================================
p2/targetplatform/pom.xml
=====================================
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jmdns.p2</groupId>
         <artifactId>pom</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.5</version>
     </parent>
 
     <artifactId>targetplatform</artifactId>


=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jmdns</groupId>
 	<artifactId>jmdns</artifactId>
-	<version>3.5.4</version>
+	<version>3.5.5</version>
 	<name>JmDNS</name>
 	<packaging>jar</packaging>
 	<description>JmDNS is a Java implementation of multi-cast DNS and can be used for service registration and discovery in local area networks. JmDNS is fully compatible with Apple's Bonjour.


=====================================
setversion.sh
=====================================
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$1
+cd p2
+mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$1
+cd ..


=====================================
src/main/java/javax/jmdns/impl/DNSIncoming.java
=====================================
@@ -268,6 +268,12 @@ public final class DNSIncoming extends DNSMessage {
             IOException ioe = new IOException("DNSIncoming corrupted message");
             ioe.initCause(e);
             throw ioe;
+        } finally {
+            try {
+                _messageInputStream.close();
+            } catch (Exception e) { 
+            	logger.warn("MessageInputStream close error");
+            }
         }
     }
 


=====================================
src/main/java/javax/jmdns/impl/JmDNSImpl.java
=====================================
@@ -1018,15 +1018,12 @@ public class JmDNSImpl extends JmDNS implements DNSStatefulObject, DNSTaskStarte
         info.addAddress(_localHost.getInet4Address());
         info.addAddress(_localHost.getInet6Address());
 
-        this.waitForAnnounced(DNSConstants.SERVICE_INFO_TIMEOUT);
-
         this.makeServiceNameUnique(info);
         while (_services.putIfAbsent(info.getKey(), info) != null) {
             this.makeServiceNameUnique(info);
         }
 
         this.startProber();
-        info.waitForAnnounced(DNSConstants.SERVICE_INFO_TIMEOUT);
 
         logger.debug("registerService() JmDNS registered service as {}", info);
     }



View it on GitLab: https://salsa.debian.org/java-team/jmdns/commit/61a1d2a9e2468196761e421c43bea358481d2de9

-- 
View it on GitLab: https://salsa.debian.org/java-team/jmdns/commit/61a1d2a9e2468196761e421c43bea358481d2de9
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/20190111/65082d81/attachment.html>