update crypto libs and json

.github/workflows/deploy.yml

@@ -0,0 +1,38 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven and Deploy
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11 for Maven Central
+      uses: actions/setup-java@v1
+      with:
+        java-version: '11'
+        architecture: x64
+        server-id: ossrh
+        gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_CENTRAL_TOKEN
+    - name: Setup git profile
+      run: |
+        git config --global user.name github-actions
+        git config --global user.email [email protected]
+    - name: Publish Snapshot to Maven Central
+      run: mvn deploy -B -Possrh
+      env:
+        MAVEN_USERNAME: hap-java-dev
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+    - name: Publish site
+      run: mvn -B site-deploy -Dusername=github-actions -Dpassword=${{ secrets.GITHUB_TOKEN }}

.github/workflows/maven.yml

@@ -0,0 +1,23 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: '11'
+        architecture: x64
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.github/workflows/release.yml

@@ -0,0 +1,39 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Stage Release on Master Branch
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: Version to release
+        required: true
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: '11'
+        architecture: x64
+        server-id: ossrh
+        gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_CENTRAL_TOKEN
+    - name: Setup git profile
+      run: |
+        git config user.name github-actions
+        git config user.email [email protected]
+    - name: Maven release
+      run: mvn release:prepare release:perform -B -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -Possrh
+      env:
+        MAVEN_USERNAME: hap-java-dev
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

CHANGES.md

@@ -14,6 +14,11 @@
 * Valid values are supported for enum characteristics instead of min and max values
 * Supported valid states for Thermostat, SecuritySystem, HeaterCooler and HumidifierDehumidifier [#108] [#120](https://github.com/hap-java/HAP-Java/pull/120)
 * Support for FilterMaintenance. Can be used as a linked service for an Air Purifier  [#124](https://github.com/hap-java/HAP-Java/pull/124)
+* Update crypto libs [#130](https://github.com/hap-java/HAP-Java/pull/130)
+
+## Fixes
+
+* Fix for re-advertising service when using alternative jMDNS implementations.
 
 # HAP-Java 1.1.5
 

README.md

@@ -1,5 +1,9 @@
 HAP-Java
 =========
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.hap-java/hap/badge.svg)](https://search.maven.org/search?q=g:io.github.hap-java%20a:hap)
+[![MIT License](https://img.shields.io/github/license/hap-java/HAP-Java)](https://github.com/hap-java/HAP-Java/blob/master/LICENSE)
+![Maven Build Status](https://github.com/andylintner/HAP-Java/actions/workflows/maven.yml/badge.svg)
+
 HAP-Java is a Java implementation of the HomeKit Accessory Protocol.
 
 Using this library, you can create your own HomeKit Accessory or HomeKit Accessory Bridge.
@@ -18,7 +22,8 @@ Include HAP-Java in your project using maven:
 </dependency>
 ```
 
-After that, check out the [Sample](https://github.com/hap-java/HAP-Java/tree/sample).
+After that, check out the [Sample](https://github.com/hap-java/HAP-Java/tree/sample) and
+read the [Javadoc](https://hap-java.github.io/HAP-Java/apidocs/index.html)
 
 Supported HomeKit Accessories
 =========

RELEASING.md

@@ -0,0 +1,7 @@
+# How to release HAP-Java
+
+These actions can only be performed by someone with maintainer level access to the repository.
+
+1. Run the [Stage Release on Master Branch](https://github.com/hap-java/HAP-Java/actions/workflows/release.yml) Action
+2. After this completes, find the release on the [Releases page](https://github.com/hap-java/HAP-Java/releases)
+3. Edit the release to include the changelog details

pom.xml

@@ -24,7 +24,7 @@
 
 	<scm>
 		<connection>scm:git:https://github.com/hap-java/HAP-Java.git</connection>
-		<developerConnection>scm:git:git@github.com:hap-java/HAP-Java.git</developerConnection>
+		<developerConnection>scm:git:https://github.com/hap-java/HAP-Java.git</developerConnection>
 		<url>https://github.com/hap-java/HAP-Java.git</url>
 		<tag>HEAD</tag>
 	</scm>
@@ -100,37 +100,31 @@
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>srp6a</artifactId>
-			<version>1.5.2</version>
+			<version>2.1.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.51</version>
+			<version>1.69</version>
 		</dependency>
 
 		<dependency>
 			<groupId>net.vrallev.ecc</groupId>
 			<artifactId>ecc-25519-java</artifactId>
-			<version>1.0.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.zeromq</groupId>
-			<artifactId>curve25519-java</artifactId>
-			<version>0.1.0</version>
+			<version>1.0.3</version>
 		</dependency>
 
 		<dependency>
 			<groupId>javax.json</groupId>
 			<artifactId>javax.json-api</artifactId>
-			<version>1.0</version>
+			<version>1.1.4</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.glassfish</groupId>
 			<artifactId>javax.json</artifactId>
-			<version>1.0.4</version>
+			<version>1.1.4</version>
 		</dependency>
 
 		<dependency>
@@ -148,8 +142,15 @@
 
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
+			<artifactId>mockito-core</artifactId>
+			<version>3.8.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.19.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -208,28 +209,10 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.1.1</version>
-				<configuration>
-					<descriptors>
-						<descriptor>deploy/distribution.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- bind to the packaging phase -->
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-scm-publish-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>scm-publish</id>
@@ -238,7 +221,7 @@
 							<goal>publish-scm</goal>
 						</goals>
 						<configuration>
-							<pubScmUrl>scm:git:git@github.com:hap-java/HAP-Java.git</pubScmUrl>
+							<pubScmUrl>scm:git:https://github.com/hap-java/HAP-Java.git</pubScmUrl>
 							<scmBranch>gh-pages</scmBranch>
 						</configuration>
 					</execution>
@@ -284,11 +267,11 @@
 		</site>
 		<repository>
 			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 		<snapshotRepository>
 			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 
@@ -305,6 +288,8 @@
 				<version>3.0.1</version>
 				<configuration>
 					<excludePackageNames>io.github.hapjava.server.impl</excludePackageNames>
+					<source>8</source>
+    				<detectJavaApiLink>false</detectJavaApiLink>
 				</configuration>
 				<reportSets>
 					<reportSet>
@@ -325,20 +310,6 @@
 	<profiles>
 		<profile>
 			<id>ossrh</id>
-			<properties>
-					<gpg.executable>gpg</gpg.executable>
-					<gpg.keyname>${env.GPG_KEYNAME}</gpg.keyname>
-					<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
-					<gpg.defaultKeyring>false</gpg.defaultKeyring>
-					<gpg.publicKeyring>deploy/pubring.gpg</gpg.publicKeyring>
-					<gpg.secretKeyring>deploy/secring.gpg</gpg.secretKeyring>
-			</properties>
-			<activation>
-					<property>
-							<name>performRelease</name>
-							<value>true</value>
-					</property>
-			</activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -354,6 +325,13 @@
 								</goals>
 							</execution>
 						</executions>
+						<configuration>
+							<keyname>HAP-Java</keyname>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
@@ -362,17 +340,12 @@
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>
-							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
 							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-release-plugin</artifactId>
-						<version>2.5.3</version>
-					</plugin>
 				</plugins>
-			</build>
+			</build> 
 		</profile>
 	</profiles>