You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2019/10/14 20:21:46 UTC
[geode] branch release/1.9.2 updated: GEODE-7241: Refactor
publish.gradle into -java and -war types
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch release/1.9.2
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/release/1.9.2 by this push:
new 1615ffe GEODE-7241: Refactor publish.gradle into -java and -war types
1615ffe is described below
commit 1615ffe6d5a8000c0a308dfa6609848d84ee5361
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Fri Oct 4 15:35:42 2019 -0700
GEODE-7241: Refactor publish.gradle into -java and -war types
Authored-by: Robert Houghton <rh...@pivotal.io>
---
boms/geode-all-bom/build.gradle | 2 +-
.../src/test/resources/expected-pom.xml | 714 ---------------------
boms/geode-client-bom/build.gradle | 2 +-
geode-assembly/build.gradle | 2 +-
geode-assembly/src/test/resources/expected-pom.xml | 11 -
geode-common/build.gradle | 2 +-
geode-concurrency-test/build.gradle | 2 +-
geode-connectors/build.gradle | 2 +-
geode-core/build.gradle | 2 +-
geode-cq/build.gradle | 2 +-
geode-dunit/build.gradle | 2 +-
geode-experimental-driver/build.gradle | 2 +-
geode-junit/build.gradle | 2 +-
geode-lucene/build.gradle | 2 +-
geode-management/build.gradle | 2 +-
geode-old-client-support/build.gradle | 2 +-
geode-protobuf-messages/build.gradle | 2 +-
geode-protobuf/build.gradle | 2 +-
geode-pulse/build.gradle | 2 +-
geode-pulse/src/test/resources/expected-pom.xml | 202 +-----
geode-rebalancer/build.gradle | 2 +-
geode-redis/build.gradle | 2 +-
geode-wan/build.gradle | 2 +-
geode-web-api/build.gradle | 2 +-
geode-web-api/src/test/resources/expected-pom.xml | 163 +----
geode-web-management/build.gradle | 2 +-
.../src/test/resources/expected-pom.xml | 163 +----
geode-web/build.gradle | 2 +-
geode-web/src/test/resources/expected-pom.xml | 78 +--
gradle/{publish.gradle => publish-common.gradle} | 3 -
.../build.gradle => gradle/publish-java.gradle | 14 +-
.../build.gradle => gradle/publish-war.gradle | 14 +-
32 files changed, 45 insertions(+), 1363 deletions(-)
diff --git a/boms/geode-all-bom/build.gradle b/boms/geode-all-bom/build.gradle
index 041c890..826bc79 100644
--- a/boms/geode-all-bom/build.gradle
+++ b/boms/geode-all-bom/build.gradle
@@ -20,7 +20,7 @@ plugins {
id 'maven-publish'
}
-apply from: "${project.projectDir}/../../gradle/publish.gradle"
+apply from: "${project.projectDir}/../../gradle/publish-common.gradle"
jar.enabled = false
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 bcc9a4c..5d36f5e 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -35,718 +35,4 @@
<developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
<url>https://github.com/apache/geode</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>3.2.9</version>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>randomizedtesting-runner</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.10</artifactId>
- <version>2.9.8</version>
- </dependency>
- <dependency>
- <groupId>com.github.davidmoten</groupId>
- <artifactId>geo</artifactId>
- <version>0.7.1</version>
- </dependency>
- <dependency>
- <groupId>com.github.stefanbirkner</groupId>
- <artifactId>system-rules</artifactId>
- <version>1.19.0</version>
- </dependency>
- <dependency>
- <groupId>com.github.stephenc.findbugs</groupId>
- <artifactId>findbugs-annotations</artifactId>
- <version>1.3.9-1</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>27.0-jre</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-gradle-plugin</artifactId>
- <version>0.8.6</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>3.6.1</version>
- </dependency>
- <dependency>
- <groupId>com.healthmarketscience.rmiio</groupId>
- <artifactId>rmiio</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
- <groupId>com.mockrunner</groupId>
- <artifactId>mockrunner-servlet</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.istack</groupId>
- <artifactId>istack-commons-runtime</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>com.vaadin.external.google</groupId>
- <artifactId>android-json</artifactId>
- <version>0.0.20131108.vaadin1</version>
- </dependency>
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>3.2.0</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-modeler</groupId>
- <artifactId>commons-modeler</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>io.github.classgraph</groupId>
- <artifactId>classgraph</artifactId>
- <version>4.0.6</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.1.31.Final</version>
- </dependency>
- <dependency>
- <groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil</artifactId>
- <version>8.2.2</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.46</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>5.0.4</version>
- </dependency>
- <dependency>
- <groupId>net.spy</groupId>
- <artifactId>spymemcached</artifactId>
- <version>2.12.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.11.1</version>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.60</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>1.6.10</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>9.4.12.v20180830</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>9.4.12.v20180830</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.fusesource.jansi</groupId>
- <artifactId>jansi</artifactId>
- <version>1.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.7.3</version>
- </dependency>
- <dependency>
- <groupId>org.iq80.snappy</groupId>
- <artifactId>snappy</artifactId>
- <version>0.4</version>
- </dependency>
- <dependency>
- <groupId>org.jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>3.6.14.Final</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.23.0</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api</artifactId>
- <version>3.0.20100224</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.skyscreamer</groupId>
- <artifactId>jsonassert</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.hateoas</groupId>
- <artifactId>spring-hateoas</artifactId>
- <version>0.25.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core</artifactId>
- <version>2.3.2.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.shell</groupId>
- <artifactId>spring-shell</artifactId>
- <version>1.2.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.9.8</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.9.8</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.8</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path-assert</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.palantir.docker.compose</groupId>
- <artifactId>docker-compose-rule-core</artifactId>
- <version>0.31.1</version>
- </dependency>
- <dependency>
- <groupId>com.palantir.docker.compose</groupId>
- <artifactId>docker-compose-rule-junit4</artifactId>
- <version>0.31.1</version>
- </dependency>
- <dependency>
- <groupId>com.pholser</groupId>
- <artifactId>junit-quickcheck-core</artifactId>
- <version>0.8.1</version>
- </dependency>
- <dependency>
- <groupId>com.pholser</groupId>
- <artifactId>junit-quickcheck-generators</artifactId>
- <version>0.8.1</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.11.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.11.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>2.11.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <version>2.11.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.11.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>6.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-phonetic</artifactId>
- <version>6.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>6.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>6.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>6.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.0-beta.5</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>2.0.0-beta.5</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>2.0.0-beta.5</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-api</artifactId>
- <version>3.13.0</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-chrome-driver</artifactId>
- <version>3.13.0</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-remote-driver</artifactId>
- <version>3.13.0</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-support</artifactId>
- <version>3.13.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>4.2.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>4.2.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-ldap</artifactId>
- <version>4.2.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-test</artifactId>
- <version>4.2.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>4.2.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aspects</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>4.3.20.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-common</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-concurrency-test</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-connectors</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-core</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-cq</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-dunit</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-experimental-driver</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-junit</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-lucene</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-management</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-old-client-support</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-protobuf</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-protobuf-messages</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-pulse</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-rebalancer</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-redis</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-wan</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-web</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-web-api</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-web-management</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-lucene-test</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-protobuf-test</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-pulse-test</artifactId>
- <version>1.9.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
diff --git a/boms/geode-client-bom/build.gradle b/boms/geode-client-bom/build.gradle
index 7530369..56f405e 100644
--- a/boms/geode-client-bom/build.gradle
+++ b/boms/geode-client-bom/build.gradle
@@ -16,7 +16,7 @@
*/
apply plugin: "io.spring.dependency-management"
-apply from: "${project.projectDir}/../../gradle/publish.gradle"
+apply from: "${project.projectDir}/../../gradle/publish-common.gradle"
jar.enabled = false
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index a53e29b..2acd0c6 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -23,7 +23,7 @@ import java.nio.file.Paths
evaluationDependsOn(":geode-core")
apply plugin: 'distribution'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-common.gradle"
// This subproject's 'publication' is not a jar and should not be constrained to match versions
// in the geode-all-bom.
project.ext.set('constrainVersionInBom', false)
diff --git a/geode-assembly/src/test/resources/expected-pom.xml b/geode-assembly/src/test/resources/expected-pom.xml
index 82423f3..54f6192 100644
--- a/geode-assembly/src/test/resources/expected-pom.xml
+++ b/geode-assembly/src/test/resources/expected-pom.xml
@@ -35,15 +35,4 @@
<developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
<url>https://github.com/apache/geode</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-all-bom</artifactId>
- <version>1.9.2</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
diff --git a/geode-common/build.gradle b/geode-common/build.gradle
index 6a2ed39..be433a3 100755
--- a/geode-common/build.gradle
+++ b/geode-common/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
compile(platform(project(':boms:geode-all-bom')))
diff --git a/geode-concurrency-test/build.gradle b/geode-concurrency-test/build.gradle
index 7d422c8..bf6e71e 100644
--- a/geode-concurrency-test/build.gradle
+++ b/geode-concurrency-test/build.gradle
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index f72ec14..0f1eb81 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -24,7 +24,7 @@ repositories {
}
}
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 12b6b92..90e6744 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'antlr'
apply plugin: 'me.champeau.gradle.jmh'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
apply from: "${project.projectDir}/../gradle/pmd.gradle"
sourceSets {
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index 84be17c..a3c71cc 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
index 67906e3..f7b76d6 100755
--- a/geode-dunit/build.gradle
+++ b/geode-dunit/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
index 0689dac..de49841 100644
--- a/geode-experimental-driver/build.gradle
+++ b/geode-experimental-driver/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index 9e6a641..3372ea6 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index 351f51e..ef0a9e4 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-management/build.gradle b/geode-management/build.gradle
index a30d1df..ac3f16d 100755
--- a/geode-management/build.gradle
+++ b/geode-management/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
compile(platform(project(':boms:geode-all-bom')))
diff --git a/geode-old-client-support/build.gradle b/geode-old-client-support/build.gradle
index dec4463..262d0d9 100644
--- a/geode-old-client-support/build.gradle
+++ b/geode-old-client-support/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-protobuf-messages/build.gradle b/geode-protobuf-messages/build.gradle
index 87d10e5..b26b1e9 100644
--- a/geode-protobuf-messages/build.gradle
+++ b/geode-protobuf-messages/build.gradle
@@ -28,7 +28,7 @@ buildscript {
apply plugin: 'com.google.protobuf'
apply plugin: 'idea'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
api(platform(project(':boms:geode-all-bom')))
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 0f5323c..593a396 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index aab5709..9c9ec52 100644
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -16,7 +16,7 @@
*/
apply plugin: 'war'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-war.gradle"
dependencies {
diff --git a/geode-pulse/src/test/resources/expected-pom.xml b/geode-pulse/src/test/resources/expected-pom.xml
index 0b2c2ee..2eb3377 100644
--- a/geode-pulse/src/test/resources/expected-pom.xml
+++ b/geode-pulse/src/test/resources/expected-pom.xml
@@ -20,6 +20,7 @@
<groupId>org.apache.geode</groupId>
<artifactId>geode-pulse</artifactId>
<version>1.9.2</version>
+ <packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -34,205 +35,4 @@
<developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
<url>https://github.com/apache/geode</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-all-bom</artifactId>
- <version>1.9.2</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-expression</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-ldap</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-asm</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-jdbc</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-expression</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-asm</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-jdbc</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-expression</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aspectjweaver</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</project>
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index 8bc11bd..cce6be3 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-redis/build.gradle b/geode-redis/build.gradle
index 88eb424..8e32c12 100644
--- a/geode-redis/build.gradle
+++ b/geode-redis/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
compile(platform(project(':boms:geode-all-bom')))
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index 88ac3ac..a4cae08 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
dependencies {
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index cdea6c8..b88b7b4 100644
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'war'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-war.gradle"
dependencies {
diff --git a/geode-web-api/src/test/resources/expected-pom.xml b/geode-web-api/src/test/resources/expected-pom.xml
index 661e924..8ff2e14 100644
--- a/geode-web-api/src/test/resources/expected-pom.xml
+++ b/geode-web-api/src/test/resources/expected-pom.xml
@@ -20,6 +20,7 @@
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-api</artifactId>
<version>1.9.2</version>
+ <packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -34,166 +35,4 @@
<developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
<url>https://github.com/apache/geode</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-all-bom</artifactId>
- <version>1.9.2</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-io</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.10</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.hateoas</groupId>
- <artifactId>spring-hateoas</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>objenesis</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aspects</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aspectjweaver</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-beans</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
</project>
diff --git a/geode-web-management/build.gradle b/geode-web-management/build.gradle
index bff4ebf..9dcf0a2 100644
--- a/geode-web-management/build.gradle
+++ b/geode-web-management/build.gradle
@@ -15,7 +15,7 @@
apply plugin: 'war'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-war.gradle"
configurations {
commonTestCompile
diff --git a/geode-web-management/src/test/resources/expected-pom.xml b/geode-web-management/src/test/resources/expected-pom.xml
index ae31362..d4850e6 100644
--- a/geode-web-management/src/test/resources/expected-pom.xml
+++ b/geode-web-management/src/test/resources/expected-pom.xml
@@ -20,6 +20,7 @@
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.9.2</version>
+ <packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -34,166 +35,4 @@
<developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
<url>https://github.com/apache/geode</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-all-bom</artifactId>
- <version>1.9.2</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-io</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.10</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.hateoas</groupId>
- <artifactId>spring-hateoas</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>objenesis</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aspects</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aspectjweaver</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-beans</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
</project>
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 9acf365..a4a06cb 100644
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'war'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-war.gradle"
dependencies {
diff --git a/geode-web/src/test/resources/expected-pom.xml b/geode-web/src/test/resources/expected-pom.xml
index 3072af9..d7c0386 100644
--- a/geode-web/src/test/resources/expected-pom.xml
+++ b/geode-web/src/test/resources/expected-pom.xml
@@ -20,6 +20,7 @@
<groupId>org.apache.geode</groupId>
<artifactId>geode-web</artifactId>
<version>1.9.2</version>
+ <packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -34,81 +35,4 @@
<developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
<url>https://github.com/apache/geode</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-all-bom</artifactId>
- <version>1.9.2</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aspects</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aspectjweaver</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-beans</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aspectjweaver</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-io</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
</project>
diff --git a/gradle/publish.gradle b/gradle/publish-common.gradle
similarity index 98%
rename from gradle/publish.gradle
rename to gradle/publish-common.gradle
index 1f5ea28..d917a5c 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish-common.gradle
@@ -15,12 +15,10 @@
* limitations under the License.
*/
-
apply plugin: 'maven-publish'
apply plugin: 'signing'
// The published bom will constrain versions within geode of any subproject with this property set.
-// This is normally set in publish.gradle, but since we do not consume that file, we opt in directly.
project.ext.set('constrainVersionInBom', true)
task sourcesJar(type: Jar) {
@@ -53,7 +51,6 @@ def apacheLicense = '''
publishing {
publications {
maven(MavenPublication) {
- from components.java
// use the (possibly empty) Jar tasks above for sources and javadoc
artifact sourcesJar
diff --git a/geode-common/build.gradle b/gradle/publish-java.gradle
old mode 100755
new mode 100644
similarity index 79%
copy from geode-common/build.gradle
copy to gradle/publish-java.gradle
index 6a2ed39..4abecae
--- a/geode-common/build.gradle
+++ b/gradle/publish-java.gradle
@@ -15,10 +15,14 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${rootDir}/gradle/publish-common.gradle"
-dependencies {
- compile(platform(project(':boms:geode-all-bom')))
- testCompile('junit:junit')
- testCompile('org.assertj:assertj-core')
+publishing {
+ publications {
+ maven(MavenPublication) {
+ if (project.name != 'geode-assembly') {
+ from components.java
+ }
+ }
+ }
}
diff --git a/geode-common/build.gradle b/gradle/publish-war.gradle
old mode 100755
new mode 100644
similarity index 79%
copy from geode-common/build.gradle
copy to gradle/publish-war.gradle
index 6a2ed39..e5a8283
--- a/geode-common/build.gradle
+++ b/gradle/publish-war.gradle
@@ -15,10 +15,14 @@
* limitations under the License.
*/
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${rootDir}/gradle/publish-common.gradle"
-dependencies {
- compile(platform(project(':boms:geode-all-bom')))
- testCompile('junit:junit')
- testCompile('org.assertj:assertj-core')
+publishing {
+ publications {
+ maven(MavenPublication) {
+ if (project.name != 'geode-assembly') {
+ from components.web
+ }
+ }
+ }
}