From commits-return-31466-archive-asf-public=cust-asf.ponee.io@geode.apache.org Thu Apr 18 19:23:21 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8847F18061A for ; Thu, 18 Apr 2019 21:23:20 +0200 (CEST) Received: (qmail 87788 invoked by uid 500); 18 Apr 2019 19:23:19 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 87779 invoked by uid 99); 18 Apr 2019 19:23:19 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Apr 2019 19:23:19 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8BF75879E6; Thu, 18 Apr 2019 19:23:19 +0000 (UTC) Date: Thu, 18 Apr 2019 19:23:18 +0000 To: "commits@geode.apache.org" Subject: [geode] branch develop updated: GEODE-6611: Correct publication issues in all-bom. (#3483) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155561539736.11998.7053640638431525221@gitbox.apache.org> From: prhomberg@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 6a177ecfebc443affda84bea33f3c6cfa26f7c00 X-Git-Newrev: f3428c6e3365323321637961c0f3036ede3b83be X-Git-Rev: f3428c6e3365323321637961c0f3036ede3b83be X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. prhomberg 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 f3428c6 GEODE-6611: Correct publication issues in all-bom. (#3483) f3428c6 is described below commit f3428c6e3365323321637961c0f3036ede3b83be Author: Patrick Rhomberg AuthorDate: Thu Apr 18 12:23:01 2019 -0700 GEODE-6611: Correct publication issues in all-bom. (#3483) * Add repository specification from publish.gradle to bom publishing block. This configuration should be extracted in a future commit to avoid duplication of code. Without this block, the bom publish task appears always UP-TO-DATE. * Add signing, also previously in publish.gradle. * Extra work with scope removed. As a bom without scope will default to 'compile' scope, and as explicit is better than implicit, the extra work was superfluous. --- boms/geode-all-bom/build.gradle | 29 ++++- .../src/test/resources/expected-pom.xml | 144 +++++++++++++++++++++ 2 files changed, 166 insertions(+), 7 deletions(-) diff --git a/boms/geode-all-bom/build.gradle b/boms/geode-all-bom/build.gradle index 52d22da..e20dbf5 100644 --- a/boms/geode-all-bom/build.gradle +++ b/boms/geode-all-bom/build.gradle @@ -19,6 +19,7 @@ plugins { id 'java-platform' id 'maven-publish' id 'geode-dependency-constraints' + id 'signing' } @@ -62,13 +63,6 @@ publishing { } } withXml { - // Dependency constraints publish the scope of those constraints. - // We remove these from our published bom, as they should apply at all scopes. - asNode().dependencyManagement.dependencies.dependency.each { - dep -> dep.remove(dep['scope']) - } - } - withXml { // Published Geode artifacts are constrained to match the version of this BOM. // We exclude any child of the :boms subproject def thisNode = asNode() @@ -80,6 +74,7 @@ publishing { geodeDependency*.appendNode('groupId')*.setValue(p.group) geodeDependency*.appendNode('artifactId')*.setValue(p.name) geodeDependency*.appendNode('version')*.setValue(p.version.toString()) + geodeDependency*.appendNode('scope')*.setValue('compile') } } thisNode @@ -94,6 +89,26 @@ publishing { } } } + repositories { + maven { + // Use specified mavenRepository if provided, else use release or snapshot defaults. + url = project.findProperty("mavenRepository") ?: + project.isReleaseVersion ? project.mavenReleaseUrl : project.mavenSnapshotUrl + if (url.toString().startsWith("http") || url.toString().startsWith("sftp")) { + // Username / password credentials are only supported for http, https, and sftp repos. + // See the Gradle documentation on Repository Types for more information. + credentials { + username project.findProperty("mavenUsername") + password project.findProperty("mavenPassword") + } + } + } + } +} + +signing { + required({project.isReleaseVersion && project.hasProperty('signing.keyId') && project.hasProperty('signing.secretKeyRingFile')}) + sign publishing.publications.maven } apply from: "${rootDir}/${scriptDir}/check-pom.gradle" diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml index 35efaec..86667ea 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -41,721 +41,865 @@ com.sun.xml.bind jaxb-impl 2.3.1 + compile javax.xml.bind jaxb-api 2.3.1 + compile antlr antlr 2.7.7 + compile cglib cglib 3.2.9 + compile com.carrotsearch.randomizedtesting randomizedtesting-runner 2.5.0 + compile com.fasterxml.jackson.module jackson-module-scala_2.10 2.9.8 + compile com.github.davidmoten geo 0.7.1 + compile com.github.stefanbirkner system-rules 1.19.0 + compile com.github.stephenc.findbugs findbugs-annotations 1.3.9-1 + compile com.google.guava guava 27.0-jre + compile com.google.protobuf protobuf-gradle-plugin 0.8.6 + compile com.google.protobuf protobuf-java 3.6.1 + compile com.healthmarketscience.rmiio rmiio 2.1.2 + compile com.mockrunner mockrunner-servlet 1.1.2 + compile com.sun.activation javax.activation 1.2.0 + compile com.sun.istack istack-commons-runtime 2.2 + compile com.zaxxer HikariCP 3.2.0 + compile commons-beanutils commons-beanutils 1.9.3 + compile commons-collections commons-collections 3.2.2 + compile commons-configuration commons-configuration 1.10 + compile commons-digester commons-digester 2.1 + compile commons-fileupload commons-fileupload 1.3.3 + compile commons-io commons-io 2.6 + compile commons-logging commons-logging 1.2 + compile commons-modeler commons-modeler 2.0.1 + compile commons-validator commons-validator 1.6 + compile io.github.classgraph classgraph 4.0.6 + compile io.micrometer micrometer-core 1.1.3 + compile io.netty netty-all 4.1.31.Final + compile it.unimi.dsi fastutil 8.2.2 + compile javax.annotation javax.annotation-api 1.3.2 + compile javax.annotation jsr250-api 1.0 + compile javax.ejb ejb-api 3.0 + compile javax.mail javax.mail-api 1.6.2 + compile javax.resource javax.resource-api 1.7.1 + compile javax.servlet javax.servlet-api 3.1.0 + compile junit junit 4.12 + compile mx4j mx4j-tools 3.0.1 + compile mysql mysql-connector-java 5.1.46 + compile net.java.dev.jna jna 4.1.0 + compile net.openhft compiler 2.3.1 + compile net.sf.jopt-simple jopt-simple 5.0.4 + compile net.spy spymemcached 2.12.2 + compile org.apache.bcel bcel 6.2 + compile org.apache.commons commons-lang3 3.8.1 + compile org.apache.derby derby 10.14.2.0 + compile org.apache.httpcomponents httpclient 4.5.6 + compile org.apache.httpcomponents httpcore 4.4.10 + compile org.apache.shiro shiro-core 1.4.0 + compile org.assertj assertj-core 3.11.1 + compile org.awaitility awaitility 3.1.2 + compile org.bouncycastle bcpkix-jdk15on 1.60 + compile org.codehaus.cargo cargo-core-uberjar 1.6.10 + compile org.eclipse.jetty jetty-webapp 9.4.12.v20180830 + compile org.eclipse.jetty jetty-server 9.4.12.v20180830 + compile org.eclipse.persistence javax.persistence 2.2.1 + compile org.fusesource.jansi jansi 1.17.1 + compile org.httpunit httpunit 1.7.3 + compile org.iq80.snappy snappy 0.4 + compile org.jgroups jgroups 3.6.14.Final + compile org.mockito mockito-core 2.23.0 + compile org.mortbay.jetty servlet-api 3.0.20100224 + compile org.postgresql postgresql 42.2.2 + compile org.skyscreamer jsonassert 1.5.0 + compile org.slf4j slf4j-api 1.7.25 + compile io.swagger swagger-annotations 1.5.20 + compile org.springframework.hateoas spring-hateoas 0.25.0.RELEASE + compile org.springframework.ldap spring-ldap-core 2.3.2.RELEASE + compile org.springframework.shell spring-shell 1.2.0.RELEASE + compile pl.pragmatists JUnitParams 1.1.0 + compile redis.clients jedis 2.9.0 + compile xerces xercesImpl 2.12.0 + compile com.fasterxml.jackson.core jackson-annotations 2.9.8 + compile com.fasterxml.jackson.core jackson-core 2.9.8 + compile com.fasterxml.jackson.core jackson-databind 2.9.8 + compile com.jayway.jsonpath json-path-assert 2.4.0 + compile com.jayway.jsonpath json-path 2.4.0 + compile com.palantir.docker.compose docker-compose-rule-core 0.31.1 + compile com.palantir.docker.compose docker-compose-rule-junit4 0.31.1 + compile com.pholser junit-quickcheck-core 0.8.1 + compile com.pholser junit-quickcheck-generators 0.8.1 + compile io.springfox springfox-swagger-ui 2.9.2 + compile io.springfox springfox-swagger2 2.9.2 + compile mx4j mx4j-remote 3.0.2 + compile mx4j mx4j 3.0.2 + compile org.apache.logging.log4j log4j-api 2.11.1 + compile org.apache.logging.log4j log4j-core 2.11.1 + compile org.apache.logging.log4j log4j-jcl 2.11.1 + compile org.apache.logging.log4j log4j-jul 2.11.1 + compile org.apache.logging.log4j log4j-slf4j-impl 2.11.1 + compile org.apache.lucene lucene-analyzers-common 6.6.2 + compile org.apache.lucene lucene-analyzers-phonetic 6.6.2 + compile org.apache.lucene lucene-core 6.6.2 + compile org.apache.lucene lucene-queryparser 6.6.2 + compile org.apache.lucene lucene-test-framework 6.6.2 + compile org.hamcrest hamcrest-all 1.3 + compile org.hamcrest hamcrest-core 1.3 + compile org.hamcrest hamcrest-library 1.3 + compile org.powermock powermock-api-mockito2 2.0.0-beta.5 + compile org.powermock powermock-core 2.0.0-beta.5 + compile org.powermock powermock-module-junit4 2.0.0-beta.5 + compile org.seleniumhq.selenium selenium-api 3.13.0 + compile org.seleniumhq.selenium selenium-chrome-driver 3.13.0 + compile org.seleniumhq.selenium selenium-remote-driver 3.13.0 + compile org.seleniumhq.selenium selenium-support 3.13.0 + compile org.springframework.security spring-security-config 4.2.8.RELEASE + compile org.springframework.security spring-security-core 4.2.8.RELEASE + compile org.springframework.security spring-security-ldap 4.2.8.RELEASE + compile org.springframework.security spring-security-test 4.2.8.RELEASE + compile org.springframework.security spring-security-web 4.2.8.RELEASE + compile org.springframework spring-aspects 4.3.20.RELEASE + compile org.springframework spring-beans 4.3.20.RELEASE + compile org.springframework spring-context 4.3.20.RELEASE + compile org.springframework spring-core 4.3.20.RELEASE + compile org.springframework spring-expression 4.3.20.RELEASE + compile org.springframework spring-oxm 4.3.20.RELEASE + compile org.springframework spring-test 4.3.20.RELEASE + compile org.springframework spring-tx 4.3.20.RELEASE + compile org.springframework spring-web 4.3.20.RELEASE + compile org.springframework spring-webmvc 4.3.20.RELEASE + compile org.apache.geode geode-common 1.10.0-SNAPSHOT + compile org.apache.geode geode-concurrency-test 1.10.0-SNAPSHOT + compile org.apache.geode geode-connectors 1.10.0-SNAPSHOT + compile org.apache.geode geode-core 1.10.0-SNAPSHOT + compile org.apache.geode geode-cq 1.10.0-SNAPSHOT + compile org.apache.geode geode-dunit 1.10.0-SNAPSHOT + compile org.apache.geode geode-experimental-driver 1.10.0-SNAPSHOT + compile org.apache.geode geode-junit 1.10.0-SNAPSHOT + compile org.apache.geode geode-lucene 1.10.0-SNAPSHOT + compile org.apache.geode geode-management 1.10.0-SNAPSHOT + compile org.apache.geode geode-memcached 1.10.0-SNAPSHOT + compile org.apache.geode geode-old-client-support 1.10.0-SNAPSHOT + compile org.apache.geode geode-protobuf 1.10.0-SNAPSHOT + compile org.apache.geode geode-protobuf-messages 1.10.0-SNAPSHOT + compile org.apache.geode geode-pulse 1.10.0-SNAPSHOT + compile org.apache.geode geode-rebalancer 1.10.0-SNAPSHOT + compile org.apache.geode geode-redis 1.10.0-SNAPSHOT + compile org.apache.geode geode-wan 1.10.0-SNAPSHOT + compile org.apache.geode geode-web 1.10.0-SNAPSHOT + compile org.apache.geode geode-web-api 1.10.0-SNAPSHOT + compile org.apache.geode geode-web-management 1.10.0-SNAPSHOT + compile org.apache.geode geode-lucene-test 1.10.0-SNAPSHOT + compile org.apache.geode geode-protobuf-test 1.10.0-SNAPSHOT + compile org.apache.geode geode-pulse-test 1.10.0-SNAPSHOT + compile