You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/08/20 04:27:57 UTC
[isis] branch master updated: ISIS-2849: fixes convergence issues
around 'asm'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 74a3d38 ISIS-2849: fixes convergence issues around 'asm'
74a3d38 is described below
commit 74a3d38554a9b200d8b856afa4b83da03026c801
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 20 06:27:51 2021 +0200
ISIS-2849: fixes convergence issues around 'asm'
---
api/applib/pom.xml | 7 +++++++
core/metamodel/pom.xml | 7 +++++++
core/pom.xml | 15 ++++++++++++++-
incubator/core/jsr303/pom.xml | 7 +++++++
viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 5 +++++
viewers/wicket/ui/pom.xml | 8 ++++++++
viewers/wicket/viewer/pom.xml | 5 -----
7 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 6819a68..f464d6f 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -100,6 +100,13 @@
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
+ <exclusions>
+ <!-- transitively provided by isis-jdk-supplemental -->
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 917556e..060a154 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -121,6 +121,13 @@
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
+ <exclusions>
+ <!-- transitively provided by isis-jdk-supplemental -->
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 6c8ad42..d585aae 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -84,6 +84,7 @@
<!-- LIBRARY DEPENDENCIES -->
<archunit.version>0.20.1</archunit.version>
+ <asm.version>9.1</asm.version> <!-- keep in sync with org.eclipse.persistence:org.eclipse.persistence.asm -->
<approvaltests.version>12.0.1</approvaltests.version>
<assertj-guava.version>3.4.0</assertj-guava.version>
@@ -167,7 +168,7 @@
<quartz-scheduler.version>2.3.2</quartz-scheduler.version>
<resteasy-spring-boot-starter.version>4.9.0.Final</resteasy-spring-boot-starter.version>
- <resteasy.version>4.6.2.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
+ <resteasy.version>4.7.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
<select2.version>4.0.13</select2.version>
<shiro.version>1.7.1</shiro.version>
@@ -853,6 +854,18 @@
</dependency>
<!-- THIRD PARTY DEPENDENCIES -->
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
diff --git a/incubator/core/jsr303/pom.xml b/incubator/core/jsr303/pom.xml
index f735201..9cf0606 100644
--- a/incubator/core/jsr303/pom.xml
+++ b/incubator/core/jsr303/pom.xml
@@ -62,6 +62,13 @@
<artifactId>jmock</artifactId>
<version>2.5.1</version>
<scope>test</scope>
+ <exclusions>
+ <!-- transitively provided by isis-jdk-supplemental -->
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 913c461..f05c8ff 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -87,6 +87,11 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
+ <!-- transitively provided by isis-jdk-supplemental -->
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 7bf7f37..0fd0cef 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -132,8 +132,16 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 93e664d..a264299 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -121,11 +121,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>9.0</version> <!-- keep in sync with org.jboss.resteasy:resteasy-spring-boot-starter -->
- </dependency>
<!-- Cglib patch END -->
<dependency>