This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new ded32a0 minor version tidying to remove duplicates
ded32a0 is described below
commit ded32a0fbe34d0d38a743fa80fbfdfd034957ded
Author: Alex Heneveld <[email protected]>
AuthorDate: Wed Mar 31 16:21:11 2021 +0100
minor version tidying to remove duplicates
---
core/pom.xml | 9 ---------
karaf/features/src/main/feature/feature.xml | 12 +++++++-----
parent/pom.xml | 3 ++-
pom.xml | 9 +++++----
4 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 82c2f82..cd5a2c5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -89,19 +89,10 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <scope>compile</scope>
- <exclusions>
- <!-- provided by bcprov-ext instead -->
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index c26c6a0..0c585d9 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -146,11 +146,13 @@
<bundle
dependency="true">mvn:net.minidev/json-smart/${jsonSmart.version}</bundle>
<bundle
dependency="true">mvn:net.minidev/accessors-smart/${minidev.accessors-smart.version}</bundle>
- <bundle
dependency="true">mvn:org.ow2.asm/asm/${ow2.asm.version}</bundle>
- <bundle
dependency="true">mvn:org.ow2.asm/asm-commons/${ow2.asm.version}</bundle>
- <bundle
dependency="true">mvn:org.ow2.asm/asm-tree/${ow2.asm.version}</bundle>
- <bundle
dependency="true">mvn:org.ow2.asm/asm-analysis/${ow2.asm.version}</bundle>
- <bundle
dependency="true">mvn:org.ow2.asm/asm-util/${ow2.asm.version}</bundle>
+ <!-- we need a really old one for json-path; later ones are wanted by
pax and aries -->
+ <bundle
dependency="true">mvn:org.ow2.asm/asm/${ow2.asm.version.jsonpath}</bundle>
+ <bundle
dependency="true">mvn:org.ow2.asm/asm-commons/${ow2.asm.version.jsonpath}</bundle>
+ <bundle
dependency="true">mvn:org.ow2.asm/asm-tree/${ow2.asm.version.jsonpath}</bundle>
+ <bundle
dependency="true">mvn:org.ow2.asm/asm-analysis/${ow2.asm.version.jsonpath}</bundle>
+ <bundle
dependency="true">mvn:org.ow2.asm/asm-util/${ow2.asm.version.jsonpath}</bundle>
+
<bundle
dependency="true">mvn:org.ops4j.pax.web/pax-web-spi/${pax-web.version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata_2.0_spec.version}</bundle>
<bundle
dependency="true">mvn:com.thoughtworks.xstream/xstream/${xstream.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index e62a16f..171a4b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -132,7 +132,8 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>${ow2.asm.version}</version>
+ <!-- this oldest one has to be present for jsonpath; if we
need to use a later one we might need to replace jsonpath -->
+ <version>${ow2.asm.version.jsonpath}</version>
</dependency>
<dependency>
<groupId>jline</groupId> <!-- when removing this, replace uses
with org.jline -->
diff --git a/pom.xml b/pom.xml
index 9190f15..b6e68fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,9 +143,9 @@
<eddsa.version>0.2.0</eddsa.version>
<!-- JClouds 2.2.0 imports ssjj 0.20.0 -->
<sshj.version>0.22.0</sshj.version>
- <!-- jzlib version is 1.1.3, but bundle is 1.1.3_2 -->
- <!--JClouds 2.2.0 imports 1.0.7_1-->
+ <!-- jzlib osgi version is 1.1.3.2, but bundle is 1.1.3_2 ; JClouds
2.2.0 pulls in 1.0.7_1 but is happy with 1.1.3.2 -->
<jzlib.version>1.1.3_2</jzlib.version>
+ <jzlib.osgi.version>1.1.3.2</jzlib.osgi.version>
<reflections.version>0.9.10</reflections.version>
<jetty-schemas.version>3.1.M0</jetty-schemas.version>
<airline.version>0.7</airline.version>
@@ -197,8 +197,9 @@
<commons-logging.version>1.2</commons-logging.version>
<jsonSmart.version>2.3</jsonSmart.version>
<minidev.accessors-smart.version>1.2</minidev.accessors-smart.version>
- <ow2.asm.version>5.2</ow2.asm.version>
- <!-- json-path needs this objectweb.asm version (<6.0.0);
+
+ <ow2.asm.version.jsonpath>5.2</ow2.asm.version.jsonpath>
+ <!-- json-path needs objectweb.asm version 5.2 (<6.0.0), and won't
accept a bundleReplacement for a higher one;
in addition currently pax-web-core brings in 8.0.1 and
aries-proxy 9.0;
the addition of 5.2 triggers a refresh of the wiring of proxy
because asm is an optional dependency
(even though it's a lower version and it shouldn't);
