From 01a48eb89935b0ca7292decb61e46aed02f3346b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Mon, 12 Aug 2024 07:32:09 +0200 Subject: [PATCH] Remove TychoTeslaModelProcessor workaround This is fixed by https://github.com/takari/polyglot-maven/pull/259 and released with 0.4.10 --- .../pomless/TychoTeslaModelProcessor.java | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaModelProcessor.java diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaModelProcessor.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaModelProcessor.java deleted file mode 100644 index 32c6e5538a..0000000000 --- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaModelProcessor.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.eclipse.tycho.pomless; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.util.Map; - -import javax.annotation.Priority; - -import org.apache.maven.model.Model; -import org.apache.maven.model.building.ModelProcessor; -import org.apache.maven.model.io.ModelParseException; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.util.ReaderFactory; -import org.sonatype.maven.polyglot.TeslaModelProcessor; - -//This is a hack until https://github.com/takari/polyglot-maven/pull/259 is fixed -@Component(role = ModelProcessor.class) -@Priority(10) -public class TychoTeslaModelProcessor extends TeslaModelProcessor { - @Override - public Model read(final File input, final Map options) throws IOException, ModelParseException { - Model model; - try (Reader reader = ReaderFactory.newXmlReader(input)) { - model = read(reader, options); - model.setPomFile(input); - } - return model; - } - - @Override - public Model read(final InputStream input, final Map options) throws IOException, ModelParseException { - try (Reader reader = ReaderFactory.newXmlReader(input)) { - return read(reader, options); - } - } -}