Skip to content

[MDEPLOY-322] Use parent POM 43 #74

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.

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

Merged
merged 1 commit into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 4 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>42</version>
<version>43</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -70,10 +70,10 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.9.6</mavenVersion>
<!-- Keep in sync with resolver used in maven above -->
<!-- Maven bound -->
<resolverVersion>1.9.18</resolverVersion>
<!-- Maven bound -->
<slf4jVersion>1.7.36</slf4jVersion>
<!-- Keep in sync with resolver used in maven above -->
<resolverVersion>1.9.20</resolverVersion>

<!-- plugins version used in IT tests -->
<mavenAntrunPluginVersion>${version.maven-antrun-plugin}</mavenAntrunPluginVersion>
Expand Down Expand Up @@ -210,19 +210,6 @@ under the License.
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<proc>none</proc>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>run-its</id>
Expand Down
2 changes: 1 addition & 1 deletion src/it/no-main-artifact-1/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

def buildLog = new File ( basedir, "build.log")

assert buildLog.text.contains( "The packaging plugin for this project did not assign "
assert buildLog.text.contains( "The packaging plugin for project test did not assign "
+ "a main file to the project but it has attachments. Change packaging to 'pom'." )
2 changes: 1 addition & 1 deletion src/it/no-main-artifact-2/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

def buildLog = new File ( basedir, "build.log")

assert buildLog.text.contains( "The packaging plugin for this project did not assign "
assert buildLog.text.contains( "The packaging plugin for project test did not assign "
+ "a main file to the project but it has attachments. Change packaging to 'pom'." )
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ void initProperties() throws MojoExecutionException {
}
}

@Override
@SuppressWarnings("MethodLength")
public void execute() throws MojoExecutionException, MojoFailureException {
if (Boolean.parseBoolean(skip)
|| ("releases".equals(skip) && !ArtifactUtils.isSnapshot(version))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ private boolean hasState(MavenProject project) {
return pluginContext.containsKey(DEPLOY_PROCESSED_MARKER);
}

@Override
public void execute() throws MojoExecutionException, MojoFailureException {
State state;
if (Boolean.parseBoolean(skip)
Expand Down