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

build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 2.22.2 to 3.1.2 #6415

Merged
merged 2 commits into from
Jul 21, 2023
Merged

build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 2.22.2 to 3.1.2 #6415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da6cc63
build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin
dependabot[bot] Jul 21, 2023
3486236
make failsafe and surefire match
Jul 21, 2023
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
32 changes: 8 additions & 24 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,12 +737,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
<version>${maven.testing.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.plugin.version}</version>
<version>${maven.testing.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -985,25 +985,13 @@
<DynamicDependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit3</artifactId>
<version>${maven.surefire.plugin.version}</version>
<repositoryType>PLUGIN</repositoryType>
</DynamicDependency>
<DynamicDependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit3</artifactId>
<version>${maven.smoke.surefire.plugin.version}</version>
<repositoryType>PLUGIN</repositoryType>
</DynamicDependency>
<DynamicDependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>${maven.surefire.plugin.version}</version>
<version>${maven.testing.plugin.version}</version>
<repositoryType>PLUGIN</repositoryType>
</DynamicDependency>
<DynamicDependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>${maven.smoke.surefire.plugin.version}</version>
<version>${maven.testing.plugin.version}</version>
<repositoryType>PLUGIN</repositoryType>
</DynamicDependency>
<DynamicDependency>
Expand All @@ -1027,7 +1015,7 @@
<DynamicDependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.smoke.surefire.plugin.version}</version>
<version>${maven.testing.plugin.version}</version>
<repositoryType>PLUGIN</repositoryType>
</DynamicDependency>
<DynamicDependency>
Expand Down Expand Up @@ -1268,7 +1256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
<version>${maven.testing.plugin.version}</version>
<configuration>
<!-- Don't specify argLine here or it will override the argLine property value -->
<skip>${skipSurefire}</skip>
Expand Down Expand Up @@ -1368,7 +1356,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${maven.surefire.report.plugin.version}</version>
<version>${maven.testing.plugin.version}</version>
<reportSets>
<reportSet>
<id>unit-tests</id>
Expand Down Expand Up @@ -1498,10 +1486,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- maven surefire/failsafe version added here so it could be overridden -->
<maven.testing.plugin.version>3.0.0-M5</maven.testing.plugin.version>
<maven.failsafe.plugin.version>${maven.testing.plugin.version}</maven.failsafe.plugin.version>
<maven.surefire.plugin.version>${maven.testing.plugin.version}</maven.surefire.plugin.version>
<maven.surefire.report.plugin.version>${maven.testing.plugin.version}</maven.surefire.report.plugin.version>
<maven.testing.plugin.version>3.1.2</maven.testing.plugin.version>

<maven.eclipse.plugin.version>2.10</maven.eclipse.plugin.version>
<maven.javadoc.plugin.version>3.4.1</maven.javadoc.plugin.version>
Expand All @@ -1511,7 +1496,6 @@
<sass.maven.plugin.version>1.1.2-ONMS-20131018-1</sass.maven.plugin.version>

<!-- other plugin versions -->
<maven.smoke.surefire.plugin.version>2.22.2</maven.smoke.surefire.plugin.version> <!-- see smoke-test/pom.xml -->
<maven.antrun.plugin.version>1.8</maven.antrun.plugin.version> <!-- see smoke-test/pom.xml -->
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven.install.plugin.version>3.1.1</maven.install.plugin.version>
Expand Down
9 changes: 5 additions & 4 deletions smoke-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
<skipITs>true</skipITs>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<camelVersion>2.19.1</camelVersion>
<surefireVersion>2.18</surefireVersion>
<failsafeVersion>2.22.2</failsafeVersion>
<groovyVersion>3.0.14</groovyVersion>
<frontendPluginVersion>0.0.29</frontendPluginVersion>
<jackson2Version>2.14.2</jackson2Version>
Expand All @@ -72,6 +70,9 @@
<!-- Limit ITs to 30 minutes by default -->
<test.fork.timeout>1800</test.fork.timeout>

<!-- for surefire and failsafe -->
<maven.testing.plugin.version>3.1.2</maven.testing.plugin.version>

<!-- fix xerces/xalan pollution, use built-in factories -->
<argLineMemory>-Xms2g -Xmx2g -XX:+UseG1GC</argLineMemory>
<argLineDocumentBuilder>-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl</argLineDocumentBuilder>
Expand Down Expand Up @@ -112,7 +113,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefireVersion}</version>
<version>${maven.testing.plugin.version}</version>
<configuration>
<!-- skips surefire tests without skipping failsafe tests.
Property value seems to magically default to false -->
Expand All @@ -123,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafeVersion}</version>
<version>${maven.testing.plugin.version}</version>
<configuration>
<!-- Don't specify argLine here or it will override the argLine property value -->
<systemPropertyVariables>
Expand Down
Loading