From 210e2a11377ba2217a60421357ca4fc50b5998ef Mon Sep 17 00:00:00 2001 From: Tobias Liefke Date: Wed, 4 Sep 2024 16:31:26 +0200 Subject: [PATCH] #1042 Use correct Xpp3Dom class --- frontend-maven-plugin/pom.xml | 6 ++++++ .../maven/plugins/frontend/mojo/AbstractFrontendMojo.java | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend-maven-plugin/pom.xml b/frontend-maven-plugin/pom.xml index df38f20d..eef6222c 100644 --- a/frontend-maven-plugin/pom.xml +++ b/frontend-maven-plugin/pom.xml @@ -55,6 +55,12 @@ plexus-build-api 0.0.7 + + + org.codehaus.plexus + plexus-utils + 3.5.1 + diff --git a/frontend-maven-plugin/src/main/java/com/github/eirslett/maven/plugins/frontend/mojo/AbstractFrontendMojo.java b/frontend-maven-plugin/src/main/java/com/github/eirslett/maven/plugins/frontend/mojo/AbstractFrontendMojo.java index ef99ac9b..3526b60c 100644 --- a/frontend-maven-plugin/src/main/java/com/github/eirslett/maven/plugins/frontend/mojo/AbstractFrontendMojo.java +++ b/frontend-maven-plugin/src/main/java/com/github/eirslett/maven/plugins/frontend/mojo/AbstractFrontendMojo.java @@ -12,7 +12,7 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Server; -import org.apache.maven.shared.utils.xml.Xpp3Dom; +import org.codehaus.plexus.util.xml.Xpp3Dom; import org.eclipse.aether.RepositorySystemSession; import com.github.eirslett.maven.plugins.frontend.lib.FrontendException; @@ -116,6 +116,9 @@ public void execute() throws MojoFailureException { * * @param server * the <server> entry from the settings.xml + * + * @return the mapping from the name of each configured HTTP header to its value, + * an empty map if there is no such configuration */ protected Map getHttpHeaders(Server server) { if (server == null || !(server.getConfiguration() instanceof Xpp3Dom)) {