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/10/28 13:05:46 UTC
[isis] branch master updated: ISIS-2877: fixes prev. commit
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 3772f27 ISIS-2877: fixes prev. commit
3772f27 is described below
commit 3772f27cc9e0e6bfb2c47b80c14ef07fd8c15210
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 28 15:05:34 2021 +0200
ISIS-2877: fixes prev. commit
---
extensions/vw/exceldownload/ui/pom.xml | 1 -
subdomains/excel/applib/pom.xml | 21 ---------------------
subdomains/excel/testing/pom.xml | 5 +++++
.../applib/service/XDocReportService.java | 6 +++---
.../applib/service/example/Generate2Pdf.java | 6 +++---
5 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/extensions/vw/exceldownload/ui/pom.xml b/extensions/vw/exceldownload/ui/pom.xml
index a2b4706..56349f2 100644
--- a/extensions/vw/exceldownload/ui/pom.xml
+++ b/extensions/vw/exceldownload/ui/pom.xml
@@ -62,7 +62,6 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-poi</artifactId>
<type>pom</type>
- <scope>import</scope>
<version>${project.version}</version>
</dependency>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index 55279dd..f4a6f78 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -51,27 +51,6 @@
<type>pom</type>
</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>
<groupId>org.apache.isis.core</groupId>
diff --git a/subdomains/excel/testing/pom.xml b/subdomains/excel/testing/pom.xml
index 5af12f8..4f36940 100644
--- a/subdomains/excel/testing/pom.xml
+++ b/subdomains/excel/testing/pom.xml
@@ -44,6 +44,11 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ </dependency>
</dependencies>
diff --git a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
index df67872..d2677ff 100644
--- a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
@@ -24,14 +24,14 @@ import java.util.Map;
import javax.annotation.PostConstruct;
-import org.apache.poi.xwpf.converter.core.IXWPFConverter;
-import org.apache.poi.xwpf.converter.pdf.PdfConverter;
-import org.apache.poi.xwpf.converter.pdf.PdfOptions;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.Programmatic;
+import fr.opensagres.poi.xwpf.converter.core.IXWPFConverter;
+import fr.opensagres.poi.xwpf.converter.pdf.PdfConverter;
+import fr.opensagres.poi.xwpf.converter.pdf.PdfOptions;
import fr.opensagres.xdocreport.core.XDocReportException;
import fr.opensagres.xdocreport.core.io.internal.ByteArrayOutputStream;
import fr.opensagres.xdocreport.document.IXDocReport;
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
index 20de5e3..5bd28f8 100644
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
@@ -25,15 +25,15 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.poi.xwpf.converter.pdf.PdfConverter;
-import org.apache.poi.xwpf.converter.pdf.PdfOptions;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import fr.opensagres.poi.xwpf.converter.pdf.PdfConverter;
+import fr.opensagres.poi.xwpf.converter.pdf.PdfOptions;
import fr.opensagres.xdocreport.core.XDocReportException;
public class Generate2Pdf {
- public static void main(String[] args) throws IOException,
+ public static void main(final String[] args) throws IOException,
XDocReportException {
// 1) Load DOCX into XWPFDocument