From 933a59e2ff570ab1cf622c27554130dc679ec36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 18 Jul 2024 11:00:24 +0300 Subject: [PATCH] Fix compilation against latest polyglot-common --- .../tycho/pomless/TychoTeslaProjectBuilder.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaProjectBuilder.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaProjectBuilder.java index 9369467c3d..145e186189 100644 --- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaProjectBuilder.java +++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTeslaProjectBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Christoph Läubrich and others. + * Copyright (c) 2023, 2024 Christoph Läubrich and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -23,17 +23,23 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; +import org.sonatype.maven.polyglot.TeslaModelProcessor; import org.sonatype.maven.polyglot.TeslaProjectBuilder; @Component(role = ProjectBuilder.class) @Priority(10) public class TychoTeslaProjectBuilder extends TeslaProjectBuilder implements Initializable, ProjectBuilder { + public TychoTeslaProjectBuilder(TeslaModelProcessor teslaModelProcessor, + DefaultProjectBuilder defaultProjectBuilder) { + super(teslaModelProcessor, defaultProjectBuilder); + } + @Override public void initialize() throws InitializationException { try { // Workaround for https://github.com/takari/polyglot-maven/pull/256 - // and https://github.com/takari/polyglot-maven/pull/257 + // and https://github.com/takari/polyglot-maven/pull/257 Field field = DefaultProjectBuilder.class.getDeclaredField("modelCacheFactory"); field.setAccessible(true); Object value = field.get(this);