Skip to content

Commit

Permalink
[MSHARED-1071] Drop maven 3.0 compatibility, Maven 3.2.5, Injects
Browse files Browse the repository at this point in the history
  • Loading branch information
gnodet authored and slawekjaranowski committed Aug 20, 2022
1 parent 3f425fe commit 80cadf4
Show file tree
Hide file tree
Showing 25 changed files with 373 additions and 3,876 deletions.
53 changes: 21 additions & 32 deletions pom.xml
Expand Up @@ -56,6 +56,8 @@

<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.2.5</mavenVersion>
<resolverVersion>1.0.0.v20140518</resolverVersion>
<project.build.outputTimestamp>2022-05-14T10:50:43Z</project.build.outputTimestamp>
</properties>

Expand All @@ -69,51 +71,38 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.0.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
<version>1.13.1</version>
<optional>true</optional>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>1.1.0</version>
<optional>true</optional>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>1.1.0</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
</exclusion>
</exclusions>
<version>${resolverVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>2.1.1</version>
<executions>
<execution>
<goals>
<goal>generate-metadata</goal>
</goals>
</execution>
</executions>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Expand All @@ -128,7 +117,7 @@
</configuration>
<executions>
<execution>
<id>check</id>
<id>rat-check</id>
<goals>
<goal>check</goal>
</goals>
Expand Down
6 changes: 3 additions & 3 deletions src/it/settings.xml
Expand Up @@ -23,9 +23,6 @@ under the License.
<profiles>
<profile>
<id>it-repo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>local.central</id>
Expand All @@ -52,4 +49,7 @@ under the License.
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>it-repo</activeProfile>
</activeProfiles>
</settings>
6 changes: 1 addition & 5 deletions src/it/setup-extension/pom.xml
Expand Up @@ -35,17 +35,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.0.4</maven.version>
</properties>

<dependencyManagement>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.version}</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
12 changes: 3 additions & 9 deletions src/it/setup-plugin/pom.xml
Expand Up @@ -37,13 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
</execution>
</executions>
<version>@maven.plugin.tools.version@</version>
</plugin>
</plugins>
</build>
Expand All @@ -57,13 +51,13 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.5.2</version>
<version>@maven.plugin.tools.version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.0.5</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down

This file was deleted.

0 comments on commit 80cadf4

Please sign in to comment.