Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/branch_1x' into branch_1x
Browse files Browse the repository at this point in the history
  • Loading branch information
tballison committed Mar 11, 2020
2 parents f7281b8 + c760db2 commit 62a1c3f
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-dl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-eval/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-java7/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-langdetect/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-nlp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Apache Tika parent</name>
Expand Down
2 changes: 1 addition & 1 deletion tika-parsers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-serialization/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-translate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tika-xmp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>1.24-SNAPSHOT</version>
<version>1.25-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 62a1c3f

Please sign in to comment.