You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/04/12 17:41:40 UTC

[isis] 02/12: ISIS-2999: deletes subdomain/pdfbox (and a bit of subdomains/ognl

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 2beba530085b09ace70f623d885236b9c27ba190
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Apr 11 18:47:06 2022 +0100

    ISIS-2999: deletes subdomain/pdfbox (and a bit of subdomains/ognl
---
 antora/playbooks/site-subdomains.yml               |  3 --
 antora/playbooks/site.yml                          |  3 --
 core/pom.xml                                       |  7 ----
 subdomains/pdfbox/adoc/antora.yml                  | 19 -----------
 subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc     |  4 ---
 .../pdfbox/adoc/modules/pdfbox/pages/about.adoc    |  5 ---
 .../adoc/modules/pdfbox/partials/module-nav.adoc   |  6 ----
 subdomains/pdfbox/applib/pom.xml                   | 39 ----------------------
 .../applib/IsisModuleSubdomainsPdfBoxApplib.java   | 30 -----------------
 subdomains/pdfbox/pom.xml                          | 33 ------------------
 subdomains/pom.xml                                 |  8 -----
 11 files changed, 157 deletions(-)

diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 8d3374ef6e..310dad1b0d 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -58,9 +58,6 @@ content:
     - url: .
       start_path: subdomains/freemarker/adoc # subdomains
       branches: HEAD
-    - url: .
-      start_path: subdomains/pdfbox/adoc # subdomains
-      branches: HEAD
     - url: .
       start_path: subdomains/settings/adoc # subdomains
       branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 8492e8609c..2df6389730 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -235,9 +235,6 @@ content:
     - url: .
       start_path: subdomains/freemarker/adoc # subdomains
       branches: HEAD
-    - url: .
-      start_path: subdomains/pdfbox/adoc # subdomains
-      branches: HEAD
     - url: .
       start_path: subdomains/settings/adoc # subdomains
       branches: HEAD
diff --git a/core/pom.xml b/core/pom.xml
index 6a8c525f6d..8e13003777 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -158,7 +158,6 @@
 		<objenesis.version>3.2</objenesis.version>
 		<ognl.version>3.3.2</ognl.version>
 
-		<pdfbox.version>2.0.25</pdfbox.version>
 		<picocontainer.version>2.15</picocontainer.version>
 		<poi.version>5.2.1</poi.version>
 
@@ -1110,12 +1109,6 @@
 				<version>${cxf-rt-rs-client.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.apache.pdfbox</groupId>
-				<artifactId>pdfbox</artifactId>
-				<version>${pdfbox.version}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>org.apache.poi</groupId>
 				<artifactId>poi-ooxml</artifactId>
diff --git a/subdomains/pdfbox/adoc/antora.yml b/subdomains/pdfbox/adoc/antora.yml
deleted file mode 100644
index 1044dbbd29..0000000000
--- a/subdomains/pdfbox/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-#  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.
-
-name: subdomains
-version: latest
diff --git a/subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc b/subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc
deleted file mode 100644
index dbad73b19b..0000000000
--- a/subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::subdomains:ROOT:partial$component-nav.adoc[]
diff --git a/subdomains/pdfbox/adoc/modules/pdfbox/pages/about.adoc b/subdomains/pdfbox/adoc/modules/pdfbox/pages/about.adoc
deleted file mode 100644
index 4d3c6b8822..0000000000
--- a/subdomains/pdfbox/adoc/modules/pdfbox/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= PDF Box Library
-
-:Notice: 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 ag [...]
-
-WARNING: TODO
diff --git a/subdomains/pdfbox/adoc/modules/pdfbox/partials/module-nav.adoc b/subdomains/pdfbox/adoc/modules/pdfbox/partials/module-nav.adoc
deleted file mode 100644
index 788596b41e..0000000000
--- a/subdomains/pdfbox/adoc/modules/pdfbox/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:subdomains:pdfbox:about.adoc[PDF Box Library]
-
-
diff --git a/subdomains/pdfbox/applib/pom.xml b/subdomains/pdfbox/applib/pom.xml
deleted file mode 100644
index 3b04c8496b..0000000000
--- a/subdomains/pdfbox/applib/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis.subdomains</groupId>
-		<artifactId>isis-subdomains-pdfbox</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>isis-subdomains-pdfbox-applib</artifactId>
-	<name>Apache Isis Sub - PDF Box (applib)</name>
-	<description>Integrates PDF Box Library</description>
-
-	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.pdfbox.applib</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/subdomains/pdfbox/applib</git-plugin.propertiesDir>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-applib</artifactId>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubdomainsPdfBoxApplib.java b/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubdomainsPdfBoxApplib.java
deleted file mode 100644
index 445d87df83..0000000000
--- a/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubdomainsPdfBoxApplib.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  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.
- */
-package org.apache.isis.subdomains.pdfbox.applib;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-@Configuration
-@Import({
-
-})
-public class IsisModuleSubdomainsPdfBoxApplib {
-
-}
diff --git a/subdomains/pdfbox/pom.xml b/subdomains/pdfbox/pom.xml
deleted file mode 100644
index 3f0a9e45f8..0000000000
--- a/subdomains/pdfbox/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/maven-v4_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-pdfbox</artifactId>
-	<name>Apache Isis Sub - PDF Box (parent)</name>
-	<description>Integrates PDF Box Library</description>
-
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>applib</module>
-	</modules>
-
-</project>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 0389448225..89b1588437 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -108,12 +108,6 @@
 				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.apache.isis.subdomains</groupId>
-				<artifactId>isis-subdomains-pdfbox-applib</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
-			</dependency>
-
 			<dependency>
 				<groupId>org.apache.isis.subdomains</groupId>
 				<artifactId>isis-subdomains-spring-applib</artifactId>
@@ -184,8 +178,6 @@
 		<module>docx</module>
 		<module>excel</module>
 		<module>freemarker</module>
-		<module>ognl</module>
-		<module>pdfbox</module>
 		<module>spring</module>
 		<module>xdocreport</module>
 		<module>zip</module>