You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/02/25 18:27:06 UTC
[tika] branch branch_1x updated (3dc7db7 -> 247edc3)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 3dc7db7 TIKA-3056 -- general upgrades for the 1.24 release.
new 811fa08 TIKA-3038 -- update miredot license key and https->http
new 247edc3 TIKA-3036 -- fix build on a mac caused by group id is too large issue
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 -
tika-bundle/pom.xml | 4 +++-
tika-parent/pom.xml | 8 ++++++++
tika-server/pom.xml | 11 ++++++-----
4 files changed, 17 insertions(+), 7 deletions(-)
[tika] 02/02: TIKA-3036 -- fix build on a mac caused by group id is
too large issue
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 247edc3a0001976b906a23651caa9a5b0475d9e3
Author: tallison <ta...@apache.org>
AuthorDate: Tue Feb 25 11:28:23 2020 -0500
TIKA-3036 -- fix build on a mac caused by group id is too large issue
---
pom.xml | 1 -
tika-bundle/pom.xml | 4 +++-
tika-parent/pom.xml | 8 ++++++++
tika-server/pom.xml | 1 -
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 837c704..6284519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.version}</version>
<executions>
<execution>
<id>src</id>
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index 07f43fa..ef55b0c 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -535,7 +535,9 @@
<goal>single</goal>
</goals>
<configuration>
- <descriptor>test-bundles.xml</descriptor>
+ <descriptors>
+ <descriptor>test-bundles.xml</descriptor>
+ </descriptors>
<finalName>test</finalName>
<attach>false</attach>
</configuration>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 95c9d47..1d7d9fb 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -402,6 +402,14 @@
</configuration>
-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.version}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
<!-- if this version contains commons-io 2.6, remove hard-coded commons-io version below -->
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index b9b7edf..56ea96a 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -307,7 +307,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
[tika] 01/02: TIKA-3038 -- update miredot license key and
https->http
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 811fa084c0dd3fa00e6810849711a8917c46f32c
Author: tallison <ta...@apache.org>
AuthorDate: Tue Feb 25 11:10:15 2020 -0500
TIKA-3038 -- update miredot license key and https->http
---
tika-server/pom.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 75dd783..b9b7edf 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -35,7 +35,7 @@
<pluginRepository>
<id>miredot</id>
<name>MireDot Releases</name>
- <url>https://nexus.qmino.com/content/repositories/miredot</url>
+ <url>http://nexus.qmino.com/content/repositories/miredot</url>
</pluginRepository>
</pluginRepositories>
@@ -350,7 +350,7 @@
<plugin>
<groupId>com.qmino</groupId>
<artifactId>miredot-plugin</artifactId>
- <version>2.2-Java10</version>
+ <version>2.2.1-Java10</version>
<executions>
<execution>
<goals>
@@ -368,8 +368,10 @@
<output>
<html />
</output>
- <!-- Free Miredot license key, valid until Jan 31st, 2020 https://issues.apache.org/jira/browse/TIKA-2253 -->
- <licence>cHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAyMC0wMS0zMXx0cnVlfC0xI01Dd0NGRUV5QktCTlBJbXhwLzBvaWxuak1MYkxZQW5XQWhScWdwM0c5aFdWMGpOUFA5MlNFc2pVS1FKZStRPT0=</licence>
+ <!-- Free Miredot license key, valid until Jan 31st(?), 2025
+ https://issues.apache.org/jira/browse/TIKA-2253
+ https://issues.apache.org/jira/browse/TIKA-3038-->
+ <licence>cHJvamVjdHxvcmcuYXBhY2hlLnRpa2EudGlrYS1zZXJ2ZXJ8MjAyNS0wMy0wMXxmYWxzZXwtMSNNQ3dDRkdtemsraHJDdjNodXlhN0d1KzlQM1Y0bUNxMEFoUnRHc25DQ1VyMjhLQ2swU0R5RGp1WkVpcXVlZz09</licence>
<!-- insert other configuration here (optional) -->
</configuration>
</plugin>