You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2024/12/19 15:14:09 UTC

(maven-jlink-plugin) 01/01: Reduce injection

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch deinject
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git

commit 5a593383ecad80c7d555e98c9ec1f2a7d687fc79
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Dec 19 10:13:58 2024 -0500

    Reduce injection
---
 src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java          | 5 +----
 src/test/java/org/apache/maven/plugins/jlink/JLinkMojoTest.java      | 2 +-
 .../java/org/apache/maven/plugins/jlink/MultipleLauncherTest.java    | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java b/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
index 5525239..f0582f4 100644
--- a/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
@@ -38,7 +38,6 @@ package org.apache.maven.plugins.jlink;
  */
 
 import javax.inject.Inject;
-import javax.inject.Named;
 
 import java.io.File;
 import java.io.IOException;
@@ -381,17 +380,15 @@ public class JLinkMojo extends AbstractJLinkMojo {
     /**
      * The JAR archiver needed for archiving the environments.
      */
-    private final ZipArchiver zipArchiver;
+    private final ZipArchiver zipArchiver = new ZipArchiver();
 
     @Inject
     public JLinkMojo(
             MavenProjectHelper projectHelper,
             ToolchainManager toolchainManager,
-            @Named("zip") ZipArchiver zipArchiver,
             MavenResourcesFiltering mavenResourcesFiltering,
             LocationManager locationManager) {
         super(toolchainManager);
-        this.zipArchiver = zipArchiver;
         this.mavenResourcesFiltering = mavenResourcesFiltering;
         this.projectHelper = projectHelper;
         this.locationManager = locationManager;
diff --git a/src/test/java/org/apache/maven/plugins/jlink/JLinkMojoTest.java b/src/test/java/org/apache/maven/plugins/jlink/JLinkMojoTest.java
index eed3ae6..b6cfc33 100644
--- a/src/test/java/org/apache/maven/plugins/jlink/JLinkMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/jlink/JLinkMojoTest.java
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class JLinkMojoTest {
 
-    private JLinkMojo mojo = new JLinkMojo(null, null, null, null, null);
+    private JLinkMojo mojo = new JLinkMojo(null, null, null, null);
 
     @BeforeEach
     public void setUp() throws NoSuchFieldException, IllegalAccessException {
diff --git a/src/test/java/org/apache/maven/plugins/jlink/MultipleLauncherTest.java b/src/test/java/org/apache/maven/plugins/jlink/MultipleLauncherTest.java
index c8530d7..5a49cbf 100644
--- a/src/test/java/org/apache/maven/plugins/jlink/MultipleLauncherTest.java
+++ b/src/test/java/org/apache/maven/plugins/jlink/MultipleLauncherTest.java
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class MultipleLauncherTest {
 
-    private JLinkMojo mojo = new JLinkMojo(null, null, null, null, null);
+    private JLinkMojo mojo = new JLinkMojo(null, null, null, null);
 
     @Test
     void testSingleLauncher() throws Exception {