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 84ddc1f ISIS-1841 dom4j and other XML libraries no longer needed
84ddc1f is described below
commit 84ddc1f9b3024713cfa39d6f2b4d87489b37097c
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Sat Apr 14 14:29:58 2018 +0200
ISIS-1841 dom4j and other XML libraries no longer needed
---
core/pom.xml | 47 +++++++++++++------------------
core/runtime-legacy/pom.xml | 9 ++++++
core/runtime/pom.xml | 8 +++---
core/viewer-restfulobjects-applib/pom.xml | 8 +++---
4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 2771e42..3d01e23 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -172,9 +172,11 @@
<javaee.version>7.0</javaee.version>
+ <!-- XML libraries ... no longer needed
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
- <xstream.version>1.4.9</xstream.version>
+ <xstream.version>1.4.9</xstream.version> -->
+
<htmlparser.version>2.1</htmlparser.version>
<junit.version>4.12</junit.version>
@@ -183,16 +185,6 @@
<easymock.version>2.5.2</easymock.version>
<cucumber.version>1.2.4</cucumber.version>
-<!--
<geronimo-jsp_2.1_spec.version>1.0.1</geronimo-jsp_2.1_spec.version> -->
-<!--
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version> -->
-<!--
<geronimo-jta_1.0.1B_spec.version>1.1.1</geronimo-jta_1.0.1B_spec.version> -->
-<!--
<geronimo-servlet_3.0_spec.version>1.0</geronimo-servlet_3.0_spec.version> -->
-<!--
<geronimo-annotation_1.0_spec.version>1.1.1</geronimo-annotation_1.0_spec.version>
-->
-<!--
<geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version>
-->
-<!--
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
-->
-<!--
<geronimo-atinject_1.0_spec.version>1.0</geronimo-atinject_1.0_spec.version> -->
-<!--
<geronimo-jcdi_1.0_spec.version>1.0</geronimo-jcdi_1.0_spec.version> -->
-
<validation-api.version>1.1.0.Final</validation-api.version>
<transaction-api.version>1.2</transaction-api.version>
@@ -1641,23 +1633,22 @@ ${license.additional-notes}
<version>${javassist.version}</version>
</dependency>
-
- <!-- XML libraries -->
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom.version}</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>${xstream.version}</version>
- </dependency>
+ <!-- XML libraries ... no longer needed -->
+<!-- <dependency> -->
+<!-- <groupId>dom4j</groupId> -->
+<!-- <artifactId>dom4j</artifactId> -->
+<!-- <version>${dom4j.version}</version> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.jdom</groupId> -->
+<!-- <artifactId>jdom</artifactId> -->
+<!-- <version>${jdom.version}</version> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>com.thoughtworks.xstream</groupId> -->
+<!-- <artifactId>xstream</artifactId> -->
+<!-- <version>${xstream.version}</version> -->
+<!-- </dependency> -->
<!-- JSON libraries -->
diff --git a/core/runtime-legacy/pom.xml b/core/runtime-legacy/pom.xml
index 9940902..8135274 100644
--- a/core/runtime-legacy/pom.xml
+++ b/core/runtime-legacy/pom.xml
@@ -88,6 +88,15 @@
<scope>test</scope>
</dependency>
+ <!-- NO LONGER NEEDED BY NON-LEGACY -->
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
+
</dependencies>
<profiles>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index cfafe0c..d54a0f6 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -98,10 +98,10 @@
<artifactId>isis-core-schema</artifactId>
</dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>dom4j</groupId> -->
+<!-- <artifactId>dom4j</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/core/viewer-restfulobjects-applib/pom.xml
b/core/viewer-restfulobjects-applib/pom.xml
index 5edf177..1f8163c 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -47,10 +47,10 @@
<artifactId>log4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.jdom</groupId> -->
+<!-- <artifactId>jdom</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.apache.isis.core</groupId>
--
To stop receiving notification emails like this one, please contact
ahu...@apache.org.
