Skip to content

Commit

Permalink
[MSHARED-1131] Upgrade Parent to 37 and cleanup
Browse files Browse the repository at this point in the history
- use surefire version from parent
- commons-io in test scope
- remove unused maven-plugin-api
- bump mockito-core to 4.8.0
- use fluido skin verson from parent
  • Loading branch information
slawekjaranowski committed Sep 12, 2022
1 parent bde012c commit 7660d9b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 20 deletions.
22 changes: 8 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>maven-shared-components</artifactId>
<groupId>org.apache.maven.shared</groupId>
<version>36</version>
<version>37</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -58,7 +58,6 @@
<maven.version>3.2.5</maven.version>
<javaVersion>8</javaVersion>
<resolver.version>1.6.3</resolver.version>
<surefire.version>2.22.2</surefire.version>
<checkstyle.violation.ignore>MethodLength</checkstyle.violation.ignore>
<project.build.outputTimestamp>2022-07-17T16:57:02Z</project.build.outputTimestamp>
</properties>
Expand Down Expand Up @@ -88,17 +87,6 @@
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
Expand All @@ -112,6 +100,12 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -121,7 +115,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.5.1</version>
<version>4.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 0 additions & 6 deletions src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.9</version>
</skin>

<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Expand Down

0 comments on commit 7660d9b

Please sign in to comment.