diff --git a/common/server/framework/gradle.properties b/common/server/framework/gradle.properties index c15338ea1..a5c91d105 100644 --- a/common/server/framework/gradle.properties +++ b/common/server/framework/gradle.properties @@ -21,4 +21,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. # -version=0.3.0 +version=0.3.1 diff --git a/common/server/framework/src/main/java/org/curioswitch/common/server/framework/armeria/SslContextKeyConverter.java b/common/server/framework/src/main/java/org/curioswitch/common/server/framework/armeria/SslContextKeyConverter.java index b39a6eb96..6ffff0b5e 100644 --- a/common/server/framework/src/main/java/org/curioswitch/common/server/framework/armeria/SslContextKeyConverter.java +++ b/common/server/framework/src/main/java/org/curioswitch/common/server/framework/armeria/SslContextKeyConverter.java @@ -59,6 +59,9 @@ public static void execute( } try { + // This triggers Netty to try to read the key and will throw an exception if it can't. + SslContextBuilder.forServer( + new ByteArrayInputStream(keyCertChain), new ByteArrayInputStream(key)); operation.accept(new ByteArrayInputStream(keyCertChain), new ByteArrayInputStream(key)); } catch (Exception e) { // Try to convert the key to PCKS8. diff --git a/settings.gradle.kts b/settings.gradle.kts index 1e954fb26..69b481009 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -41,7 +41,7 @@ pluginManagement { plugins { id("com.gradle.enterprise").version("3.2.1") - id("org.curioswitch.gradle-curiostack-plugin").version("0.5.0-RC3") + id("org.curioswitch.gradle-curiostack-plugin").version("0.5.0-RC4") } configure { diff --git a/tools/curiostack-bom/build.gradle.kts b/tools/curiostack-bom/build.gradle.kts index 6d2bae32b..5fbe73f2c 100644 --- a/tools/curiostack-bom/build.gradle.kts +++ b/tools/curiostack-bom/build.gradle.kts @@ -295,7 +295,7 @@ val DEPENDENCY_SETS = listOf( ), DependencySet( "org.mockito", - "3.3.6", + "3.3.7", listOf("mockito-core", "mockito-junit-jupiter") ), DependencySet( @@ -325,7 +325,7 @@ val DEPENDENCIES = listOf( "com.google.maps:google-maps-services:0.11.0", "com.gradle:gradle-enterprise-gradle-plugin:3.2.1", "com.hubspot.jinjava:jinjava:2.5.3", - "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4", + "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5", "de.undercouch:gradle-download-task:4.0.4", "gradle.plugin.com.boxfuse.client:gradle-plugin-publishing:6.0.6", "gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:2.1.0", diff --git a/tools/curiostack-bom/gradle.properties b/tools/curiostack-bom/gradle.properties index d57747b9e..5951f799f 100644 --- a/tools/curiostack-bom/gradle.properties +++ b/tools/curiostack-bom/gradle.properties @@ -21,4 +21,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. # -version=0.5.0 +version=0.5.0.1 diff --git a/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties b/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties index 4185cd966..d720aef18 100644 --- a/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties +++ b/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties @@ -21,4 +21,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. # -version=0.5.0-RC3 +version=0.5.0-RC4 diff --git a/tools/gradle-plugins/gradle-curiostack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java b/tools/gradle-plugins/gradle-curiostack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java index 75ee90f17..f03ca4003 100644 --- a/tools/gradle-plugins/gradle-curiostack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java +++ b/tools/gradle-plugins/gradle-curiostack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java @@ -32,10 +32,10 @@ public class ToolDependencies { private static Map DEFAULT_VERSIONS = ImmutableMap.builder() - .put("bom", "0.5.0") + .put("bom", "0.5.0.1") .put("claat", "2.2.0") - .put("gcloud", "286.0.0") - .put("golang", "1.14.1") + .put("gcloud", "288.0.0") + .put("golang", "1.14.2") .put("google-java-format", "1.7") .put("gradle", "6.3") .put("helm", "2.10.0")