From c138e1383ff21c5f5b6ccd19bbee7e65f38f3367 Mon Sep 17 00:00:00 2001 From: Bobby Warner Date: Wed, 21 Aug 2013 22:01:35 -0500 Subject: [PATCH] GRAILS-9899: Update Protobuf --- grails-bootstrap/build.gradle | 2 +- .../codehaus/groovy/grails/resolve/GrailsCoreDependencies.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grails-bootstrap/build.gradle b/grails-bootstrap/build.gradle index 15881029f68..b6071e874be 100644 --- a/grails-bootstrap/build.gradle +++ b/grails-bootstrap/build.gradle @@ -16,7 +16,7 @@ dependencies { } // These 3 are required by UAA but not Grails (non OSGI version of excludes above) - uaa 'com.google.protobuf:protobuf-java:2.4.1', + uaa 'com.google.protobuf:protobuf-java:2.5.0', 'com.googlecode.json-simple:json-simple:1.1', "org.bouncycastle:bcpg-jdk15:1.45" diff --git a/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java b/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java index 26131c4b4aa..39f78c222e3 100644 --- a/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java +++ b/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java @@ -116,7 +116,7 @@ public Object doCall() { String junitVersion = "4.10"; ModuleRevisionId[] buildDependencies = { ModuleRevisionId.newInstance("org.springframework.uaa", "org.springframework.uaa.client", "1.0.1.RELEASE"), - ModuleRevisionId.newInstance("com.google.protobuf", "protobuf-java", "2.4.1"), + ModuleRevisionId.newInstance("com.google.protobuf", "protobuf-java", "2.5.0"), ModuleRevisionId.newInstance("com.googlecode.json-simple", "json-simple", "1.1"), ModuleRevisionId.newInstance("org.bouncycastle", "bcpg-jdk15", "1.45"), ModuleRevisionId.newInstance("org.bouncycastle", "bcprov-jdk15", "1.45"),