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 df0568a Bumps POI 4.1.2 -> 5.0.0
df0568a is described below
commit df0568ac4aee2b12e085f736c46cf375537da23b
Author: Andi Huber <[email protected]>
AuthorDate: Thu Oct 28 13:37:46 2021 +0200
Bumps POI 4.1.2 -> 5.0.0
- version 5.1.0 is expected to be out soon
- also bumps xdocreport 1.0.6 -> 2.0.2
---
core/pom.xml | 6 +-
.../customui/geocoding/GeoapifyClient.java | 7 +-
extensions/vw/exceldownload/ui/pom.xml | 51 +++------------
subdomains/excel/applib/pom.xml | 39 +++++++-----
subdomains/poi/pom.xml | 58 +++++++++++++++++
subdomains/pom.xml | 9 ++-
subdomains/xdocreport/applib/pom.xml | 74 ++++++++++++++++------
7 files changed, 160 insertions(+), 84 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3799e04..19ffff0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -164,7 +164,7 @@
<pdfbox.version>2.0.24</pdfbox.version>
<picocontainer.version>2.15</picocontainer.version>
- <poi.version>4.1.2</poi.version>
+ <poi.version>5.0.0</poi.version>
<quartz-scheduler.version>2.3.2</quartz-scheduler.version>
@@ -196,7 +196,7 @@
<wicketstuff.version>8.13.0</wicketstuff.version> <!--
org.wicketstuff:wicketstuff-select2 -->
<wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
- <xdocreport.version>1.0.6</xdocreport.version>
+ <xdocreport.version>2.0.2</xdocreport.version>
</properties>
@@ -1185,7 +1185,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
+ <artifactId>poi-ooxml-lite</artifactId>
<version>${poi.version}</version>
</dependency>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java
b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java
index d081e2b..042924a 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java
@@ -30,9 +30,10 @@ import javax.inject.Inject;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.compress.utils.IOUtils;
import org.springframework.stereotype.Service;
+import org.apache.isis.commons.internal.base._Bytes;
+
import lombok.Builder;
import lombok.Data;
import lombok.Getter;
@@ -99,7 +100,7 @@ public class GeoapifyClient implements Serializable {
}
//tag::class[]
- public byte[] toJpeg(final String latitude, final String longitude, int
zoom) throws IOException {
+ public byte[] toJpeg(final String latitude, final String longitude, final
int zoom) throws IOException {
//...
//end::class[]
return
toJpeg(JpegRequest.builder().latitude(latitude).longitude(longitude).zoom(zoom).build());
@@ -118,7 +119,7 @@ public class GeoapifyClient implements Serializable {
, apiKey);
val con = (HttpURLConnection) new URL(urlStr).openConnection();
val is = con.getInputStream();
- return IOUtils.toByteArray(is);
+ return _Bytes.of(is);
}
@Data
diff --git a/extensions/vw/exceldownload/ui/pom.xml
b/extensions/vw/exceldownload/ui/pom.xml
index 8f97d0b..a2b4706 100644
--- a/extensions/vw/exceldownload/ui/pom.xml
+++ b/extensions/vw/exceldownload/ui/pom.xml
@@ -52,55 +52,20 @@
</build>
<dependencies>
+
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <exclusions>
- <exclusion>
- <!-- version clash with
org.apache.wicket:wicket-util:8.6.1 -->
- <groupId>org.apache.commons</groupId>
-
<artifactId>commons-collections4</artifactId>
- </exclusion>
- </exclusions>
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-poi</artifactId>
+ <type>pom</type>
+ <scope>import</scope>
+ <version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- </dependency>
-
+
</dependencies>
- <profiles>
- <profile>
- <id>resolve-dependency-convergence</id>
- <activation>
- <property>
- <name>!skip.resolve-dependency-convergence</name>
- </property>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
-
</project>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index cace29c..55279dd 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -46,24 +46,31 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-poi</artifactId>
+ <type>pom</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.apache.poi</groupId> -->
+<!-- <artifactId>poi-ooxml</artifactId> -->
+<!-- <exclusions> -->
+<!-- <exclusion> -->
+<!-- <groupId>xml-apis</groupId> -->
+<!-- <artifactId>xml-apis</artifactId> -->
+<!-- </exclusion> -->
+<!-- </exclusions> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>xml-apis</groupId> -->
+<!-- <artifactId>xml-apis</artifactId> -->
+<!-- <version>1.4.01</version> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.poi</groupId> -->
+<!-- <artifactId>poi-ooxml-lite</artifactId> -->
+<!-- </dependency> -->
+
<!-- test -->
<dependency>
diff --git a/subdomains/poi/pom.xml b/subdomains/poi/pom.xml
new file mode 100644
index 0000000..50b53ab
--- /dev/null
+++ b/subdomains/poi/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-subdomains-poi</artifactId>
+ <name>Apache Isis Sub - POI</name>
+
+ <description>
+ Apache POI dependencies
+ </description>
+
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+
<groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-lite</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 0f19765..4a2d75f 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -72,6 +72,13 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-poi</artifactId>
+ <type>pom</type>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-docx-applib</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
@@ -185,8 +192,8 @@
</dependencies>
<modules>
-
<module>base</module>
+ <module>poi</module>
<module>docx</module>
<module>excel</module>
<module>freemarker</module>
diff --git a/subdomains/xdocreport/applib/pom.xml
b/subdomains/xdocreport/applib/pom.xml
index 908d905..e1f480a 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -36,6 +36,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-poi</artifactId>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
<groupId>fr.opensagres.xdocreport</groupId>
<artifactId>fr.opensagres.xdocreport.document.docx</artifactId>
<exclusions>
@@ -43,6 +49,14 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -53,6 +67,14 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -63,28 +85,44 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
-
<artifactId>org.apache.poi.xwpf.converter.pdf</artifactId>
- <exclusions>
<exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
-
<artifactId>org.apache.poi.xwpf.converter.core</artifactId>
- <exclusions>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+<!-- <dependency> -->
+<!-- <groupId>fr.opensagres.xdocreport</groupId> -->
+<!--
<artifactId>org.apache.poi.xwpf.converter.pdf</artifactId> -->
+<!-- <exclusions> -->
+<!-- <exclusion> -->
+<!-- <groupId>org.osgi</groupId> -->
+<!-- <artifactId>org.osgi.core</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>org.apache.poi</groupId> -->
+<!-- <artifactId>poi-ooxml</artifactId> -->
+<!-- </exclusion> -->
+<!-- </exclusions> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>fr.opensagres.xdocreport</groupId> -->
+<!--
<artifactId>org.apache.poi.xwpf.converter.core</artifactId> -->
+<!-- <exclusions> -->
+<!-- <exclusion> -->
+<!-- <groupId>org.osgi</groupId> -->
+<!-- <artifactId>org.osgi.core</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>org.apache.poi</groupId> -->
+<!-- <artifactId>poi-ooxml</artifactId> -->
+<!-- </exclusion> -->
+<!-- </exclusions> -->
+<!-- </dependency> -->
<!-- test -->
<dependency>
