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 2019/05/29 16:26:29 UTC
[sling-org-apache-sling-app-cms] branch master updated: Metadata
extractor is not needed because it can be loaded from Tika bundle
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 e5b2443 Metadata extractor is not needed because it can be loaded from Tika bundle
e5b2443 is described below
commit e5b2443d3c18576ec7d722ee5925422b221f9988
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed May 29 11:26:23 2019 -0500
Metadata extractor is not needed because it can be loaded from Tika bundle
---
builder/src/main/provisioning/cms.txt | 5 +-
metadata-extractor/pom.xml | 102 ----------------------------------
pom.xml | 3 +-
3 files changed, 2 insertions(+), 108 deletions(-)
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index eabb6e7..56fdb43 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -36,10 +36,7 @@
org.apache.sling/org.apache.sling.cms.transformer/${cms.version}
org.apache.tika/tika-bundle/1.19.1
commons-lang/commons-lang/2.6
-
-[artifacts startLevel=25]
- org.apache.sling/org.apache.sling.cms.metadata-extractor/${cms.version}
-
+
[:repoinit]
# CMS root paths
diff --git a/metadata-extractor/pom.xml b/metadata-extractor/pom.xml
deleted file mode 100644
index 7af3f21..0000000
--- a/metadata-extractor/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 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>
- <artifactId>org.apache.sling.cms</artifactId>
- <groupId>org.apache.sling</groupId>
- <version>0.11.3-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.cms.metadata-extractor</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Sling - Metadata Extractor Bundle Wrapper</name>
- <description>OSGi Bundle Wrapper for https://github.com/drewnoakes/metadata-extractor</description>
-
- <properties>
- <sling.java.version>8</sling.java.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Export-Package>com.drew.*</Export-Package>
- <Import-Package>!com.adobe.xmp,!com.adobe.xmp.impl,!com.adobe.xmp.options,!com.adobe.xmp.properties,*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>8</source>
- <target>8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <configuration>
- <slingUrl>${sling.protocol}://${sling.host}:${sling.port}/system/console</slingUrl>
- <user>${sling.username}</user>
- <password>${sling.password}</password>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>autoInstallBundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>com.drewnoakes</groupId>
- <artifactId>metadata-extractor</artifactId>
- <version>2.11.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.adobe.xmp</groupId>
- <artifactId>xmpcore</artifactId>
- <version>6.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2c9c068..d72dbf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,6 @@
<modules>
<module>api</module>
<module>core</module>
- <module>metadata-extractor</module>
<module>transformer</module>
<module>ui</module>
<module>reference</module>
@@ -307,4 +306,4 @@
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>