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

[MENFORCER-418] Upgrade Parent to 36 #153

Merged
merged 1 commit into from May 28, 2022
Merged

[MENFORCER-418] Upgrade Parent to 36 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 3 additions & 12 deletions maven-enforcer-extension/pom.xml
View file
Open in desktop
Expand Up @@ -34,15 +34,6 @@
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
<version>0.3.5</version>
<executions>
<execution>
<id>index-project</id>
<goals>
<goal>main-index</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -78,7 +69,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.2</version>
<configuration>
<showErrors>true</showErrors>
<projectsDirectory>src/it/projects</projectsDirectory>
Expand All @@ -97,7 +87,8 @@
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
Expand Down Expand Up @@ -128,4 +119,4 @@
</build>
</profile>
</profiles>
</project>
</project>
25 changes: 16 additions & 9 deletions maven-enforcer-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -42,11 +42,24 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer-api</artifactId>
Expand All @@ -55,16 +68,12 @@
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer-rules</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer-rules</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
Expand Down Expand Up @@ -107,7 +116,6 @@
<id>descriptor-help</id>
<goals>
<goal>helpmojo</goal>
<goal>descriptor</goal>
</goals>
</execution>
</executions>
Expand Down Expand Up @@ -160,8 +168,6 @@
<goal>validate</goal>
</goals>
<properties>
<!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
<https.protocols>${https.protocols}</https.protocols>
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
</properties>
Expand All @@ -171,7 +177,8 @@
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
Expand Down
32 changes: 2 additions & 30 deletions pom.xml
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
<version>34</version>
<version>36</version>
<relativePath />
</parent>
<groupId>org.apache.maven.enforcer</groupId>
Expand Down Expand Up @@ -55,7 +55,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-enforcer/</url>
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-enforcer/</url>
</ciManagement>
<distributionManagement>
<site>
Expand Down Expand Up @@ -195,15 +195,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand All @@ -218,32 +209,13 @@
<topSiteURL>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</topSiteURL>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.5.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

<reporting>
Expand Down
9 changes: 0 additions & 9 deletions src/site/site.xml
View file
Open in desktop
Expand Up @@ -18,15 +18,6 @@ specific language governing permissions and limitations
under the License.
-->
<project>
<custom>
<fluidoSkin>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
<googlePlusOne />
<googleSearch>
<sitesearch>https://maven.apache.org/enforcer/</sitesearch>
</googleSearch>
</fluidoSkin>
</custom>

<body>
<breadcrumbs>
Expand Down