You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/10/06 01:45:33 UTC

[sling-org-apache-sling-app-cms] branch master updated: Minor POM cleanup and removing unneeded code

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

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git


The following commit(s) were added to refs/heads/master by this push:
     new 8dd6e2b  Minor POM cleanup and removing unneeded code
8dd6e2b is described below

commit 8dd6e2bc47146a3ab2a79ff70d26c6c0e9b3da31
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Tue Oct 5 21:45:26 2021 -0400

    Minor POM cleanup and removing unneeded code
---
 api/pom.xml                                        |  7 +---
 core/pom.xml                                       | 45 ++--------------------
 .../core/internal/FileMetadataExtractorImpl.java   | 41 --------------------
 .../internal/servlets/DownloadFileServlet.java     |  2 +-
 feature/pom.xml                                    |  1 -
 it/pom.xml                                         |  1 -
 login/pom.xml                                      |  3 --
 7 files changed, 6 insertions(+), 94 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 877be27..b641be1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -15,9 +15,6 @@
     <name>Apache Sling - CMS API</name>
     <description>An API for the Apache Sling Reference CMS Application</description>
 
-    <properties>
-        <sling.java.version>8</sling.java.version>
-    </properties>
 
     <build>
         <plugins>
@@ -29,8 +26,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${sling.cms.java.version}</source>
+                    <target>${sling.cms.java.version}</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/core/pom.xml b/core/pom.xml
index da402e2..2b8ba3c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,9 +15,6 @@
     <name>Apache Sling - CMS Core</name>
     <description>The core for the Apache Sling Reference CMS Application</description>
 
-    <properties>
-        <sling.java.version>8</sling.java.version>
-    </properties>
 
     <build>
         <plugins>
@@ -29,8 +26,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${sling.cms.java.version}</source>
+                    <target>${sling.cms.java.version}</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -119,10 +116,6 @@
             <artifactId>org.apache.sling.rewriter</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.cocoon</groupId>
-            <artifactId>cocoon-serializers-charsets</artifactId>
-        </dependency>
-        <dependency>
             <artifactId>jstl</artifactId>
             <groupId>org.apache.geronimo.bundles</groupId>
         </dependency>
@@ -149,10 +142,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>oak-core</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
         </dependency>
@@ -189,39 +178,15 @@
             <artifactId>org.apache.sling.fileoptim</artifactId>
         </dependency>
         <dependency>
-            <groupId>net.coobird</groupId>
-            <artifactId>thumbnailator</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <artifactId>pdfbox</artifactId>
-            <groupId>org.apache.pdfbox</groupId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-scratchpad</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.classloader</artifactId>
-        </dependency>
-        <dependency>
-            <artifactId>oak-jcr</artifactId>
-            <groupId>org.apache.jackrabbit</groupId>
-        </dependency>
-        <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
         </dependency>
@@ -238,12 +203,8 @@
             <artifactId>org.apache.sling.discovery.api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.jknack</groupId>
-            <artifactId>handlebars</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/FileMetadataExtractorImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/FileMetadataExtractorImpl.java
index 5971438..9313d68 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/FileMetadataExtractorImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/FileMetadataExtractorImpl.java
@@ -18,9 +18,7 @@ package org.apache.sling.cms.core.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -38,11 +36,6 @@ import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.sax.BodyContentHandler;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.wiring.FrameworkWiring;
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,46 +44,12 @@ import org.xml.sax.SAXException;
 @Component(service = FileMetadataExtractor.class)
 public class FileMetadataExtractorImpl implements FileMetadataExtractor {
 
-    private static final String METADATA_EXTRACTOR_BUNDLE_NAME = "org.apache.sling.cms.metadata-extractor";
-
     private static final Logger log = LoggerFactory.getLogger(FileMetadataExtractorImpl.class);
 
-    private BundleContext bcx;
-
-    @Activate
-    public void activate(ComponentContext context) {
-        bcx = context.getBundleContext();
-    }
-
     @Override
     public Map<String, Object> extractMetadata(File file) throws IOException {
         try {
             return extractMetadata(file.getResource());
-        } catch (NoClassDefFoundError ncdfe) {
-
-            log.info("Caught exception: {}, Attempting to reload metadata extractor bundle", String.valueOf(ncdfe));
-            Bundle metadataExtractorBundle = Arrays.stream(bcx.getBundles())
-                    .filter(b -> METADATA_EXTRACTOR_BUNDLE_NAME.equals(b.getSymbolicName())).findFirst().orElse(null);
-
-            if (metadataExtractorBundle != null) {
-                try {
-                    log.debug("Reloading metadata bundle: {}", metadataExtractorBundle);
-                    Bundle systemBundle = bcx.getBundle(0);
-                    metadataExtractorBundle.stop();
-                    metadataExtractorBundle.start();
-
-                    FrameworkWiring frameworkWiring = systemBundle.adapt(FrameworkWiring.class);
-                    frameworkWiring.refreshBundles(Collections.singleton(metadataExtractorBundle));
-                    log.debug("Bundle reloaded successfully!");
-                } catch (Exception e) {
-                    log.warn("Failed to refresh metadata exporter packages", e);
-                }
-            }
-            try {
-                return extractMetadata(file.getResource());
-            } catch (SAXException | TikaException | NoClassDefFoundError e) {
-                throw new IOException("Failed to parse metadata after reloading metadata extractor bundle", e);
-            }
         } catch (SAXException | TikaException e) {
             throw new IOException("Failed to parse metadata", e);
         }
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/servlets/DownloadFileServlet.java b/core/src/main/java/org/apache/sling/cms/core/internal/servlets/DownloadFileServlet.java
index b8b6deb..e206810 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/servlets/DownloadFileServlet.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/servlets/DownloadFileServlet.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 
-import org.apache.poi.util.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.resource.Resource;
diff --git a/feature/pom.xml b/feature/pom.xml
index 593f960..baee578 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -23,7 +23,6 @@
     <name>Apache Sling - CMS Feature Model</name>
 
     <properties>
-        <sling.java.version>8</sling.java.version>
         <IT.expected.bundles.count>240</IT.expected.bundles.count>
         <bnd.baseline.skip>true</bnd.baseline.skip>
         <run.sling.smoke.test>true</run.sling.smoke.test>
diff --git a/it/pom.xml b/it/pom.xml
index 5423851..dc31fce 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -23,7 +23,6 @@
     <name>Apache Sling - CMS Integration Tests</name>
 
     <properties>
-        <sling.java.version>8</sling.java.version>
         <bnd.baseline.skip>true</bnd.baseline.skip>
     </properties>
 
diff --git a/login/pom.xml b/login/pom.xml
index deb1de7..4718aae 100644
--- a/login/pom.xml
+++ b/login/pom.xml
@@ -13,9 +13,6 @@ License. -->
     <artifactId>org.apache.sling.cms.login</artifactId>
     <name>Apache Sling - Login Fragment</name>
     <description>Provides a custom login window for Sling CMS</description>
-    <properties>
-        <bnd.baseline.skip>true</bnd.baseline.skip>
-    </properties>
     <build>
         <plugins>
             <plugin>