Merge pull request #630 from TakayukiHoshi1984/bugfix_keystore_password

TakayukiHoshi1984 · web-flow · commit 3adc5c2eb65a · 2019-06-26T14:51:02.000+09:00
Manager から出力したキーストアをパスワード0000で開けない問題を修正。プラグインSDKを2.7.2にアップデート。
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle
@@ -77,7 +77,7 @@ dependencies {
         exclude module: 'animated-vector-drawable'
         exclude module: 'support-media-compat'
     }
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.1'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.2'
     implementation project(':dconnect-demo-lib')
     implementation project(':libstreaming')
     implementation('com.serenegiant:common:2.12.5') {
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/build.gradle b/dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName '2.7.1'
+        versionName '2.7.2'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/java/org/deviceconnect/android/ssl/EndPointKeyStoreManager.java b/dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/java/org/deviceconnect/android/ssl/EndPointKeyStoreManager.java
@@ -106,7 +106,7 @@ public EndPointKeyStoreManager(final Context context, final String keyStorePath,
      */
     public EndPointKeyStoreManager(final Context context, final String keyStorePath,
                                    final String keyStorePassword, final String alias) {
-        this(context, keyStorePath, alias, keyStorePassword, DEFAULT_ROOT_CA);
+        this(context, keyStorePath, keyStorePassword, alias, DEFAULT_ROOT_CA);
     }
 
     /**
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/res/xml/pluginsdk.xml b/dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/res/xml/pluginsdk.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin-sdk>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
 </plugin-sdk>
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.aar b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.aar
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.aar.md5 b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.aar.md5
@@ -0,0 +1 @@
+467305b52e6a308980ca3520b658283a
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.aar.sha1 b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.aar.sha1
@@ -0,0 +1 @@
+ed5ce35b81abbec502c740734d1587fe03f5a7b3
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.pom b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.pom
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>org.deviceconnect</groupId>
+  <artifactId>dconnect-device-plugin-sdk</artifactId>
+  <version>2.7.2</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.deviceconnect</groupId>
+      <artifactId>dconnect-sdk-for-android</artifactId>
+      <version>2.3.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-v4</artifactId>
+      <version>28.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.46</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.pom.md5 b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.pom.md5
@@ -0,0 +1 @@
+0e85fef2758d74b228eddcf4f21d2ce9
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.pom.sha1 b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.7.2/dconnect-device-plugin-sdk-2.7.2.pom.sha1
@@ -0,0 +1 @@
+d40c6d22f1d1e40d4f8ab6e841d9977d8e3f0245
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml
@@ -3,7 +3,7 @@
   <groupId>org.deviceconnect</groupId>
   <artifactId>dconnect-device-plugin-sdk</artifactId>
   <versioning>
-    <release>2.7.1</release>
+    <release>2.7.2</release>
     <versions>
       <version>1.0.0</version>
       <version>1.0.1</version>
@@ -25,7 +25,8 @@
       <version>2.6.2</version>
       <version>2.7.0</version>
       <version>2.7.1</version>
+      <version>2.7.2</version>
     </versions>
-    <lastUpdated>20190517020545</lastUpdated>
+    <lastUpdated>20190624045632</lastUpdated>
   </versioning>
 </metadata>
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml.md5 b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml.md5
@@ -1 +1 @@
-1b813dd9cdb108be1778865952f08832
+c2db18ac68072cdf9d5047ac7ba45dfe
diff --git a/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml.sha1 b/dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml.sha1
@@ -1 +1 @@
-b9dde0a4f6070c5aa21f74bce2c4e7e0ffe5acb1
+d94ba5c885207691d76cd61c897b10635dd78c33
diff --git a/dConnectManager/dConnectManager/dconnect-manager-app/build.gradle b/dConnectManager/dConnectManager/dconnect-manager-app/build.gradle
@@ -86,7 +86,7 @@ dependencies {
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.1'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.2'
     implementation project(':dconnect-manager-core')
     implementation project(':dconnect-server-nano-httpd')
     implementation project(':dconnect-device-plugin-host')
diff --git a/dConnectManager/dConnectManager/dconnect-manager-core/build.gradle b/dConnectManager/dConnectManager/dconnect-manager-core/build.gradle
@@ -26,7 +26,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.1'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.2'
     implementation project(':dconnect-server-nano-httpd')
 
     testImplementation 'junit:junit:4.12'

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ dependencies {`
`77`	`77`	`exclude module: 'animated-vector-drawable'`
`78`	`78`	`exclude module: 'support-media-compat'`
`79`	`79`	`}`
`80`		`- implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.1'`
	`80`	`+ implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.7.2'`
`81`	`81`	`implementation project(':dconnect-demo-lib')`
`82`	`82`	`implementation project(':libstreaming')`
`83`	`83`	`implementation('com.serenegiant:common:2.12.5') {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ android {`
`8`	`8`	`minSdkVersion 14`
`9`	`9`	`targetSdkVersion 28`
`10`	`10`	`versionCode 1`
`11`		`- versionName '2.7.1'`
	`11`	`+ versionName '2.7.2'`
`12`	`12`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public EndPointKeyStoreManager(final Context context, final String keyStorePath,`
`106`	`106`	`*/`
`107`	`107`	`public EndPointKeyStoreManager(final Context context, final String keyStorePath,`
`108`	`108`	`final String keyStorePassword, final String alias) {`
`109`		`- this(context, keyStorePath, alias, keyStorePassword, DEFAULT_ROOT_CA);`
	`109`	`+ this(context, keyStorePath, keyStorePassword, alias, DEFAULT_ROOT_CA);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ed5ce35b81abbec502c740734d1587fe03f5a7b3`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+d40c6d22f1d1e40d4f8ab6e841d9977d8e3f0245`