Fix duplicate jar in dist

gnodet · May 3, 2024 · 679ab27 · 679ab27
1 parent 68b936c
commit 679ab27
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 66 deletions.
diff --git a/build/publish-on-sdkman.sh b/build/publish-on-sdkman.sh
@@ -69,7 +69,7 @@ RESPONSE="$(curl -s -X PUT \
     -H "Consumer-Token: ${SDKMAN_CONSUMER_TOKEN}" \
     -H "Content-Type: application/json" \
     -H "Accept: application/json" \
-    -d '{"candidate": "mvnd", "version": "'${VERSION}-m39'"}' \
+    -d '{"candidate": "mvnd", "version": "'${VERSION}'"}' \
     https://vendors.sdkman.io/default)"
 
 node -pe "

diff --git a/daemon/src/main/resources/META-INF/maven/extension.xml b/daemon/src/main/resources/META-INF/maven/extension.xml
diff --git a/dist/src/main/provisio/maven-distro.xml b/dist/src/main/provisio/maven-distro.xml
@@ -58,17 +58,6 @@
         <artifact id="org.apache.maven.daemon:mvnd-native:${project.version}">
             <exclusion id="*:*"/>
         </artifact>
-        <artifact id="org.codehaus.plexus:plexus-interactivity-api">
-            <exclusion id="*:*"/>
-        </artifact>
-        <!--
-        <artifact id="org.jline:jline-terminal">
-            <exclusion id="*:*"/>
-        </artifact>
-        <artifact id="org.jline:jline-terminal-jni">
-            <exclusion id="*:*"/>
-        </artifact>
-        -->
     </artifactSet>
 
     <fileSet to="/">

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -103,31 +103,16 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <rerunFailingTestsCount>4</rerunFailingTestsCount>
+          <systemPropertyVariables>
+            <mvnd.home>${mvnd.home}</mvnd.home>
+            <project.version>${project.version}</project.version>
+            <mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
+            <os.detected.name>${os.detected.name}</os.detected.name>
+            <os.detected.arch>${os.detected.arch}</os.detected.arch>
+            <mvnd.test.hostLocalMavenRepo>${settings.localRepository}</mvnd.test.hostLocalMavenRepo>
+            <preinstall.artifacts>${preinstall.artifacts}</preinstall.artifacts>
+          </systemPropertyVariables>
         </configuration>
-        <executions>
-          <execution>
-            <id>default-test</id>
-            <phase>none</phase>
-          </execution>
-          <execution>
-            <id>mvn-39</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <phase>test</phase>
-            <configuration>
-              <systemPropertyVariables>
-                <mvnd.home>${mvnd.home}</mvnd.home>
-                <project.version>${project.version}</project.version>
-                <mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
-                <os.detected.name>${os.detected.name}</os.detected.name>
-                <os.detected.arch>${os.detected.arch}</os.detected.arch>
-                <mvnd.test.hostLocalMavenRepo>${settings.localRepository}</mvnd.test.hostLocalMavenRepo>
-                <preinstall.artifacts>${preinstall.artifacts}</preinstall.artifacts>
-              </systemPropertyVariables>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/pom.xml b/pom.xml
@@ -327,6 +327,12 @@
         <artifactId>takari-smart-builder</artifactId>
         <version>${takari-smart-builder.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>32.1.3-jre</version>
+        <scope>provided</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>