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 2019/07/03 13:48:35 UTC
[isis] 01/02: ISIS-2133 simplify extension poms
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f97acbcef86baa743992733538648b85588dc7e6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jul 3 15:19:35 2019 +0200
ISIS-2133 simplify extension poms
---
extensions/asciidoc/pom.xml | 19 -------------------
extensions/fixtures/pom.xml | 19 -------------------
extensions/markdown/pom.xml | 32 ++++++++++++--------------------
extensions/specsupport/pom.xml | 19 -------------------
extensions/viewer-wicket-excel/pom.xml | 19 -------------------
5 files changed, 12 insertions(+), 96 deletions(-)
diff --git a/extensions/asciidoc/pom.xml b/extensions/asciidoc/pom.xml
index 5accedc..2558954 100644
--- a/extensions/asciidoc/pom.xml
+++ b/extensions/asciidoc/pom.xml
@@ -30,25 +30,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/asciidoc</git-plugin.propertiesDir>
</properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-
<dependencies>
<!-- provides a ASCII-DOC parser -->
diff --git a/extensions/fixtures/pom.xml b/extensions/fixtures/pom.xml
index d836e85..0f325e4 100644
--- a/extensions/fixtures/pom.xml
+++ b/extensions/fixtures/pom.xml
@@ -30,25 +30,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/fixtures</git-plugin.propertiesDir>
</properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-
<dependencies>
<!-- JDO API (non transient, provided by plugin) -->
diff --git a/extensions/markdown/pom.xml b/extensions/markdown/pom.xml
index b509305..e64462a 100644
--- a/extensions/markdown/pom.xml
+++ b/extensions/markdown/pom.xml
@@ -30,25 +30,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/markdown</git-plugin.propertiesDir>
</properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-
<dependencies>
<!-- provides a markdown parser -->
@@ -56,8 +37,19 @@
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
<version>0.34.32</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.10.2</version>
</dependency>
-
+
</dependencies>
<profiles>
diff --git a/extensions/specsupport/pom.xml b/extensions/specsupport/pom.xml
index 3cd09b1..ee0f781 100644
--- a/extensions/specsupport/pom.xml
+++ b/extensions/specsupport/pom.xml
@@ -30,25 +30,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/specsupport</git-plugin.propertiesDir>
</properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-
<dependencies>
<dependency>
diff --git a/extensions/viewer-wicket-excel/pom.xml b/extensions/viewer-wicket-excel/pom.xml
index 1ac2f92..9817cea 100644
--- a/extensions/viewer-wicket-excel/pom.xml
+++ b/extensions/viewer-wicket-excel/pom.xml
@@ -36,25 +36,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/viewer-wicket-excel</git-plugin.propertiesDir>
</properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-
<dependencies>
<dependency>