This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push: new a53be62 GEODE-8744: fix multiple versions of json-smart (#5776) a53be62 is described below commit a53be62e1390d6032d2e077829a904d29fa42040 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Mon Nov 30 16:43:23 2020 -0800 GEODE-8744: fix multiple versions of json-smart (#5776) --- boms/geode-all-bom/src/test/resources/expected-pom.xml | 6 ++++++ .../org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 1 + 2 files changed, 7 insertions(+) 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 4e3dcb9..625f2d8 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -344,6 +344,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + <version>2.3</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>net.openhft</groupId> <artifactId>compiler</artifactId> <version>2.3.5</version> diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index 3295d8e..985f534 100644 --- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy +++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy @@ -135,6 +135,7 @@ class DependencyConstraints implements Plugin<Project> { api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46') api(group: 'net.java.dev.jna', name: 'jna', version: '5.5.0') api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0') + api(group: 'net.minidev', name: 'json-smart', version: '2.3') api(group: 'net.openhft', name: 'compiler', version: '2.3.5') api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4') api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.22.0')