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 2020/06/24 10:19:43 UTC
[isis] branch master updated: ISIS-2340: remove dependency
exclusions (no longer required)
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 2dfcd55 ISIS-2340: remove dependency exclusions (no longer required)
2dfcd55 is described below
commit 2dfcd55ddfcc9625be62dae707b27fb2dbd1ee89
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jun 24 12:19:30 2020 +0200
ISIS-2340: remove dependency exclusions (no longer required)
---
examples/demo/javafx/pom.xml | 24 -----------------------
security/shiro/pom.xml | 45 +++++++++++++++++++++++++++++++-------------
2 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/examples/demo/javafx/pom.xml b/examples/demo/javafx/pom.xml
index dee4ef0..204bf6f 100644
--- a/examples/demo/javafx/pom.xml
+++ b/examples/demo/javafx/pom.xml
@@ -113,18 +113,6 @@
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>
- spring-boot-starter-thymeleaf
- </artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- JDK11+ SUPPORT -->
@@ -142,18 +130,6 @@
<artifactId>isis-viewer-javafx-viewer</artifactId>
<!-- incubator version is not managed by app starter bundles -->
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-webapp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>
- spring-boot-starter-thymeleaf
- </artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- EXTENSIONS -->
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 77c62ec..d7cf6dc 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -58,24 +58,27 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtimeservices</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webapp</artifactId>
+ <!-- don't make these transitive, so that we can make headless use
+ of the isis-security-shiro module (without bringing in spring-boot-web) -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>
+ spring-boot-starter-thymeleaf
+ </artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- SHIRO -->
<dependency>
<groupId>org.apache.shiro</groupId>
@@ -87,10 +90,26 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
</dependency>
+
+ <!-- TESTING -->
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-internaltestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>