You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by gr...@apache.org on 2015/06/11 18:14:11 UTC
svn commit: r1684935 - in /tika/trunk: tika-batch/pom.xml
tika-bundle/pom.xml tika-example/pom.xml tika-java7/pom.xml
tika-parent/pom.xml tika-server/pom.xml tika-xmp/pom.xml
Author: grossws
Date: Thu Jun 11 16:14:10 2015
New Revision: 1684935
URL: http://svn.apache.org/r1684935
Log:
Reformatted POMs
Added license header to tika-batch/pom.xml
Fixed indents, trailing spaces and reordered tags.
Modified:
tika/trunk/tika-batch/pom.xml
tika/trunk/tika-bundle/pom.xml
tika/trunk/tika-example/pom.xml
tika/trunk/tika-java7/pom.xml
tika/trunk/tika-parent/pom.xml
tika/trunk/tika-server/pom.xml
tika/trunk/tika-xmp/pom.xml
Modified: tika/trunk/tika-batch/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-batch/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
==============================================================================
--- tika/trunk/tika-batch/pom.xml (original)
+++ tika/trunk/tika-batch/pom.xml Thu Jun 11 16:14:10 2015
@@ -1,172 +1,188 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <properties>
- <cli.version>1.2</cli.version> <!--sync version with tika-server or move to parent? -->
- <compress.version>1.9</compress.version> <!-- sync with tika-parsers or move to parent? -->
-
- </properties>
-
- <parent>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
- <version>1.10-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>tika-batch</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Tika batch</name>
- <url>http://tika.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>${compress.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${cli.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- <version>2.1</version>
- </dependency>
-
-
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Bundle-Activator>
- org.apache.tika.config.TikaActivator
- </Bundle-Activator>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/test/resources/org/apache/tika/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>
- ${project.build.directory}/${project.build.finalName}.jar
- </additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <scm>
- <url>http://svn.apache.org/viewvc/tika/trunk/tika-batch</url>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-batch</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-batch</developerConnection>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
+<!--
+ 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.tika</groupId>
+ <artifactId>tika-parent</artifactId>
+ <version>1.10-SNAPSHOT</version>
+ <relativePath>../tika-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tika-batch</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Tika batch</name>
+ <url>http://tika.apache.org/</url>
+
+ <properties>
+ <cli.version>1.2</cli.version>
+ <!-- sync version with tika-server or move to parent? -->
+ <compress.version>1.9</compress.version>
+ <!-- sync with tika-parsers or move to parent? -->
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-serialization</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${compress.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Bundle-Activator>
+ org.apache.tika.config.TikaActivator
+ </Bundle-Activator>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/org/apache/tika/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>
+ ${project.build.directory}/${project.build.finalName}.jar
+ </additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <scm>
+ <url>http://svn.apache.org/viewvc/tika/trunk/tika-batch</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-batch</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-batch</developerConnection>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/TIKA</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/job/Tika-trunk/</url>
+ </ciManagement>
</project>
Modified: tika/trunk/tika-bundle/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
==============================================================================
--- tika/trunk/tika-bundle/pom.xml (original)
+++ tika/trunk/tika-bundle/pom.xml Thu Jun 11 16:14:10 2015
@@ -119,13 +119,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <_runsystempackages>com.sun.xml.bind.marshaller, com.sun.xml.internal.bind.marshaller</_runsystempackages>
+ <_runsystempackages>com.sun.xml.bind.marshaller, com.sun.xml.internal.bind.marshaller</_runsystempackages>
<Bundle-Activator>
org.apache.tika.parser.internal.Activator
</Bundle-Activator>
<Embed-Dependency>
tika-parsers;inline=true,
- commons-compress, xz, commons-codec, commons-csv,
+ commons-compress, xz, commons-codec, commons-csv,
commons-io, commons-exec, junrar,
pdfbox,fontbox,jempbox,bcmail-jdk15on,bcprov-jdk15on,bcpkix-jdk15on,
poi,poi-scratchpad,poi-ooxml,poi-ooxml-schemas,
@@ -135,12 +135,12 @@
juniversalchardet,
vorbis-java-core, vorbis-java-tika,
isoparser, aspectjrt,
- metadata-extractor, xmpcore, json-simple,
+ metadata-extractor, xmpcore, json-simple,
boilerpipe, rome, opennlp-tools, opennlp-maxent,
- geoapi, sis-metadata, sis-netcdf, sis-utility,
+ geoapi, sis-metadata, sis-netcdf, sis-utility,
sis-storage, apache-mime4j-core, apache-mime4j-dom,
- jsr-275, jhighlight, java-libpst, jwnl,
- netcdf4, grib, cdm, httpservices, jcip-annotations,
+ jsr-275, jhighlight, java-libpst, jwnl,
+ netcdf4, grib, cdm, httpservices, jcip-annotations,
jmatio, guava
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
@@ -151,7 +151,7 @@
org.apache.tika.parser.*,
</Export-Package>
<Import-Package>
- !org.junit,
+ !org.junit,
!org.apache.ctakes.*,
!org.apache.uima.*,
*,
@@ -163,8 +163,8 @@
com.ibm.icu.text;resolution:=optional,
com.sleepycat.je;resolution:=optional,
com.sun.javadoc;resolution:=optional,
- com.sun.xml.bind.marshaller;resolution:=optional,
- com.sun.xml.internal.bind.marshaller;resolution:=optional,
+ com.sun.xml.bind.marshaller;resolution:=optional,
+ com.sun.xml.internal.bind.marshaller;resolution:=optional,
com.sun.msv.datatype;resolution:=optional,
com.sun.msv.datatype.xsd;resolution:=optional,
com.sun.tools.javadoc;resolution:=optional,
@@ -173,10 +173,10 @@
javax.activation;resolution:=optional,
javax.mail;resolution:=optional,
javax.mail.internet;resolution:=optional,
- javax.servlet.annotation;resolution:=optional,
+ javax.servlet.annotation;resolution:=optional,
javax.servlet;resolution:=optional,
javax.servlet.http;resolution:=optional,
- javax.measure.converter;resolution:=optional,
+ javax.measure.converter;resolution:=optional,
javax.xml.stream;version="[1.0,2)";resolution:=optional,
javax.xml.stream.events;version="[1.0,2)";resolution:=optional,
javax.xml.stream.util;version="[1.0,2)";resolution:=optional,
@@ -187,11 +187,11 @@
opendap.dap.http;resolution:=optional,
opendap.dap;resolution:=optional,
opendap.dap.parser;resolution:=optional,
- opennlp.maxent;resolution:=optional,
- opennlp.tools.namefind;resolution:=optional,
- net.didion.jwnl;resolution:=optional,
- org.apache.commons.exec;resolution:=optional,
- org.apache.commons.io;resolution:=optional,
+ opennlp.maxent;resolution:=optional,
+ opennlp.tools.namefind;resolution:=optional,
+ net.didion.jwnl;resolution:=optional,
+ org.apache.commons.exec;resolution:=optional,
+ org.apache.commons.io;resolution:=optional,
org.apache.commons.httpclient;resolution:=optional,
org.apache.commons.httpclient.auth;resolution:=optional,
org.apache.commons.httpclient.methods;resolution:=optional,
@@ -203,9 +203,9 @@
org.apache.commons.vfs2.util;resolution:=optional,
org.apache.crimson.jaxp;resolution:=optional,
org.apache.jcp.xml.dsig.internal.dom;resolution:=optional,
- org.apache.sis;resolution:=optional,
- org.apache.sis.distance;resolution:=optional,
- org.apache.sis.geometry;resolution:=optional,
+ org.apache.sis;resolution:=optional,
+ org.apache.sis.distance;resolution:=optional,
+ org.apache.sis.geometry;resolution:=optional,
org.apache.tools.ant;resolution:=optional,
org.apache.tools.ant.taskdefs;resolution:=optional,
org.apache.tools.ant.types;resolution:=optional,
@@ -241,7 +241,7 @@
org.jdom2;resolution:=optional,
org.jdom2.input;resolution:=optional,
org.jdom2.output;resolution:=optional,
- org.json.simple;resolution:=optional,
+ org.json.simple;resolution:=optional,
org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=optional,
org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:=optional,
org.osgi.framework;resolution:=optional,
Modified: tika/trunk/tika-example/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-example/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
==============================================================================
--- tika/trunk/tika-example/pom.xml (original)
+++ tika/trunk/tika-example/pom.xml Thu Jun 11 16:14:10 2015
@@ -1,4 +1,5 @@
<?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
@@ -17,56 +18,35 @@
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>
- <artifactId>tika-parent</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-example</artifactId>
-
<name>Apache Tika examples</name>
<url>http://tika.apache.org/</url>
- <description>This module contains examples of how to use Apache Tika.</description>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
-
- <scm>
- <url>http://svn.apache.org/viewvc/tika/trunk/tika-example</url>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-example</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-example</developerConnection>
- </scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
-
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
-
<!-- List of dependencies that we depend on for the examples. See the full list of Tika
modules and how to use them at http://mvnrepository.com/artifact/org.apache.tika.-->
<dependencies>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-app</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>tika-parsers</artifactId>
- <groupId>org.apache.tika</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-app</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>tika-parsers</artifactId>
+ <groupId>org.apache.tika</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
@@ -89,40 +69,59 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.3.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>2.3.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>3.5.0</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.0.2.RELEASE</version>
- </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-server</artifactId>
+ <version>2.3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>2.3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>3.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.2.RELEASE</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
+
+ <description>This module contains examples of how to use Apache Tika.</description>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <scm>
+ <url>http://svn.apache.org/viewvc/tika/trunk/tika-example</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/tika/trunk/tika-example</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tika/trunk/tika-example</developerConnection>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/TIKA</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/job/Tika-trunk/</url>
+ </ciManagement>
</project>
Modified: tika/trunk/tika-java7/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-java7/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
==============================================================================
--- tika/trunk/tika-java7/pom.xml (original)
+++ tika/trunk/tika-java7/pom.xml Thu Jun 11 16:14:10 2015
@@ -23,7 +23,6 @@
<modelVersion>4.0.0</modelVersion>
<parent>
-
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.10-SNAPSHOT</version>
@@ -32,9 +31,8 @@
<artifactId>tika-java7</artifactId>
<packaging>bundle</packaging>
-
<name>Apache Tika Java-7 Components</name>
- <description>Java-7 reliant components, including FileTypeDetector implementations</description>
+ <url>http://tika.apache.org/</url>
<properties>
<maven.compiler.source>1.7</maven.compiler.source>
@@ -87,7 +85,7 @@
</dependency>
</dependencies>
- <url>http://tika.apache.org/</url>
+ <description>Java-7 reliant components, including FileTypeDetector implementations</description>
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
Modified: tika/trunk/tika-parent/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parent/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
==============================================================================
--- tika/trunk/tika-parent/pom.xml (original)
+++ tika/trunk/tika-parent/pom.xml Thu Jun 11 16:14:10 2015
@@ -305,60 +305,60 @@
</properties>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>de.thetaphi</groupId>
- <artifactId>forbiddenapis</artifactId>
- <version>1.7</version>
- <configuration>
- <targetVersion>${maven.compiler.target}</targetVersion>
- <internalRuntimeForbidden>true</internalRuntimeForbidden>
- <failOnUnsupportedJava>false</failOnUnsupportedJava>
- <bundledSignatures>
- <bundledSignature>jdk-unsafe</bundledSignature>
- <bundledSignature>jdk-deprecated</bundledSignature>
- </bundledSignatures>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- <goal>testCheck</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.18.1</version>
- <configuration>
- <argLine>-Xmx2048m</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>de.thetaphi</groupId>
+ <artifactId>forbiddenapis</artifactId>
+ <version>1.7</version>
+ <configuration>
+ <targetVersion>${maven.compiler.target}</targetVersion>
+ <internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <failOnUnsupportedJava>false</failOnUnsupportedJava>
+ <bundledSignatures>
+ <bundledSignature>jdk-unsafe</bundledSignature>
+ <bundledSignature>jdk-deprecated</bundledSignature>
+ </bundledSignatures>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ <goal>testCheck</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ <configuration>
+ <argLine>-Xmx2048m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
</plugins>
<pluginManagement>
Modified: tika/trunk/tika-server/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
==============================================================================
--- tika/trunk/tika-server/pom.xml (original)
+++ tika/trunk/tika-server/pom.xml Thu Jun 11 16:14:10 2015
@@ -26,6 +26,7 @@
<artifactId>tika-server</artifactId>
<name>Apache Tika server</name>
+ <url>http://tika.apache.org/</url>
<properties>
<cxf.version>3.0.3</cxf.version>
@@ -59,7 +60,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>tika-xmp</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
@@ -105,7 +106,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
@@ -266,11 +267,11 @@
</execution>
</executions>
<configuration>
- <licence>
- <!-- Miredot license key valid until August 1st, 2016 when we can apply for a new one - http://s.apache.org/oE -->
- UHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAxNi0wOC0wMXx0cnVlI01Dd0NGRklXRzRqRmNTZXNJb2laRElKZVF4RXpieUNTQWhSMHBmTzZCMUdMbDBPQ1B1WmJYQ3NpZElZSCtRPT0=
- </licence>
- <!-- insert other configuration here (optional) -->
+ <licence>
+ <!-- Miredot license key valid until August 1st, 2016 when we can apply for a new one - http://s.apache.org/oE -->
+ UHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAxNi0wOC0wMXx0cnVlI01Dd0NGRklXRzRqRmNTZXNJb2laRElKZVF4RXpieUNTQWhSMHBmTzZCMUdMbDBPQ1B1WmJYQ3NpZElZSCtRPT0=
+ </licence>
+ <!-- insert other configuration here (optional) -->
</configuration>
</plugin>
</plugins>
@@ -300,7 +301,7 @@
</build>
</profile>
</profiles>
- <url>http://tika.apache.org/</url>
+
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
Modified: tika/trunk/tika-xmp/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-xmp/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
==============================================================================
--- tika/trunk/tika-xmp/pom.xml (original)
+++ tika/trunk/tika-xmp/pom.xml Thu Jun 11 16:14:10 2015
@@ -31,9 +31,8 @@
<artifactId>tika-xmp</artifactId>
<packaging>bundle</packaging>
-
<name>Apache Tika XMP</name>
- <description>Converts Tika metadata to XMP</description>
+ <url>http://tika.apache.org/</url>
<build>
<plugins>
@@ -93,7 +92,7 @@
</dependency>
</dependencies>
- <url>http://tika.apache.org/</url>
+ <description>Converts Tika metadata to XMP</description>
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
Re: svn commit: r1684935 - in /tika/trunk: tika-batch/pom.xml
tika-bundle/pom.xml tika-example/pom.xml tika-java7/pom.xml
tika-parent/pom.xml tika-server/pom.xml tika-xmp/pom.xml
Posted by Konstantin Gribov <gr...@apache.org>.
Sorry if I have broken anyone's patches with this reformat.
--
Best regards,
Konstantin Gribov
чт, 11 июня 2015 г. в 19:14, <gr...@apache.org>:
> Author: grossws
> Date: Thu Jun 11 16:14:10 2015
> New Revision: 1684935
>
> URL: http://svn.apache.org/r1684935
> Log:
> Reformatted POMs
>
> Added license header to tika-batch/pom.xml
>
> Fixed indents, trailing spaces and reordered tags.
>
> Modified:
> tika/trunk/tika-batch/pom.xml
> tika/trunk/tika-bundle/pom.xml
> tika/trunk/tika-example/pom.xml
> tika/trunk/tika-java7/pom.xml
> tika/trunk/tika-parent/pom.xml
> tika/trunk/tika-server/pom.xml
> tika/trunk/tika-xmp/pom.xml
>
> Modified: tika/trunk/tika-batch/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-batch/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-batch/pom.xml (original)
> +++ tika/trunk/tika-batch/pom.xml Thu Jun 11 16:14:10 2015
> @@ -1,172 +1,188 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<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>
> - <properties>
> - <cli.version>1.2</cli.version> <!--sync version with tika-server
> or move to parent? -->
> - <compress.version>1.9</compress.version> <!-- sync with
> tika-parsers or move to parent? -->
> -
> - </properties>
> -
> - <parent>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-parent</artifactId>
> - <version>1.10-SNAPSHOT</version>
> - <relativePath>../tika-parent/pom.xml</relativePath>
> - </parent>
> -
> - <artifactId>tika-batch</artifactId>
> - <packaging>bundle</packaging>
> - <name>Apache Tika batch</name>
> - <url>http://tika.apache.org/</url>
> -
> - <dependencies>
> - <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>tika-core</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>tika-serialization</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.commons</groupId>
> - <artifactId>commons-compress</artifactId>
> - <version>${compress.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>slf4j-log4j12</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>commons-cli</groupId>
> - <artifactId>commons-cli</artifactId>
> - <version>${cli.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-core</artifactId>
> - <version>${project.version}</version>
> - <type>test-jar</type>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-parsers</artifactId>
> - <version>${project.version}</version>
> - <type>test-jar</type>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>junit</groupId>
> - <artifactId>junit</artifactId>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>commons-io</groupId>
> - <artifactId>commons-io</artifactId>
> - <scope>test</scope>
> - <version>2.1</version>
> - </dependency>
> -
> -
> - </dependencies>
> - <build>
> - <plugins>
> - <plugin>
> - <artifactId>maven-remote-resources-plugin</artifactId>
> - <version>1.5</version>
> - <executions>
> - <execution>
> - <goals>
> - <goal>bundle</goal>
> - </goals>
> - </execution>
> - </executions>
> - <configuration>
> - <includes>
> - <include>**/*.xml</include>
> - </includes>
> - </configuration>
> - </plugin>
> -
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-bundle-plugin</artifactId>
> - <extensions>true</extensions>
> - <configuration>
> - <instructions>
> - <Bundle-DocURL>${project.url}</Bundle-DocURL>
> - <Bundle-Activator>
> - org.apache.tika.config.TikaActivator
> - </Bundle-Activator>
> -
> <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
> - </instructions>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.rat</groupId>
> - <artifactId>apache-rat-plugin</artifactId>
> - <configuration>
> - <excludes>
> -
> <exclude>src/test/resources/org/apache/tika/**</exclude>
> - </excludes>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> - <executions>
> - <execution>
> - <goals>
> - <goal>test-jar</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - <plugin>
> - <artifactId>maven-failsafe-plugin</artifactId>
> - <version>2.10</version>
> - <configuration>
> - <additionalClasspathElements>
> - <additionalClasspathElement>
> -
> ${project.build.directory}/${project.build.finalName}.jar
> - </additionalClasspathElement>
> - </additionalClasspathElements>
> - </configuration>
> - <executions>
> - <execution>
> - <goals>
> - <goal>integration-test</goal>
> - <goal>verify</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - </plugins>
> - </build>
> -
> -
> -
> - <organization>
> - <name>The Apache Software Foundation</name>
> - <url>http://www.apache.org</url>
> - </organization>
> - <scm>
> - <url>http://svn.apache.org/viewvc/tika/trunk/tika-batch</url>
> - <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-batch</connection>
> - <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-batch
> </developerConnection>
> - </scm>
> - <issueManagement>
> - <system>JIRA</system>
> - <url>https://issues.apache.org/jira/browse/TIKA</url>
> - </issueManagement>
> - <ciManagement>
> - <system>Jenkins</system>
> - <url>https://builds.apache.org/job/Tika-trunk/</url>
> - </ciManagement>
> +<!--
> + 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.tika</groupId>
> + <artifactId>tika-parent</artifactId>
> + <version>1.10-SNAPSHOT</version>
> + <relativePath>../tika-parent/pom.xml</relativePath>
> + </parent>
> +
> + <artifactId>tika-batch</artifactId>
> + <packaging>bundle</packaging>
> + <name>Apache Tika batch</name>
> + <url>http://tika.apache.org/</url>
> +
> + <properties>
> + <cli.version>1.2</cli.version>
> + <!-- sync version with tika-server or move to parent? -->
> + <compress.version>1.9</compress.version>
> + <!-- sync with tika-parsers or move to parent? -->
> + </properties>
> +
> + <dependencies>
> + <dependency>
> + <groupId>${project.groupId}</groupId>
> + <artifactId>tika-core</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>${project.groupId}</groupId>
> + <artifactId>tika-serialization</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.commons</groupId>
> + <artifactId>commons-compress</artifactId>
> + <version>${compress.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-log4j12</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>commons-cli</groupId>
> + <artifactId>commons-cli</artifactId>
> + <version>${cli.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.tika</groupId>
> + <artifactId>tika-core</artifactId>
> + <version>${project.version}</version>
> + <type>test-jar</type>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.tika</groupId>
> + <artifactId>tika-parsers</artifactId>
> + <version>${project.version}</version>
> + <type>test-jar</type>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>junit</groupId>
> + <artifactId>junit</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>commons-io</groupId>
> + <artifactId>commons-io</artifactId>
> + <scope>test</scope>
> + <version>2.1</version>
> + </dependency>
> + </dependencies>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <artifactId>maven-remote-resources-plugin</artifactId>
> + <version>1.5</version>
> + <executions>
> + <execution>
> + <goals>
> + <goal>bundle</goal>
> + </goals>
> + </execution>
> + </executions>
> + <configuration>
> + <includes>
> + <include>**/*.xml</include>
> + </includes>
> + </configuration>
> + </plugin>
> +
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Bundle-DocURL>${project.url}</Bundle-DocURL>
> + <Bundle-Activator>
> + org.apache.tika.config.TikaActivator
> + </Bundle-Activator>
> + <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
> + </instructions>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.rat</groupId>
> + <artifactId>apache-rat-plugin</artifactId>
> + <configuration>
> + <excludes>
> + <exclude>src/test/resources/org/apache/tika/**</exclude>
> + </excludes>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-jar-plugin</artifactId>
> + <executions>
> + <execution>
> + <goals>
> + <goal>test-jar</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + <plugin>
> + <artifactId>maven-failsafe-plugin</artifactId>
> + <version>2.10</version>
> + <configuration>
> + <additionalClasspathElements>
> + <additionalClasspathElement>
> + ${project.build.directory}/${project.build.finalName}.jar
> + </additionalClasspathElement>
> + </additionalClasspathElements>
> + </configuration>
> + <executions>
> + <execution>
> + <goals>
> + <goal>integration-test</goal>
> + <goal>verify</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <organization>
> + <name>The Apache Software Foundation</name>
> + <url>http://www.apache.org</url>
> + </organization>
> + <scm>
> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-batch</url>
> + <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-batch</connection>
> + <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-batch
> </developerConnection>
> + </scm>
> + <issueManagement>
> + <system>JIRA</system>
> + <url>https://issues.apache.org/jira/browse/TIKA</url>
> + </issueManagement>
> + <ciManagement>
> + <system>Jenkins</system>
> + <url>https://builds.apache.org/job/Tika-trunk/</url>
> + </ciManagement>
> </project>
>
> Modified: tika/trunk/tika-bundle/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-bundle/pom.xml (original)
> +++ tika/trunk/tika-bundle/pom.xml Thu Jun 11 16:14:10 2015
> @@ -119,13 +119,13 @@
> <extensions>true</extensions>
> <configuration>
> <instructions>
> - <_runsystempackages>com.sun.xml.bind.marshaller,
> com.sun.xml.internal.bind.marshaller</_runsystempackages>
> + <_runsystempackages>com.sun.xml.bind.marshaller,
> com.sun.xml.internal.bind.marshaller</_runsystempackages>
> <Bundle-Activator>
> org.apache.tika.parser.internal.Activator
> </Bundle-Activator>
> <Embed-Dependency>
> tika-parsers;inline=true,
> - commons-compress, xz, commons-codec, commons-csv,
> + commons-compress, xz, commons-codec, commons-csv,
> commons-io, commons-exec, junrar,
>
> pdfbox,fontbox,jempbox,bcmail-jdk15on,bcprov-jdk15on,bcpkix-jdk15on,
> poi,poi-scratchpad,poi-ooxml,poi-ooxml-schemas,
> @@ -135,12 +135,12 @@
> juniversalchardet,
> vorbis-java-core, vorbis-java-tika,
> isoparser, aspectjrt,
> - metadata-extractor, xmpcore, json-simple,
> + metadata-extractor, xmpcore, json-simple,
> boilerpipe, rome, opennlp-tools, opennlp-maxent,
> - geoapi, sis-metadata, sis-netcdf, sis-utility,
> + geoapi, sis-metadata, sis-netcdf, sis-utility,
> sis-storage, apache-mime4j-core, apache-mime4j-dom,
> - jsr-275, jhighlight, java-libpst, jwnl,
> - netcdf4, grib, cdm, httpservices, jcip-annotations,
> + jsr-275, jhighlight, java-libpst, jwnl,
> + netcdf4, grib, cdm, httpservices, jcip-annotations,
> jmatio, guava
> </Embed-Dependency>
> <Embed-Transitive>true</Embed-Transitive>
> @@ -151,7 +151,7 @@
> org.apache.tika.parser.*,
> </Export-Package>
> <Import-Package>
> - !org.junit,
> + !org.junit,
> !org.apache.ctakes.*,
> !org.apache.uima.*,
> *,
> @@ -163,8 +163,8 @@
> com.ibm.icu.text;resolution:=optional,
> com.sleepycat.je;resolution:=optional,
> com.sun.javadoc;resolution:=optional,
> - com.sun.xml.bind.marshaller;resolution:=optional,
> - com.sun.xml.internal.bind.marshaller;resolution:=optional,
> + com.sun.xml.bind.marshaller;resolution:=optional,
> + com.sun.xml.internal.bind.marshaller;resolution:=optional,
> com.sun.msv.datatype;resolution:=optional,
> com.sun.msv.datatype.xsd;resolution:=optional,
> com.sun.tools.javadoc;resolution:=optional,
> @@ -173,10 +173,10 @@
> javax.activation;resolution:=optional,
> javax.mail;resolution:=optional,
> javax.mail.internet;resolution:=optional,
> - javax.servlet.annotation;resolution:=optional,
> + javax.servlet.annotation;resolution:=optional,
> javax.servlet;resolution:=optional,
> javax.servlet.http;resolution:=optional,
> - javax.measure.converter;resolution:=optional,
> + javax.measure.converter;resolution:=optional,
> javax.xml.stream;version="[1.0,2)";resolution:=optional,
>
> javax.xml.stream.events;version="[1.0,2)";resolution:=optional,
>
> javax.xml.stream.util;version="[1.0,2)";resolution:=optional,
> @@ -187,11 +187,11 @@
> opendap.dap.http;resolution:=optional,
> opendap.dap;resolution:=optional,
> opendap.dap.parser;resolution:=optional,
> - opennlp.maxent;resolution:=optional,
> - opennlp.tools.namefind;resolution:=optional,
> - net.didion.jwnl;resolution:=optional,
> - org.apache.commons.exec;resolution:=optional,
> - org.apache.commons.io;resolution:=optional,
> + opennlp.maxent;resolution:=optional,
> + opennlp.tools.namefind;resolution:=optional,
> + net.didion.jwnl;resolution:=optional,
> + org.apache.commons.exec;resolution:=optional,
> + org.apache.commons.io;resolution:=optional,
> org.apache.commons.httpclient;resolution:=optional,
> org.apache.commons.httpclient.auth;resolution:=optional,
> org.apache.commons.httpclient.methods;resolution:=optional,
> @@ -203,9 +203,9 @@
> org.apache.commons.vfs2.util;resolution:=optional,
> org.apache.crimson.jaxp;resolution:=optional,
> org.apache.jcp.xml.dsig.internal.dom;resolution:=optional,
> - org.apache.sis;resolution:=optional,
> - org.apache.sis.distance;resolution:=optional,
> - org.apache.sis.geometry;resolution:=optional,
> + org.apache.sis;resolution:=optional,
> + org.apache.sis.distance;resolution:=optional,
> + org.apache.sis.geometry;resolution:=optional,
> org.apache.tools.ant;resolution:=optional,
> org.apache.tools.ant.taskdefs;resolution:=optional,
> org.apache.tools.ant.types;resolution:=optional,
> @@ -241,7 +241,7 @@
> org.jdom2;resolution:=optional,
> org.jdom2.input;resolution:=optional,
> org.jdom2.output;resolution:=optional,
> - org.json.simple;resolution:=optional,
> + org.json.simple;resolution:=optional,
>
> org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=optional,
>
> org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:=optional,
> org.osgi.framework;resolution:=optional,
>
> Modified: tika/trunk/tika-example/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-example/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-example/pom.xml (original)
> +++ tika/trunk/tika-example/pom.xml Thu Jun 11 16:14:10 2015
> @@ -1,4 +1,5 @@
> <?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
> @@ -17,56 +18,35 @@
> 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>
> - <artifactId>tika-parent</artifactId>
> <groupId>org.apache.tika</groupId>
> + <artifactId>tika-parent</artifactId>
> <version>1.10-SNAPSHOT</version>
> <relativePath>../tika-parent/pom.xml</relativePath>
> </parent>
> - <modelVersion>4.0.0</modelVersion>
>
> <artifactId>tika-example</artifactId>
> -
> <name>Apache Tika examples</name>
> <url>http://tika.apache.org/</url>
>
> - <description>This module contains examples of how to use Apache
> Tika.</description>
> - <organization>
> - <name>The Apache Software Foundation</name>
> - <url>http://www.apache.org</url>
> - </organization>
> -
> - <scm>
> - <url>http://svn.apache.org/viewvc/tika/trunk/tika-example</url>
> - <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-example</connection>
> - <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-example
> </developerConnection>
> - </scm>
> -
> - <issueManagement>
> - <system>JIRA</system>
> - <url>https://issues.apache.org/jira/browse/TIKA</url>
> - </issueManagement>
> -
> - <ciManagement>
> - <system>Jenkins</system>
> - <url>https://builds.apache.org/job/Tika-trunk/</url>
> - </ciManagement>
> -
> <!-- List of dependencies that we depend on for the examples. See the
> full list of Tika
> modules and how to use them at
> http://mvnrepository.com/artifact/org.apache.tika.-->
> <dependencies>
> - <dependency>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-app</artifactId>
> - <version>${project.version}</version>
> - <exclusions>
> - <exclusion>
> - <artifactId>tika-parsers</artifactId>
> - <groupId>org.apache.tika</groupId>
> - </exclusion>
> - </exclusions>
> - </dependency>
> + <dependency>
> + <groupId>org.apache.tika</groupId>
> + <artifactId>tika-app</artifactId>
> + <version>${project.version}</version>
> + <exclusions>
> + <exclusion>
> + <artifactId>tika-parsers</artifactId>
> + <groupId>org.apache.tika</groupId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> <dependency>
> <groupId>org.apache.tika</groupId>
> <artifactId>tika-parsers</artifactId>
> @@ -89,40 +69,59 @@
> <type>test-jar</type>
> <scope>test</scope>
> </dependency>
> - <dependency>
> - <groupId>javax.jcr</groupId>
> - <artifactId>jcr</artifactId>
> - <version>2.0</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.jackrabbit</groupId>
> - <artifactId>jackrabbit-jcr-server</artifactId>
> - <version>2.3.6</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.jackrabbit</groupId>
> - <artifactId>jackrabbit-core</artifactId>
> - <version>2.3.6</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.lucene</groupId>
> - <artifactId>lucene-core</artifactId>
> - <version>3.5.0</version>
> - </dependency>
> - <dependency>
> - <groupId>commons-io</groupId>
> - <artifactId>commons-io</artifactId>
> - <version>2.4</version>
> - </dependency>
> - <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-context</artifactId>
> - <version>3.0.2.RELEASE</version>
> - </dependency>
> + <dependency>
> + <groupId>javax.jcr</groupId>
> + <artifactId>jcr</artifactId>
> + <version>2.0</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-jcr-server</artifactId>
> + <version>2.3.6</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-core</artifactId>
> + <version>2.3.6</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.lucene</groupId>
> + <artifactId>lucene-core</artifactId>
> + <version>3.5.0</version>
> + </dependency>
> + <dependency>
> + <groupId>commons-io</groupId>
> + <artifactId>commons-io</artifactId>
> + <version>2.4</version>
> + </dependency>
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-context</artifactId>
> + <version>3.0.2.RELEASE</version>
> + </dependency>
> <dependency>
> <groupId>junit</groupId>
> <artifactId>junit</artifactId>
> <scope>test</scope>
> </dependency>
> </dependencies>
> +
> + <description>This module contains examples of how to use Apache
> Tika.</description>
> + <organization>
> + <name>The Apache Software Foundation</name>
> + <url>http://www.apache.org</url>
> + </organization>
> + <scm>
> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-example</url>
> + <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-example</connection>
> + <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-example
> </developerConnection>
> + </scm>
> + <issueManagement>
> + <system>JIRA</system>
> + <url>https://issues.apache.org/jira/browse/TIKA</url>
> + </issueManagement>
> + <ciManagement>
> + <system>Jenkins</system>
> + <url>https://builds.apache.org/job/Tika-trunk/</url>
> + </ciManagement>
> </project>
>
> Modified: tika/trunk/tika-java7/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-java7/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-java7/pom.xml (original)
> +++ tika/trunk/tika-java7/pom.xml Thu Jun 11 16:14:10 2015
> @@ -23,7 +23,6 @@
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> -
> <groupId>org.apache.tika</groupId>
> <artifactId>tika-parent</artifactId>
> <version>1.10-SNAPSHOT</version>
> @@ -32,9 +31,8 @@
>
> <artifactId>tika-java7</artifactId>
> <packaging>bundle</packaging>
> -
> <name>Apache Tika Java-7 Components</name>
> - <description>Java-7 reliant components, including FileTypeDetector
> implementations</description>
> + <url>http://tika.apache.org/</url>
>
> <properties>
> <maven.compiler.source>1.7</maven.compiler.source>
> @@ -87,7 +85,7 @@
> </dependency>
> </dependencies>
>
> - <url>http://tika.apache.org/</url>
> + <description>Java-7 reliant components, including FileTypeDetector
> implementations</description>
> <organization>
> <name>The Apache Software Foundation</name>
> <url>http://www.apache.org</url>
>
> Modified: tika/trunk/tika-parent/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-parent/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-parent/pom.xml (original)
> +++ tika/trunk/tika-parent/pom.xml Thu Jun 11 16:14:10 2015
> @@ -305,60 +305,60 @@
> </properties>
>
> <build>
> - <plugins>
> - <plugin>
> - <artifactId>maven-compiler-plugin</artifactId>
> - <version>3.2</version>
> - <configuration>
> - <source>${maven.compiler.source}</source>
> - <target>${maven.compiler.target}</target>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>de.thetaphi</groupId>
> - <artifactId>forbiddenapis</artifactId>
> - <version>1.7</version>
> - <configuration>
> - <targetVersion>${maven.compiler.target}</targetVersion>
> - <internalRuntimeForbidden>true</internalRuntimeForbidden>
> - <failOnUnsupportedJava>false</failOnUnsupportedJava>
> - <bundledSignatures>
> - <bundledSignature>jdk-unsafe</bundledSignature>
> - <bundledSignature>jdk-deprecated</bundledSignature>
> - </bundledSignatures>
> - </configuration>
> - <executions>
> - <execution>
> - <goals>
> - <goal>check</goal>
> - <goal>testCheck</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-bundle-plugin</artifactId>
> - <version>2.3.4</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-surefire-plugin</artifactId>
> - <version>2.18.1</version>
> - <configuration>
> - <argLine>-Xmx2048m</argLine>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-shade-plugin</artifactId>
> - <version>2.3</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-release-plugin</artifactId>
> - <version>2.3.2</version>
> - </plugin>
> + <plugins>
> + <plugin>
> + <artifactId>maven-compiler-plugin</artifactId>
> + <version>3.2</version>
> + <configuration>
> + <source>${maven.compiler.source}</source>
> + <target>${maven.compiler.target}</target>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>de.thetaphi</groupId>
> + <artifactId>forbiddenapis</artifactId>
> + <version>1.7</version>
> + <configuration>
> + <targetVersion>${maven.compiler.target}</targetVersion>
> + <internalRuntimeForbidden>true</internalRuntimeForbidden>
> + <failOnUnsupportedJava>false</failOnUnsupportedJava>
> + <bundledSignatures>
> + <bundledSignature>jdk-unsafe</bundledSignature>
> + <bundledSignature>jdk-deprecated</bundledSignature>
> + </bundledSignatures>
> + </configuration>
> + <executions>
> + <execution>
> + <goals>
> + <goal>check</goal>
> + <goal>testCheck</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <version>2.3.4</version>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-surefire-plugin</artifactId>
> + <version>2.18.1</version>
> + <configuration>
> + <argLine>-Xmx2048m</argLine>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-shade-plugin</artifactId>
> + <version>2.3</version>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-release-plugin</artifactId>
> + <version>2.3.2</version>
> + </plugin>
> </plugins>
>
> <pluginManagement>
>
> Modified: tika/trunk/tika-server/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-server/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-server/pom.xml (original)
> +++ tika/trunk/tika-server/pom.xml Thu Jun 11 16:14:10 2015
> @@ -26,6 +26,7 @@
>
> <artifactId>tika-server</artifactId>
> <name>Apache Tika server</name>
> + <url>http://tika.apache.org/</url>
>
> <properties>
> <cxf.version>3.0.3</cxf.version>
> @@ -59,7 +60,7 @@
> <groupId>${project.groupId}</groupId>
> <artifactId>tika-xmp</artifactId>
> <version>${project.version}</version>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>net.sf.opencsv</groupId>
> <artifactId>opencsv</artifactId>
> @@ -105,7 +106,7 @@
> <groupId>commons-io</groupId>
> <artifactId>commons-io</artifactId>
> <version>2.4</version>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>org.apache.cxf</groupId>
> <artifactId>cxf-rt-rs-client</artifactId>
> @@ -266,11 +267,11 @@
> </execution>
> </executions>
> <configuration>
> - <licence>
> - <!-- Miredot license key valid until August 1st, 2016 when we
> can apply for a new one - http://s.apache.org/oE -->
> -
> UHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAxNi0wOC0wMXx0cnVlI01Dd0NGRklXRzRqRmNTZXNJb2laRElKZVF4RXpieUNTQWhSMHBmTzZCMUdMbDBPQ1B1WmJYQ3NpZElZSCtRPT0=
> - </licence>
> - <!-- insert other configuration here (optional) -->
> + <licence>
> + <!-- Miredot license key valid until August 1st, 2016 when we
> can apply for a new one - http://s.apache.org/oE -->
> +
> UHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAxNi0wOC0wMXx0cnVlI01Dd0NGRklXRzRqRmNTZXNJb2laRElKZVF4RXpieUNTQWhSMHBmTzZCMUdMbDBPQ1B1WmJYQ3NpZElZSCtRPT0=
> + </licence>
> + <!-- insert other configuration here (optional) -->
> </configuration>
> </plugin>
> </plugins>
> @@ -300,7 +301,7 @@
> </build>
> </profile>
> </profiles>
> - <url>http://tika.apache.org/</url>
> +
> <organization>
> <name>The Apache Software Foundation</name>
> <url>http://www.apache.org</url>
>
> Modified: tika/trunk/tika-xmp/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-xmp/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-xmp/pom.xml (original)
> +++ tika/trunk/tika-xmp/pom.xml Thu Jun 11 16:14:10 2015
> @@ -31,9 +31,8 @@
>
> <artifactId>tika-xmp</artifactId>
> <packaging>bundle</packaging>
> -
> <name>Apache Tika XMP</name>
> - <description>Converts Tika metadata to XMP</description>
> + <url>http://tika.apache.org/</url>
>
> <build>
> <plugins>
> @@ -93,7 +92,7 @@
> </dependency>
> </dependencies>
>
> - <url>http://tika.apache.org/</url>
> + <description>Converts Tika metadata to XMP</description>
> <organization>
> <name>The Apache Software Foundation</name>
> <url>http://www.apache.org</url>
>
>
>
Re: svn commit: r1684935 - in /tika/trunk: tika-batch/pom.xml
tika-bundle/pom.xml tika-example/pom.xml tika-java7/pom.xml
tika-parent/pom.xml tika-server/pom.xml tika-xmp/pom.xml
Posted by Konstantin Gribov <gr...@apache.org>.
Sorry if I have broken anyone's patches with this reformat.
--
Best regards,
Konstantin Gribov
чт, 11 июня 2015 г. в 19:14, <gr...@apache.org>:
> Author: grossws
> Date: Thu Jun 11 16:14:10 2015
> New Revision: 1684935
>
> URL: http://svn.apache.org/r1684935
> Log:
> Reformatted POMs
>
> Added license header to tika-batch/pom.xml
>
> Fixed indents, trailing spaces and reordered tags.
>
> Modified:
> tika/trunk/tika-batch/pom.xml
> tika/trunk/tika-bundle/pom.xml
> tika/trunk/tika-example/pom.xml
> tika/trunk/tika-java7/pom.xml
> tika/trunk/tika-parent/pom.xml
> tika/trunk/tika-server/pom.xml
> tika/trunk/tika-xmp/pom.xml
>
> Modified: tika/trunk/tika-batch/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-batch/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-batch/pom.xml (original)
> +++ tika/trunk/tika-batch/pom.xml Thu Jun 11 16:14:10 2015
> @@ -1,172 +1,188 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<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>
> - <properties>
> - <cli.version>1.2</cli.version> <!--sync version with tika-server
> or move to parent? -->
> - <compress.version>1.9</compress.version> <!-- sync with
> tika-parsers or move to parent? -->
> -
> - </properties>
> -
> - <parent>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-parent</artifactId>
> - <version>1.10-SNAPSHOT</version>
> - <relativePath>../tika-parent/pom.xml</relativePath>
> - </parent>
> -
> - <artifactId>tika-batch</artifactId>
> - <packaging>bundle</packaging>
> - <name>Apache Tika batch</name>
> - <url>http://tika.apache.org/</url>
> -
> - <dependencies>
> - <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>tika-core</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>tika-serialization</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.commons</groupId>
> - <artifactId>commons-compress</artifactId>
> - <version>${compress.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>slf4j-log4j12</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>commons-cli</groupId>
> - <artifactId>commons-cli</artifactId>
> - <version>${cli.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-core</artifactId>
> - <version>${project.version}</version>
> - <type>test-jar</type>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-parsers</artifactId>
> - <version>${project.version}</version>
> - <type>test-jar</type>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>junit</groupId>
> - <artifactId>junit</artifactId>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>commons-io</groupId>
> - <artifactId>commons-io</artifactId>
> - <scope>test</scope>
> - <version>2.1</version>
> - </dependency>
> -
> -
> - </dependencies>
> - <build>
> - <plugins>
> - <plugin>
> - <artifactId>maven-remote-resources-plugin</artifactId>
> - <version>1.5</version>
> - <executions>
> - <execution>
> - <goals>
> - <goal>bundle</goal>
> - </goals>
> - </execution>
> - </executions>
> - <configuration>
> - <includes>
> - <include>**/*.xml</include>
> - </includes>
> - </configuration>
> - </plugin>
> -
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-bundle-plugin</artifactId>
> - <extensions>true</extensions>
> - <configuration>
> - <instructions>
> - <Bundle-DocURL>${project.url}</Bundle-DocURL>
> - <Bundle-Activator>
> - org.apache.tika.config.TikaActivator
> - </Bundle-Activator>
> -
> <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
> - </instructions>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.rat</groupId>
> - <artifactId>apache-rat-plugin</artifactId>
> - <configuration>
> - <excludes>
> -
> <exclude>src/test/resources/org/apache/tika/**</exclude>
> - </excludes>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> - <executions>
> - <execution>
> - <goals>
> - <goal>test-jar</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - <plugin>
> - <artifactId>maven-failsafe-plugin</artifactId>
> - <version>2.10</version>
> - <configuration>
> - <additionalClasspathElements>
> - <additionalClasspathElement>
> -
> ${project.build.directory}/${project.build.finalName}.jar
> - </additionalClasspathElement>
> - </additionalClasspathElements>
> - </configuration>
> - <executions>
> - <execution>
> - <goals>
> - <goal>integration-test</goal>
> - <goal>verify</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - </plugins>
> - </build>
> -
> -
> -
> - <organization>
> - <name>The Apache Software Foundation</name>
> - <url>http://www.apache.org</url>
> - </organization>
> - <scm>
> - <url>http://svn.apache.org/viewvc/tika/trunk/tika-batch</url>
> - <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-batch</connection>
> - <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-batch
> </developerConnection>
> - </scm>
> - <issueManagement>
> - <system>JIRA</system>
> - <url>https://issues.apache.org/jira/browse/TIKA</url>
> - </issueManagement>
> - <ciManagement>
> - <system>Jenkins</system>
> - <url>https://builds.apache.org/job/Tika-trunk/</url>
> - </ciManagement>
> +<!--
> + 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.tika</groupId>
> + <artifactId>tika-parent</artifactId>
> + <version>1.10-SNAPSHOT</version>
> + <relativePath>../tika-parent/pom.xml</relativePath>
> + </parent>
> +
> + <artifactId>tika-batch</artifactId>
> + <packaging>bundle</packaging>
> + <name>Apache Tika batch</name>
> + <url>http://tika.apache.org/</url>
> +
> + <properties>
> + <cli.version>1.2</cli.version>
> + <!-- sync version with tika-server or move to parent? -->
> + <compress.version>1.9</compress.version>
> + <!-- sync with tika-parsers or move to parent? -->
> + </properties>
> +
> + <dependencies>
> + <dependency>
> + <groupId>${project.groupId}</groupId>
> + <artifactId>tika-core</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>${project.groupId}</groupId>
> + <artifactId>tika-serialization</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.commons</groupId>
> + <artifactId>commons-compress</artifactId>
> + <version>${compress.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-log4j12</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>commons-cli</groupId>
> + <artifactId>commons-cli</artifactId>
> + <version>${cli.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.tika</groupId>
> + <artifactId>tika-core</artifactId>
> + <version>${project.version}</version>
> + <type>test-jar</type>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.tika</groupId>
> + <artifactId>tika-parsers</artifactId>
> + <version>${project.version}</version>
> + <type>test-jar</type>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>junit</groupId>
> + <artifactId>junit</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>commons-io</groupId>
> + <artifactId>commons-io</artifactId>
> + <scope>test</scope>
> + <version>2.1</version>
> + </dependency>
> + </dependencies>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <artifactId>maven-remote-resources-plugin</artifactId>
> + <version>1.5</version>
> + <executions>
> + <execution>
> + <goals>
> + <goal>bundle</goal>
> + </goals>
> + </execution>
> + </executions>
> + <configuration>
> + <includes>
> + <include>**/*.xml</include>
> + </includes>
> + </configuration>
> + </plugin>
> +
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Bundle-DocURL>${project.url}</Bundle-DocURL>
> + <Bundle-Activator>
> + org.apache.tika.config.TikaActivator
> + </Bundle-Activator>
> + <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
> + </instructions>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.rat</groupId>
> + <artifactId>apache-rat-plugin</artifactId>
> + <configuration>
> + <excludes>
> + <exclude>src/test/resources/org/apache/tika/**</exclude>
> + </excludes>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-jar-plugin</artifactId>
> + <executions>
> + <execution>
> + <goals>
> + <goal>test-jar</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + <plugin>
> + <artifactId>maven-failsafe-plugin</artifactId>
> + <version>2.10</version>
> + <configuration>
> + <additionalClasspathElements>
> + <additionalClasspathElement>
> + ${project.build.directory}/${project.build.finalName}.jar
> + </additionalClasspathElement>
> + </additionalClasspathElements>
> + </configuration>
> + <executions>
> + <execution>
> + <goals>
> + <goal>integration-test</goal>
> + <goal>verify</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <organization>
> + <name>The Apache Software Foundation</name>
> + <url>http://www.apache.org</url>
> + </organization>
> + <scm>
> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-batch</url>
> + <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-batch</connection>
> + <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-batch
> </developerConnection>
> + </scm>
> + <issueManagement>
> + <system>JIRA</system>
> + <url>https://issues.apache.org/jira/browse/TIKA</url>
> + </issueManagement>
> + <ciManagement>
> + <system>Jenkins</system>
> + <url>https://builds.apache.org/job/Tika-trunk/</url>
> + </ciManagement>
> </project>
>
> Modified: tika/trunk/tika-bundle/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-bundle/pom.xml (original)
> +++ tika/trunk/tika-bundle/pom.xml Thu Jun 11 16:14:10 2015
> @@ -119,13 +119,13 @@
> <extensions>true</extensions>
> <configuration>
> <instructions>
> - <_runsystempackages>com.sun.xml.bind.marshaller,
> com.sun.xml.internal.bind.marshaller</_runsystempackages>
> + <_runsystempackages>com.sun.xml.bind.marshaller,
> com.sun.xml.internal.bind.marshaller</_runsystempackages>
> <Bundle-Activator>
> org.apache.tika.parser.internal.Activator
> </Bundle-Activator>
> <Embed-Dependency>
> tika-parsers;inline=true,
> - commons-compress, xz, commons-codec, commons-csv,
> + commons-compress, xz, commons-codec, commons-csv,
> commons-io, commons-exec, junrar,
>
> pdfbox,fontbox,jempbox,bcmail-jdk15on,bcprov-jdk15on,bcpkix-jdk15on,
> poi,poi-scratchpad,poi-ooxml,poi-ooxml-schemas,
> @@ -135,12 +135,12 @@
> juniversalchardet,
> vorbis-java-core, vorbis-java-tika,
> isoparser, aspectjrt,
> - metadata-extractor, xmpcore, json-simple,
> + metadata-extractor, xmpcore, json-simple,
> boilerpipe, rome, opennlp-tools, opennlp-maxent,
> - geoapi, sis-metadata, sis-netcdf, sis-utility,
> + geoapi, sis-metadata, sis-netcdf, sis-utility,
> sis-storage, apache-mime4j-core, apache-mime4j-dom,
> - jsr-275, jhighlight, java-libpst, jwnl,
> - netcdf4, grib, cdm, httpservices, jcip-annotations,
> + jsr-275, jhighlight, java-libpst, jwnl,
> + netcdf4, grib, cdm, httpservices, jcip-annotations,
> jmatio, guava
> </Embed-Dependency>
> <Embed-Transitive>true</Embed-Transitive>
> @@ -151,7 +151,7 @@
> org.apache.tika.parser.*,
> </Export-Package>
> <Import-Package>
> - !org.junit,
> + !org.junit,
> !org.apache.ctakes.*,
> !org.apache.uima.*,
> *,
> @@ -163,8 +163,8 @@
> com.ibm.icu.text;resolution:=optional,
> com.sleepycat.je;resolution:=optional,
> com.sun.javadoc;resolution:=optional,
> - com.sun.xml.bind.marshaller;resolution:=optional,
> - com.sun.xml.internal.bind.marshaller;resolution:=optional,
> + com.sun.xml.bind.marshaller;resolution:=optional,
> + com.sun.xml.internal.bind.marshaller;resolution:=optional,
> com.sun.msv.datatype;resolution:=optional,
> com.sun.msv.datatype.xsd;resolution:=optional,
> com.sun.tools.javadoc;resolution:=optional,
> @@ -173,10 +173,10 @@
> javax.activation;resolution:=optional,
> javax.mail;resolution:=optional,
> javax.mail.internet;resolution:=optional,
> - javax.servlet.annotation;resolution:=optional,
> + javax.servlet.annotation;resolution:=optional,
> javax.servlet;resolution:=optional,
> javax.servlet.http;resolution:=optional,
> - javax.measure.converter;resolution:=optional,
> + javax.measure.converter;resolution:=optional,
> javax.xml.stream;version="[1.0,2)";resolution:=optional,
>
> javax.xml.stream.events;version="[1.0,2)";resolution:=optional,
>
> javax.xml.stream.util;version="[1.0,2)";resolution:=optional,
> @@ -187,11 +187,11 @@
> opendap.dap.http;resolution:=optional,
> opendap.dap;resolution:=optional,
> opendap.dap.parser;resolution:=optional,
> - opennlp.maxent;resolution:=optional,
> - opennlp.tools.namefind;resolution:=optional,
> - net.didion.jwnl;resolution:=optional,
> - org.apache.commons.exec;resolution:=optional,
> - org.apache.commons.io;resolution:=optional,
> + opennlp.maxent;resolution:=optional,
> + opennlp.tools.namefind;resolution:=optional,
> + net.didion.jwnl;resolution:=optional,
> + org.apache.commons.exec;resolution:=optional,
> + org.apache.commons.io;resolution:=optional,
> org.apache.commons.httpclient;resolution:=optional,
> org.apache.commons.httpclient.auth;resolution:=optional,
> org.apache.commons.httpclient.methods;resolution:=optional,
> @@ -203,9 +203,9 @@
> org.apache.commons.vfs2.util;resolution:=optional,
> org.apache.crimson.jaxp;resolution:=optional,
> org.apache.jcp.xml.dsig.internal.dom;resolution:=optional,
> - org.apache.sis;resolution:=optional,
> - org.apache.sis.distance;resolution:=optional,
> - org.apache.sis.geometry;resolution:=optional,
> + org.apache.sis;resolution:=optional,
> + org.apache.sis.distance;resolution:=optional,
> + org.apache.sis.geometry;resolution:=optional,
> org.apache.tools.ant;resolution:=optional,
> org.apache.tools.ant.taskdefs;resolution:=optional,
> org.apache.tools.ant.types;resolution:=optional,
> @@ -241,7 +241,7 @@
> org.jdom2;resolution:=optional,
> org.jdom2.input;resolution:=optional,
> org.jdom2.output;resolution:=optional,
> - org.json.simple;resolution:=optional,
> + org.json.simple;resolution:=optional,
>
> org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=optional,
>
> org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:=optional,
> org.osgi.framework;resolution:=optional,
>
> Modified: tika/trunk/tika-example/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-example/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-example/pom.xml (original)
> +++ tika/trunk/tika-example/pom.xml Thu Jun 11 16:14:10 2015
> @@ -1,4 +1,5 @@
> <?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
> @@ -17,56 +18,35 @@
> 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>
> - <artifactId>tika-parent</artifactId>
> <groupId>org.apache.tika</groupId>
> + <artifactId>tika-parent</artifactId>
> <version>1.10-SNAPSHOT</version>
> <relativePath>../tika-parent/pom.xml</relativePath>
> </parent>
> - <modelVersion>4.0.0</modelVersion>
>
> <artifactId>tika-example</artifactId>
> -
> <name>Apache Tika examples</name>
> <url>http://tika.apache.org/</url>
>
> - <description>This module contains examples of how to use Apache
> Tika.</description>
> - <organization>
> - <name>The Apache Software Foundation</name>
> - <url>http://www.apache.org</url>
> - </organization>
> -
> - <scm>
> - <url>http://svn.apache.org/viewvc/tika/trunk/tika-example</url>
> - <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-example</connection>
> - <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-example
> </developerConnection>
> - </scm>
> -
> - <issueManagement>
> - <system>JIRA</system>
> - <url>https://issues.apache.org/jira/browse/TIKA</url>
> - </issueManagement>
> -
> - <ciManagement>
> - <system>Jenkins</system>
> - <url>https://builds.apache.org/job/Tika-trunk/</url>
> - </ciManagement>
> -
> <!-- List of dependencies that we depend on for the examples. See the
> full list of Tika
> modules and how to use them at
> http://mvnrepository.com/artifact/org.apache.tika.-->
> <dependencies>
> - <dependency>
> - <groupId>org.apache.tika</groupId>
> - <artifactId>tika-app</artifactId>
> - <version>${project.version}</version>
> - <exclusions>
> - <exclusion>
> - <artifactId>tika-parsers</artifactId>
> - <groupId>org.apache.tika</groupId>
> - </exclusion>
> - </exclusions>
> - </dependency>
> + <dependency>
> + <groupId>org.apache.tika</groupId>
> + <artifactId>tika-app</artifactId>
> + <version>${project.version}</version>
> + <exclusions>
> + <exclusion>
> + <artifactId>tika-parsers</artifactId>
> + <groupId>org.apache.tika</groupId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> <dependency>
> <groupId>org.apache.tika</groupId>
> <artifactId>tika-parsers</artifactId>
> @@ -89,40 +69,59 @@
> <type>test-jar</type>
> <scope>test</scope>
> </dependency>
> - <dependency>
> - <groupId>javax.jcr</groupId>
> - <artifactId>jcr</artifactId>
> - <version>2.0</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.jackrabbit</groupId>
> - <artifactId>jackrabbit-jcr-server</artifactId>
> - <version>2.3.6</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.jackrabbit</groupId>
> - <artifactId>jackrabbit-core</artifactId>
> - <version>2.3.6</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.lucene</groupId>
> - <artifactId>lucene-core</artifactId>
> - <version>3.5.0</version>
> - </dependency>
> - <dependency>
> - <groupId>commons-io</groupId>
> - <artifactId>commons-io</artifactId>
> - <version>2.4</version>
> - </dependency>
> - <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-context</artifactId>
> - <version>3.0.2.RELEASE</version>
> - </dependency>
> + <dependency>
> + <groupId>javax.jcr</groupId>
> + <artifactId>jcr</artifactId>
> + <version>2.0</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-jcr-server</artifactId>
> + <version>2.3.6</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-core</artifactId>
> + <version>2.3.6</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.lucene</groupId>
> + <artifactId>lucene-core</artifactId>
> + <version>3.5.0</version>
> + </dependency>
> + <dependency>
> + <groupId>commons-io</groupId>
> + <artifactId>commons-io</artifactId>
> + <version>2.4</version>
> + </dependency>
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-context</artifactId>
> + <version>3.0.2.RELEASE</version>
> + </dependency>
> <dependency>
> <groupId>junit</groupId>
> <artifactId>junit</artifactId>
> <scope>test</scope>
> </dependency>
> </dependencies>
> +
> + <description>This module contains examples of how to use Apache
> Tika.</description>
> + <organization>
> + <name>The Apache Software Foundation</name>
> + <url>http://www.apache.org</url>
> + </organization>
> + <scm>
> + <url>http://svn.apache.org/viewvc/tika/trunk/tika-example</url>
> + <connection>scm:svn:
> http://svn.apache.org/repos/asf/tika/trunk/tika-example</connection>
> + <developerConnection>scm:svn:
> https://svn.apache.org/repos/asf/tika/trunk/tika-example
> </developerConnection>
> + </scm>
> + <issueManagement>
> + <system>JIRA</system>
> + <url>https://issues.apache.org/jira/browse/TIKA</url>
> + </issueManagement>
> + <ciManagement>
> + <system>Jenkins</system>
> + <url>https://builds.apache.org/job/Tika-trunk/</url>
> + </ciManagement>
> </project>
>
> Modified: tika/trunk/tika-java7/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-java7/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-java7/pom.xml (original)
> +++ tika/trunk/tika-java7/pom.xml Thu Jun 11 16:14:10 2015
> @@ -23,7 +23,6 @@
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> -
> <groupId>org.apache.tika</groupId>
> <artifactId>tika-parent</artifactId>
> <version>1.10-SNAPSHOT</version>
> @@ -32,9 +31,8 @@
>
> <artifactId>tika-java7</artifactId>
> <packaging>bundle</packaging>
> -
> <name>Apache Tika Java-7 Components</name>
> - <description>Java-7 reliant components, including FileTypeDetector
> implementations</description>
> + <url>http://tika.apache.org/</url>
>
> <properties>
> <maven.compiler.source>1.7</maven.compiler.source>
> @@ -87,7 +85,7 @@
> </dependency>
> </dependencies>
>
> - <url>http://tika.apache.org/</url>
> + <description>Java-7 reliant components, including FileTypeDetector
> implementations</description>
> <organization>
> <name>The Apache Software Foundation</name>
> <url>http://www.apache.org</url>
>
> Modified: tika/trunk/tika-parent/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-parent/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-parent/pom.xml (original)
> +++ tika/trunk/tika-parent/pom.xml Thu Jun 11 16:14:10 2015
> @@ -305,60 +305,60 @@
> </properties>
>
> <build>
> - <plugins>
> - <plugin>
> - <artifactId>maven-compiler-plugin</artifactId>
> - <version>3.2</version>
> - <configuration>
> - <source>${maven.compiler.source}</source>
> - <target>${maven.compiler.target}</target>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>de.thetaphi</groupId>
> - <artifactId>forbiddenapis</artifactId>
> - <version>1.7</version>
> - <configuration>
> - <targetVersion>${maven.compiler.target}</targetVersion>
> - <internalRuntimeForbidden>true</internalRuntimeForbidden>
> - <failOnUnsupportedJava>false</failOnUnsupportedJava>
> - <bundledSignatures>
> - <bundledSignature>jdk-unsafe</bundledSignature>
> - <bundledSignature>jdk-deprecated</bundledSignature>
> - </bundledSignatures>
> - </configuration>
> - <executions>
> - <execution>
> - <goals>
> - <goal>check</goal>
> - <goal>testCheck</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-bundle-plugin</artifactId>
> - <version>2.3.4</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-surefire-plugin</artifactId>
> - <version>2.18.1</version>
> - <configuration>
> - <argLine>-Xmx2048m</argLine>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-shade-plugin</artifactId>
> - <version>2.3</version>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-release-plugin</artifactId>
> - <version>2.3.2</version>
> - </plugin>
> + <plugins>
> + <plugin>
> + <artifactId>maven-compiler-plugin</artifactId>
> + <version>3.2</version>
> + <configuration>
> + <source>${maven.compiler.source}</source>
> + <target>${maven.compiler.target}</target>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>de.thetaphi</groupId>
> + <artifactId>forbiddenapis</artifactId>
> + <version>1.7</version>
> + <configuration>
> + <targetVersion>${maven.compiler.target}</targetVersion>
> + <internalRuntimeForbidden>true</internalRuntimeForbidden>
> + <failOnUnsupportedJava>false</failOnUnsupportedJava>
> + <bundledSignatures>
> + <bundledSignature>jdk-unsafe</bundledSignature>
> + <bundledSignature>jdk-deprecated</bundledSignature>
> + </bundledSignatures>
> + </configuration>
> + <executions>
> + <execution>
> + <goals>
> + <goal>check</goal>
> + <goal>testCheck</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <version>2.3.4</version>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-surefire-plugin</artifactId>
> + <version>2.18.1</version>
> + <configuration>
> + <argLine>-Xmx2048m</argLine>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-shade-plugin</artifactId>
> + <version>2.3</version>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-release-plugin</artifactId>
> + <version>2.3.2</version>
> + </plugin>
> </plugins>
>
> <pluginManagement>
>
> Modified: tika/trunk/tika-server/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-server/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-server/pom.xml (original)
> +++ tika/trunk/tika-server/pom.xml Thu Jun 11 16:14:10 2015
> @@ -26,6 +26,7 @@
>
> <artifactId>tika-server</artifactId>
> <name>Apache Tika server</name>
> + <url>http://tika.apache.org/</url>
>
> <properties>
> <cxf.version>3.0.3</cxf.version>
> @@ -59,7 +60,7 @@
> <groupId>${project.groupId}</groupId>
> <artifactId>tika-xmp</artifactId>
> <version>${project.version}</version>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>net.sf.opencsv</groupId>
> <artifactId>opencsv</artifactId>
> @@ -105,7 +106,7 @@
> <groupId>commons-io</groupId>
> <artifactId>commons-io</artifactId>
> <version>2.4</version>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>org.apache.cxf</groupId>
> <artifactId>cxf-rt-rs-client</artifactId>
> @@ -266,11 +267,11 @@
> </execution>
> </executions>
> <configuration>
> - <licence>
> - <!-- Miredot license key valid until August 1st, 2016 when we
> can apply for a new one - http://s.apache.org/oE -->
> -
> UHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAxNi0wOC0wMXx0cnVlI01Dd0NGRklXRzRqRmNTZXNJb2laRElKZVF4RXpieUNTQWhSMHBmTzZCMUdMbDBPQ1B1WmJYQ3NpZElZSCtRPT0=
> - </licence>
> - <!-- insert other configuration here (optional) -->
> + <licence>
> + <!-- Miredot license key valid until August 1st, 2016 when we
> can apply for a new one - http://s.apache.org/oE -->
> +
> UHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAxNi0wOC0wMXx0cnVlI01Dd0NGRklXRzRqRmNTZXNJb2laRElKZVF4RXpieUNTQWhSMHBmTzZCMUdMbDBPQ1B1WmJYQ3NpZElZSCtRPT0=
> + </licence>
> + <!-- insert other configuration here (optional) -->
> </configuration>
> </plugin>
> </plugins>
> @@ -300,7 +301,7 @@
> </build>
> </profile>
> </profiles>
> - <url>http://tika.apache.org/</url>
> +
> <organization>
> <name>The Apache Software Foundation</name>
> <url>http://www.apache.org</url>
>
> Modified: tika/trunk/tika-xmp/pom.xml
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-xmp/pom.xml?rev=1684935&r1=1684934&r2=1684935&view=diff
>
> ==============================================================================
> --- tika/trunk/tika-xmp/pom.xml (original)
> +++ tika/trunk/tika-xmp/pom.xml Thu Jun 11 16:14:10 2015
> @@ -31,9 +31,8 @@
>
> <artifactId>tika-xmp</artifactId>
> <packaging>bundle</packaging>
> -
> <name>Apache Tika XMP</name>
> - <description>Converts Tika metadata to XMP</description>
> + <url>http://tika.apache.org/</url>
>
> <build>
> <plugins>
> @@ -93,7 +92,7 @@
> </dependency>
> </dependencies>
>
> - <url>http://tika.apache.org/</url>
> + <description>Converts Tika metadata to XMP</description>
> <organization>
> <name>The Apache Software Foundation</name>
> <url>http://www.apache.org</url>
>
>
>