This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-4332 in repository https://gitbox.apache.org/repos/asf/tika.git
commit cb3334101f128066f909176d21754289b0d9aa0f Author: tallison <[email protected]> AuthorDate: Thu Oct 2 15:10:31 2025 -0400 TIKA-4497 -- allow per file timeouts in tika-pipes --- CHANGES.txt | 2 + tika-app/pom.xml | 75 ------------- tika-dotnet/pom.xml | 185 ------------------------------- tika-dotnet/src/main/java/Tika/Tika.java | 77 ------------- 4 files changed, 2 insertions(+), 337 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3f04c47eb..9d46e02ce 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,8 @@ Release 4.0.0-BETA1 - ??? * The tika-batch module has been removed (TIKA-4333). + * Removed the dotnet module (TIKA-4332). + OTHER CHANGES * Fix concurrency bug in TikaToXMP (TIKA-4393) diff --git a/tika-app/pom.xml b/tika-app/pom.xml index 02821bc69..bdcf48bad 100644 --- a/tika-app/pom.xml +++ b/tika-app/pom.xml @@ -33,9 +33,6 @@ <name>Apache Tika application</name> <url>https://tika.apache.org/</url> - <properties> - <ikvm>${env.IKVM_HOME}</ikvm> - </properties> <dependencies> <dependency> @@ -180,78 +177,6 @@ </plugins> </build> - <profiles> - <profile> - <id>ikvm</id> - <activation> - <file> - <exists>${ikvm}/bin/ikvmc.exe</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>${maven.antrun.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <exec executable="${ikvm}/bin/ikvmc.exe"> - <arg value="-nowarn:0100" /> - <arg value="-nowarn:0105" /> - <arg value="-nowarn:0109" /> - <arg value="-nowarn:0111" /> - <arg value="-nowarn:0112" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Util.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Charsets.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Text.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Core.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.AWT.WinForms.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Media.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Misc.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Security.dll" /> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.SwingAWT.dll" /> - <arg value="-target:library" /> - <arg value="-compressresources" /> - <arg value="-out:${project.build.directory}/${project.build.finalName}.dll" /> - <arg value="${project.build.directory}/${project.build.finalName}.jar" /> - </exec> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.6.1</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifacts> - <file>${project.build.directory}/${project.build.finalName}.dll</file> - <type>dll</type> - </artifacts> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <organization> <name>The Apache Software Foundation</name> <url>http://www.apache.org</url> diff --git a/tika-dotnet/pom.xml b/tika-dotnet/pom.xml deleted file mode 100644 index f39aac312..000000000 --- a/tika-dotnet/pom.xml +++ /dev/null @@ -1,185 +0,0 @@ -<?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 - 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:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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.11-SNAPSHOT</version> - <relativePath>../tika-parent/pom.xml</relativePath> - </parent> - - <artifactId>tika-dotnet</artifactId> - <name>Apache Tika for .NET</name> - <url>https://tika.apache.org/</url> - - <properties> - <ikvm>C:\ikvm-7.0.4335.0</ikvm> - <mscorlib.jar>${ikvm}\mscorlib.jar</mscorlib.jar> - <System.jar>${ikvm}\System.jar</System.jar> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-app</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>ikvm</groupId> - <artifactId>mscorlib</artifactId> - <version>2.0</version> - <scope>system</scope> - <systemPath>${mscorlib.jar}</systemPath> - </dependency> - <dependency> - <groupId>ikvm</groupId> - <artifactId>System</artifactId> - <version>2.0</version> - <scope>system</scope> - <systemPath>${System.jar}</systemPath> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <excludeTransitive>true</excludeTransitive> - <excludeScope>system</excludeScope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <exec executable="${ikvm}/bin/ikvmc.exe"> - <arg value="-nowarn:0100"/> - <arg value="-nowarn:0105"/> - <arg value="-nowarn:0109"/> - <arg value="-nowarn:0111"/> - <arg value="-nowarn:0112"/> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Charsets.dll"/> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Core.dll"/> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Text.dll"/> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.Util.dll"/> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.XML.API.dll"/> - <arg value="-reference:${ikvm}/bin/IKVM.OpenJDK.XML.Transform.dll"/> - <arg value="-target:library"/> - <arg value="-compressresources"/> - <arg value="-out:${project.build.directory}/${project.build.finalName}.dll"/> - <arg value="-recurse:${project.build.directory}\*.class"/> - <arg value="${project.build.directory}/dependency/tika-app.jar"/> - </exec> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifacts> - <file>${project.build.directory}/${project.build.finalName}.dll</file> - <type>dll</type> - </artifacts> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!-- This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[2.4,)</versionRange> - <goals> - <goal>copy-dependencies</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <description>A .NET port of Tika functionality.</description> - <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - <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> diff --git a/tika-dotnet/src/main/java/Tika/Tika.java b/tika-dotnet/src/main/java/Tika/Tika.java deleted file mode 100644 index 933509eaf..000000000 --- a/tika-dotnet/src/main/java/Tika/Tika.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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. - */ -package Tika; - -import java.io.File; -import java.io.IOException; -import java.net.URL; - -import org.apache.tika.exception.TikaException; - -public class Tika { - - private final org.apache.tika.Tika tika = new org.apache.tika.Tika(); - - public cli.System.String detect(cli.System.String name) { - return toCliString(tika.detect(toJvmString(name))); - } - - public cli.System.String detect(cli.System.IO.FileInfo file) - throws cli.System.IO.IOException { - try { - return toCliString(tika.detect(new File(file.get_FullName()))); - } catch (IOException e) { - throw new cli.System.IO.IOException(e.getMessage(), e); - } - } - - public cli.System.String detect(cli.System.Uri uri) - throws cli.System.IO.IOException { - try { - return toCliString(tika.detect(new URL(uri.get_AbsolutePath()))); - } catch (IOException e) { - throw new cli.System.IO.IOException(e.getMessage(), e); - } - } - - public cli.System.String parseToString(cli.System.IO.FileInfo file) - throws cli.System.IO.IOException, TikaException { - try { - return toCliString(tika.parseToString(new File(file.get_FullName()))); - } catch (IOException e) { - throw new cli.System.IO.IOException(e.getMessage(), e); - } - } - - public cli.System.String parseToString(cli.System.Uri uri) - throws cli.System.IO.IOException, TikaException { - try { - return toCliString(tika.parseToString(new URL(uri.get_AbsoluteUri()))); - } catch (IOException e) { - throw new cli.System.IO.IOException(e.getMessage(), e); - } - } - - private static cli.System.String toCliString(String string) { - return new cli.System.String(string.toCharArray()); - } - - private static String toJvmString(cli.System.String string) { - return new String(string.ToCharArray()); - } - -}
