Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IT: cleanup (#1886) 

Yet another round

Changes:
* get rid of Guava (2 classes affected)
* align dependencies
* align plugins
This commit is contained in:
Tamas Cservenak 2024-11-07 12:43:46 +01:00 committed by GitHub
parent 1ab2ccf066
commit a836e898b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
its/core-it-suite/pom.xml
View File

@ -77,7 +77,6 @@ under the License.
<proxy.user />
<proxy.pass />
<proxy.nonProxyHosts>localhost</proxy.nonProxyHosts>
<slf4jVersion>1.6.1</slf4jVersion>
<jetty9Version>9.4.55.v20240627</jetty9Version>
<stubPluginVersion>0.1-stub-SNAPSHOT</stubPluginVersion>
@ -129,11 +128,6 @@ under the License.
<version>${jetty9Version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>16.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
@ -597,13 +591,11 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4jVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>

3
its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
View File

@ -30,7 +30,6 @@ import java.io.OutputStream;
import java.net.URL;
import java.util.Collections;
import com.google.common.io.ByteStreams;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
@ -217,7 +216,7 @@ public class HttpServer {
response.setStatus(HttpServletResponse.SC_OK);
try (InputStream in = source.stream(target.substring(1));
OutputStream out = response.getOutputStream()) {
ByteStreams.copy(in, out);
in.transferTo(out);
}
baseRequest.setHandled(true);
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
View File

@ -19,11 +19,9 @@
package org.apache.maven.it;
import java.io.File;
import java.nio.file.Files;
import java.util.Properties;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@ -89,7 +87,7 @@ public class MavenITmng6255FixConcatLines extends AbstractMavenIntegrationTestCa
}
protected void createJvmConfigFile(File jvmConfig, String lineEndings, String... lines) throws Exception {
String content = Joiner.on(lineEndings).join(lines);
Files.write(content, jvmConfig, Charsets.UTF_8);
String content = String.join(lineEndings, lines);
Files.writeString(jvmConfig.toPath(), content);
}
}

1
its/core-it-suite/src/test/resources-filtered/bootstrap.txt
View File

@ -78,6 +78,7 @@ org.apache.maven.plugin-tools:maven-plugin-annotations:3.3
org.apache.maven.plugins:maven-antrun-plugin:3.0.0
org.apache.maven.plugins:maven-antrun-plugin:3.1.0
org.apache.maven.plugins:maven-assembly-plugin:3.1.0
org.apache.maven.plugins:maven-assembly-plugin:3.4.0
org.apache.maven.plugins:maven-clean-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-clean-plugin:2.5
org.apache.maven.plugins:maven-clean-plugin:3.1.0

7
its/core-it-support/core-it-javaagent/pom.xml
View File

@ -31,17 +31,17 @@ under the License.
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7.1</version>
<version>${asmVersion}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>7.3.1</version>
<version>${asmVersion}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>7.3.1</version>
<version>${asmVersion}</version>
</dependency>
</dependencies>
@ -62,7 +62,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<goals>

1
its/core-it-support/core-it-support-artifacts/pom.xml
View File

@ -35,7 +35,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/repo.xml</descriptor>

6
its/pom.xml
View File

@ -153,7 +153,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M9</version>
<configuration>
<environmentVariables>
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
@ -207,11 +206,6 @@ under the License.
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>