This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch feature/GEODE-4791 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 38fad9860c236160499ce8faa4a722099bf09190 Author: Udo Kohlmeyer <ukohlme...@pivotal.io> AuthorDate: Tue Apr 10 15:39:13 2018 -0700 GEODE-4791: fixing extensions module project name references --- build.gradle | 2 +- extensions/geode-modules-assembly/build.gradle | 32 +++++++++++----------- .../geode-modules-session-internal/build.gradle | 2 +- extensions/geode-modules-session/build.gradle | 3 +- extensions/geode-modules-tomcat7/build.gradle | 4 +-- extensions/geode-modules-tomcat8/build.gradle | 6 ++-- geode-assembly/build.gradle | 14 +++++----- settings.gradle | 15 +++++----- 8 files changed, 38 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index 4adbe99..e2624b8 100755 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ apply from: "${scriptDir}/dependency-resolution.gradle" apply from: "${scriptDir}/test.gradle" apply from: "${scriptDir}/publish.gradle" apply from: "${scriptDir}/code-analysis.gradle" -apply from: "${scriptDir}/sonar.gradle" +//apply from: "${scriptDir}/sonar.gradle" apply from: "${scriptDir}/ide.gradle" apply from: "${scriptDir}/rat.gradle" apply from: "${scriptDir}/docker.gradle" diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle index ff12c9d..a62109d 100644 --- a/extensions/geode-modules-assembly/build.gradle +++ b/extensions/geode-modules-assembly/build.gradle @@ -51,9 +51,9 @@ def configureTcServerAssembly = { // All client-server files into('geode-cs/lib') { - from getJarArtifact(':extensions/geode-modules') - from getJarArtifact(':extensions/geode-modules-tomcat7') - from getJarArtifact(':extensions/geode-modules-tomcat8') + from getJarArtifact(':extensions:geode-modules') + from getJarArtifact(':extensions:geode-modules-tomcat7') + from getJarArtifact(':extensions:geode-modules-tomcat8') from configurations.slf4jDeps } into('geode-cs/bin') { @@ -84,9 +84,9 @@ def configureTcServerAssembly = { } // All peer-to-peer files into('geode-p2p/lib') { - from getJarArtifact(':extensions/geode-modules') - from getJarArtifact(':extensions/geode-modules-tomcat7') - from getJarArtifact(':extensions/geode-modules-tomcat8') + from getJarArtifact(':extensions:geode-modules') + from getJarArtifact(':extensions:geode-modules-tomcat7') + from getJarArtifact(':extensions:geode-modules-tomcat8') from configurations.slf4jDeps } into('geode-p2p/bin') { @@ -147,15 +147,15 @@ def configureTcServer30Assembly = { } } -task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') { +task distTomcat(type: Zip, dependsOn: ':extensions:geode-modules:assemble') { baseName = moduleBaseName classifier = "Tomcat" // All client-server files into('lib') { - from getJarArtifact(':extensions/geode-modules') - from getJarArtifact(':extensions/geode-modules-tomcat7') - from getJarArtifact(':extensions/geode-modules-tomcat8') + from getJarArtifact(':extensions:geode-modules') + from getJarArtifact(':extensions:geode-modules-tomcat7') + from getJarArtifact(':extensions:geode-modules-tomcat8') from configurations.slf4jDeps } into('bin') { @@ -171,14 +171,14 @@ task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') { } } -task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:assemble') { +task distAppServer(type: Zip, dependsOn: ':extensions:geode-modules-session:assemble') { baseName = moduleBaseName classifier = "AppServer" into('lib') { - from getJarArtifact(':extensions/geode-modules-session') - from getJarArtifact(':extensions/geode-modules-session-internal') - from getJarArtifact(':extensions/geode-modules') + from getJarArtifact(':extensions:geode-modules-session') + from getJarArtifact(':extensions:geode-modules-session-internal') + from getJarArtifact(':extensions:geode-modules') from configurations.slf4jDeps } @@ -204,11 +204,11 @@ task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:asse } } -task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble', ':extensions/geode-modules-tomcat7:assemble', ':extensions/geode-modules-tomcat8:assemble'] ) { +task distTcServer(type: Zip, dependsOn: [':extensions:geode-modules:assemble', ':extensions:geode-modules-tomcat7:assemble', ':extensions:geode-modules-tomcat8:assemble'] ) { configure(configureTcServerAssembly) } -task distTcServer30(type: Zip, dependsOn: [':extensions/geode-modules:assemble', ':extensions/geode-modules-tomcat7:assemble', ':extensions/geode-modules-tomcat8:assemble']) { +task distTcServer30(type: Zip, dependsOn: [':extensions:geode-modules:assemble', ':extensions:geode-modules-tomcat7:assemble', ':extensions:geode-modules-tomcat8:assemble']) { configure(configureTcServerAssembly) configure(configureTcServer30Assembly) } diff --git a/extensions/geode-modules-session-internal/build.gradle b/extensions/geode-modules-session-internal/build.gradle index 39c6e55..e1dcc1c 100644 --- a/extensions/geode-modules-session-internal/build.gradle +++ b/extensions/geode-modules-session-internal/build.gradle @@ -16,7 +16,7 @@ */ dependencies { - compile project(':extensions/geode-modules') + compile project(':extensions:geode-modules') compile project(':geode-core') } diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle index 0469070..a1ffa0f 100644 --- a/extensions/geode-modules-session/build.gradle +++ b/extensions/geode-modules-session/build.gradle @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - dependencies { - compile project(':extensions/geode-modules-session-internal') + compile project(':extensions:geode-modules-session-internal') compile project(':geode-core') testCompile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version' diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle index 21096f9..5f913d3 100644 --- a/extensions/geode-modules-tomcat7/build.gradle +++ b/extensions/geode-modules-tomcat7/build.gradle @@ -16,7 +16,7 @@ */ dependencies { - compile(project(':extensions/geode-modules')) { + compile(project(':extensions:geode-modules')) { // Remove everything related to Tomcat 6.x exclude group: 'org.apache.tomcat' } @@ -39,7 +39,7 @@ dependencies { testCompile project(path: ':geode-junit') testCompile files(project(':geode-core').sourceSets.test.output) - testCompile files(project(':extensions/geode-modules').sourceSets.test.output) + testCompile files(project(':extensions:geode-modules').sourceSets.test.output) eclipse.classpath.file { whenMerged { classpath -> diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle index b60e458..0ea641d 100644 --- a/extensions/geode-modules-tomcat8/build.gradle +++ b/extensions/geode-modules-tomcat8/build.gradle @@ -14,10 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - dependencies { - compile(project(':extensions/geode-modules')) { + compile(project(':extensions:geode-modules')) { exclude group: 'org.apache.tomcat' } @@ -40,7 +38,7 @@ dependencies { testCompile project(path: ':geode-junit') testCompile files(project(':geode-core').sourceSets.test.output) - testCompile files(project(':extensions/geode-modules').sourceSets.test.output) + testCompile files(project(':extensions:geode-modules').sourceSets.test.output) testCompile files(project(':geode-old-versions').sourceSets.main.output) eclipse.classpath.file { diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index 1c3e92b..20b7a07 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -85,16 +85,16 @@ dependencies { testCompile group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3' - testCompile (project(':extensions/geode-modules')) { + testCompile (project(':extensions:geode-modules')) { // Remove everything related to Tomcat exclude group: 'org.apache.tomcat' } - testCompile (project(':extensions/geode-modules-session-internal')) { + testCompile (project(':extensions:geode-modules-session-internal')) { // Remove everything related to Tomcat exclude group: 'org.apache.tomcat' } - testCompile project(':extensions/session-testing-war') + testCompile project(':extensions:session-testing-war') testCompile 'org.seleniumhq.selenium:selenium-api:' + project.'selenium.version' testCompile 'org.seleniumhq.selenium:selenium-chrome-driver:' + project.'selenium.version' @@ -424,9 +424,9 @@ distributions { from (project(":geode-pulse").configurations.archives.allArtifacts.files) } - into ('tools/Modules') { - from (project(':extensions/geode-modules-assembly').configurations.moduleDistOutputs.files) - } +// into ('tools/Modules') { +// from (project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files) +// } } } } @@ -457,7 +457,7 @@ flakyTest dependOnInstalledProduct // Make build final task to generate all test and product resources build.dependsOn installDist -installDist.dependsOn ':extensions/geode-modules-assembly:dist' +installDist.dependsOn ':extensions:geode-modules-assembly:dist' distributedTest.dependsOn ':extensions/session-testing-war:war' distributedTest.dependsOn ':geode-old-versions:build' diff --git a/settings.gradle b/settings.gradle index 74c1811..160d9a8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,16 +31,17 @@ include 'geode-old-client-support' include 'geode-wan' include 'geode-cq' include 'geode-connectors' -include 'extensions/geode-modules' -include 'extensions/geode-modules-tomcat7' -include 'extensions/geode-modules-tomcat8' -include 'extensions/geode-modules-session-internal' -include 'extensions/geode-modules-session' -include 'extensions/geode-modules-assembly' +include 'extensions:geode-modules' +include 'extensions:geode-modules-tomcat7' +include 'extensions:geode-modules-tomcat8' +include 'extensions:geode-modules-session-internal' +include 'extensions:geode-modules-session' +include 'extensions:geode-modules-assembly' +include 'extensions:session-testing-war' include 'geode-protobuf' include 'geode-experimental-driver' include 'geode-protobuf-messages' -include 'extensions/session-testing-war' + include 'geode-concurrency-test' -- To stop receiving notification emails like this one, please contact u...@apache.org.