mirror of https://github.com/apache/maven.git
IT: cleanup (#1886)
Yet another round Changes: * get rid of Guava (2 classes affected) * align dependencies * align plugins
This commit is contained in:
parent
1ab2ccf066
commit
a836e898b0
|
@ -77,7 +77,6 @@ under the License.
|
||||||
<proxy.user />
|
<proxy.user />
|
||||||
<proxy.pass />
|
<proxy.pass />
|
||||||
<proxy.nonProxyHosts>localhost</proxy.nonProxyHosts>
|
<proxy.nonProxyHosts>localhost</proxy.nonProxyHosts>
|
||||||
<slf4jVersion>1.6.1</slf4jVersion>
|
|
||||||
<jetty9Version>9.4.55.v20240627</jetty9Version>
|
<jetty9Version>9.4.55.v20240627</jetty9Version>
|
||||||
|
|
||||||
<stubPluginVersion>0.1-stub-SNAPSHOT</stubPluginVersion>
|
<stubPluginVersion>0.1-stub-SNAPSHOT</stubPluginVersion>
|
||||||
|
@ -129,11 +128,6 @@ under the License.
|
||||||
<version>${jetty9Version}</version>
|
<version>${jetty9Version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.guava</groupId>
|
|
||||||
<artifactId>guava</artifactId>
|
|
||||||
<version>16.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.maven</groupId>
|
<groupId>org.apache.maven</groupId>
|
||||||
<artifactId>maven-repository-metadata</artifactId>
|
<artifactId>maven-repository-metadata</artifactId>
|
||||||
|
@ -597,13 +591,11 @@ under the License.
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>${slf4jVersion}</version>
|
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-simple</artifactId>
|
<artifactId>slf4j-simple</artifactId>
|
||||||
<version>${slf4jVersion}</version>
|
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
@ -30,7 +30,6 @@ import java.io.OutputStream;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import com.google.common.io.ByteStreams;
|
|
||||||
import org.eclipse.jetty.security.ConstraintMapping;
|
import org.eclipse.jetty.security.ConstraintMapping;
|
||||||
import org.eclipse.jetty.security.ConstraintSecurityHandler;
|
import org.eclipse.jetty.security.ConstraintSecurityHandler;
|
||||||
import org.eclipse.jetty.security.HashLoginService;
|
import org.eclipse.jetty.security.HashLoginService;
|
||||||
|
@ -217,7 +216,7 @@ public class HttpServer {
|
||||||
response.setStatus(HttpServletResponse.SC_OK);
|
response.setStatus(HttpServletResponse.SC_OK);
|
||||||
try (InputStream in = source.stream(target.substring(1));
|
try (InputStream in = source.stream(target.substring(1));
|
||||||
OutputStream out = response.getOutputStream()) {
|
OutputStream out = response.getOutputStream()) {
|
||||||
ByteStreams.copy(in, out);
|
in.transferTo(out);
|
||||||
}
|
}
|
||||||
baseRequest.setHandled(true);
|
baseRequest.setHandled(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,11 +19,9 @@
|
||||||
package org.apache.maven.it;
|
package org.apache.maven.it;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.util.Properties;
|
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.Verifier;
|
||||||
import org.apache.maven.shared.verifier.util.ResourceExtractor;
|
import org.apache.maven.shared.verifier.util.ResourceExtractor;
|
||||||
import org.junit.jupiter.api.Test;
|
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 {
|
protected void createJvmConfigFile(File jvmConfig, String lineEndings, String... lines) throws Exception {
|
||||||
String content = Joiner.on(lineEndings).join(lines);
|
String content = String.join(lineEndings, lines);
|
||||||
Files.write(content, jvmConfig, Charsets.UTF_8);
|
Files.writeString(jvmConfig.toPath(), content);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.0.0
|
||||||
org.apache.maven.plugins:maven-antrun-plugin:3.1.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.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:${stubPluginVersion}
|
||||||
org.apache.maven.plugins:maven-clean-plugin:2.5
|
org.apache.maven.plugins:maven-clean-plugin:2.5
|
||||||
org.apache.maven.plugins:maven-clean-plugin:3.1.0
|
org.apache.maven.plugins:maven-clean-plugin:3.1.0
|
||||||
|
|
|
@ -31,17 +31,17 @@ under the License.
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ow2.asm</groupId>
|
<groupId>org.ow2.asm</groupId>
|
||||||
<artifactId>asm</artifactId>
|
<artifactId>asm</artifactId>
|
||||||
<version>9.7.1</version>
|
<version>${asmVersion}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ow2.asm</groupId>
|
<groupId>org.ow2.asm</groupId>
|
||||||
<artifactId>asm-commons</artifactId>
|
<artifactId>asm-commons</artifactId>
|
||||||
<version>7.3.1</version>
|
<version>${asmVersion}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ow2.asm</groupId>
|
<groupId>org.ow2.asm</groupId>
|
||||||
<artifactId>asm-util</artifactId>
|
<artifactId>asm-util</artifactId>
|
||||||
<version>7.3.1</version>
|
<version>${asmVersion}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
@ -62,7 +62,6 @@ under the License.
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>3.4.1</version>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
|
|
|
@ -35,7 +35,6 @@ under the License.
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
<version>3.4.0</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<descriptors>
|
<descriptors>
|
||||||
<descriptor>src/main/assembly/repo.xml</descriptor>
|
<descriptor>src/main/assembly/repo.xml</descriptor>
|
||||||
|
|
|
@ -153,7 +153,6 @@ under the License.
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>3.0.0-M9</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<environmentVariables>
|
<environmentVariables>
|
||||||
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
|
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
|
||||||
|
@ -207,11 +206,6 @@ under the License.
|
||||||
</lifecycleMappingMetadata>
|
</lifecycleMappingMetadata>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
|
||||||
<version>3.2.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-plugin-plugin</artifactId>
|
<artifactId>maven-plugin-plugin</artifactId>
|
||||||
|
|
Loading…
Reference in New Issue