Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IT: Consolidate ITs somewhat #1924

Merged
merged 5 commits into from
Nov 19, 2024
Merged

IT: Consolidate ITs somewhat #1924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdaa2ae
Consolidate ITs somewhat
cstamas Nov 19, 2024
b089cc6
Drop two ancient ITs
cstamas Nov 19, 2024
8287c9f
Reformat
cstamas Nov 19, 2024
b8833fe
missed to drop this one
cstamas Nov 19, 2024
159ff62
Fix issues
cstamas Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 1 addition & 121 deletions its/core-it-suite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.3.0</version>
<!-- NOTE: Use compile scope for transitivity. -->
</dependency>
<dependency>
Expand Down Expand Up @@ -249,11 +248,6 @@ under the License.
<artifactId>maven-it-plugin-active-collection</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-ant-based</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-artifact</artifactId>
Expand Down Expand Up @@ -585,7 +579,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>3.5.3</version>
<version>${wagonVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -822,120 +816,6 @@ under the License.
</plugins>
</build>
</profile>
<profile>
<id>emma</id>
<properties>
<preparedMavenHome>${project.build.directory}/distro</preparedMavenHome>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-maven-distro</id>
<goals>
<goal>run</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
<target>
<delete dir="${preparedMavenHome}" />
<copy overwrite="true" todir="${preparedMavenHome}">
<fileset dir="${mavenHome}" />
</copy>
<chmod dir="${preparedMavenHome}/bin" includes="mvn,mvnDebug" perm="ugo+rx" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>inject-emma-into-core-realm</id>
<goals>
<goal>copy</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>emma</groupId>
<artifactId>emma</artifactId>
<version>2.1.5320</version>
</artifactItem>
</artifactItems>
<outputDirectory>${preparedMavenHome}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma4it-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
<jarSets>
<jarSet>
<directory>${preparedMavenHome}/lib</directory>
<includes>
<include>maven*.jar</include>
</includes>
</jarSet>
</jarSets>
<includes>
<include>org.apache.maven.*</include>
</includes>
<excludes>
<exclude>*.io.xpp3.*</exclude>
<exclude>*Exception</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>instrument</id>
<goals>
<goal>instrument</goal>
</goals>
<phase>process-test-classes</phase>
</execution>
<execution>
<id>report</id>
<goals>
<goal>report</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${basedir}</directory>
<includes>
<include>coverage.ec</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>proxy</id>
<activation>
Expand Down
56 changes: 0 additions & 56 deletions ...-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions ...-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ public TestSuiteOrdering() {
suite.addTestSuite(MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.class);
suite.addTestSuite(MavenITmng4789ScopeInheritanceMeetsConflictTest.class);
suite.addTestSuite(MavenITmng4788InstallationToCustomLocalRepoTest.class);
suite.addTestSuite(MavenITmng4786AntBased21xMojoSupportTest.class);
suite.addTestSuite(MavenITmng4785TransitiveResolutionInForkedThreadTest.class);
suite.addTestSuite(MavenITmng4781DeploymentToNexusStagingRepoTest.class);
suite.addTestSuite(MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.class);
Expand Down Expand Up @@ -375,7 +374,6 @@ public TestSuiteOrdering() {
suite.addTestSuite(MavenITmng4402DuplicateChildModuleTest.class);
suite.addTestSuite(MavenITmng4401RepositoryOrderForParentPomTest.class);
suite.addTestSuite(MavenITmng4400RepositoryOrderTest.class);
suite.addTestSuite(MavenITmng4396AntBased20xMojoSupportTest.class);
suite.addTestSuite(MavenITmng4393ParseExternalParenPomLenientTest.class);
suite.addTestSuite(MavenITmng4387QuietLoggingTest.class);
suite.addTestSuite(MavenITmng4386DebugLoggingTest.class);
Expand Down
51 changes: 0 additions & 51 deletions its/core-it-suite/src/test/resources/mng-4396/pom.xml
View file
Open in desktop

This file was deleted.

Loading