This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new d6c978a GEODE-4053: Create module for Protobuf messages
d6c978a is described below
commit d6c978a87e80c493cd73cdbdd12612ecce40af8b
Author: Sarge <[email protected]>
AuthorDate: Wed Dec 6 14:15:41 2017 -0800
GEODE-4053: Create module for Protobuf messages
---
geode-assembly/build.gradle | 6 ++-
.../build.gradle | 11 +-----
.../src/main/proto/v1/basicTypes.proto | 0
.../src/main/proto/v1/clientProtocol.proto | 0
.../src/main/proto/v1/connection_API.proto | 0
.../src/main/proto/v1/locator_API.proto | 0
.../src/main/proto/v1/region_API.proto | 0
geode-protobuf/build.gradle | 44 +---------------------
settings.gradle | 1 +
9 files changed, 9 insertions(+), 53 deletions(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 1f139a5..7be16ab 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -62,6 +62,7 @@ dependencies {
archives project(':geode-lucene')
archives project(':geode-old-client-support')
archives project(':geode-protobuf')
+ archives project(':geode-protobuf-messages')
archives project(':geode-web')
archives project(':geode-web-api')
archives project(':geode-wan')
@@ -371,6 +372,9 @@ distributions {
from project(":geode-protobuf").configurations.runtime
from
project(":geode-protobuf").configurations.archives.allArtifacts.files
+ from project(":geode-protobuf-messages").configurations.runtime
+ from
project(":geode-protobuf-messages").configurations.archives.allArtifacts.files
+
from project(":geode-client-protocol").configurations.runtime
from
project(":geode-client-protocol").configurations.archives.allArtifacts.files
@@ -401,7 +405,7 @@ distributions {
}
into('tools/ClientProtocol') {
- from {project(":geode-protobuf").zip.outputs.files}
+ from {project(":geode-protobuf-messages").zip.outputs.files}
}
into ('javadoc') {
diff --git a/geode-protobuf/build.gradle b/geode-protobuf-messages/build.gradle
similarity index 79%
copy from geode-protobuf/build.gradle
copy to geode-protobuf-messages/build.gradle
index 7b13a09..ff04de4 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf-messages/build.gradle
@@ -28,15 +28,6 @@ buildscript {
}
dependencies {
- provided project(':geode-client-protocol')
- provided project(':geode-core')
- testCompile project(':geode-junit')
- testCompile files(project(':geode-core').sourceSets.test.output)
-
- testCompile 'org.powermock:powermock-core:' + project.'powermock.version'
- testCompile 'org.powermock:powermock-module-junit4:' +
project.'powermock.version'
- testCompile 'org.powermock:powermock-api-mockito:' +
project.'powermock.version'
-
compile 'com.google.protobuf:protobuf-java:' +
project.'protobuf-java.version'
}
@@ -68,4 +59,4 @@ task zip(type: Zip) {
destinationDir = file("$buildDir/libs")
}
-assemble.dependsOn 'zip'
\ No newline at end of file
+assemble.dependsOn 'zip'
diff --git a/geode-protobuf/src/main/proto/v1/basicTypes.proto
b/geode-protobuf-messages/src/main/proto/v1/basicTypes.proto
similarity index 100%
rename from geode-protobuf/src/main/proto/v1/basicTypes.proto
rename to geode-protobuf-messages/src/main/proto/v1/basicTypes.proto
diff --git a/geode-protobuf/src/main/proto/v1/clientProtocol.proto
b/geode-protobuf-messages/src/main/proto/v1/clientProtocol.proto
similarity index 100%
rename from geode-protobuf/src/main/proto/v1/clientProtocol.proto
rename to geode-protobuf-messages/src/main/proto/v1/clientProtocol.proto
diff --git a/geode-protobuf/src/main/proto/v1/connection_API.proto
b/geode-protobuf-messages/src/main/proto/v1/connection_API.proto
similarity index 100%
rename from geode-protobuf/src/main/proto/v1/connection_API.proto
rename to geode-protobuf-messages/src/main/proto/v1/connection_API.proto
diff --git a/geode-protobuf/src/main/proto/v1/locator_API.proto
b/geode-protobuf-messages/src/main/proto/v1/locator_API.proto
similarity index 100%
rename from geode-protobuf/src/main/proto/v1/locator_API.proto
rename to geode-protobuf-messages/src/main/proto/v1/locator_API.proto
diff --git a/geode-protobuf/src/main/proto/v1/region_API.proto
b/geode-protobuf-messages/src/main/proto/v1/region_API.proto
similarity index 100%
rename from geode-protobuf/src/main/proto/v1/region_API.proto
rename to geode-protobuf-messages/src/main/proto/v1/region_API.proto
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 7b13a09..045f36a 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -15,21 +15,11 @@
* limitations under the License.
*/
-apply plugin: 'com.google.protobuf'
-apply plugin: 'idea'
-
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath 'com.google.protobuf:protobuf-gradle-plugin:' +
project.'protobuf-gradle-plugin.version'
- }
-}
-
dependencies {
provided project(':geode-client-protocol')
provided project(':geode-core')
+ compile project(':geode-protobuf-messages')
+
testCompile project(':geode-junit')
testCompile files(project(':geode-core').sourceSets.test.output)
@@ -39,33 +29,3 @@ dependencies {
compile 'com.google.protobuf:protobuf-java:' +
project.'protobuf-java.version'
}
-
-protobuf {
- protoc {
- // The artifact spec for the Protobuf Compiler
- artifact = 'com.google.protobuf:protoc:' + project.'protoc.version'
- }
- generatedFilesBaseDir = "$buildDir/generated-src/proto"
-}
-
-sourceSets {
- main {
- java {
- srcDir "$buildDir/generated-src/proto/main/java"
- }
- }
-}
-// let IntelliJ know where the generated sources are.
-idea {
- module {
- sourceDirs += file("${protobuf.generatedFilesBaseDir}/main/java")
- }
-}
-
-task zip(type: Zip) {
- from 'src/main/proto'
- baseName = "${project.name}-definitions"
- destinationDir = file("$buildDir/libs")
-}
-
-assemble.dependsOn 'zip'
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 13a665c..a319689 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -39,6 +39,7 @@ include 'extensions/geode-modules-session-internal'
include 'extensions/geode-modules-session'
include 'extensions/geode-modules-assembly'
include 'geode-protobuf'
+include 'geode-protobuf-messages'
include 'extensions/session-testing-war'
include 'geode-concurrency-test'
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
