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
Miscellaneous cleanup #15
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
<maven.compiler.release>11</maven.compiler.release> | ||
<maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease> | ||
<!-- Generate metadata for reflection on method parameters --> | ||
<maven.compiler.parameters>true</maven.compiler.parameters> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in pom
and plugin-pom
, define these as Maven properties for ease of testing different values on the command line. Also requier a minimum of Java 11 as is the standard throughout the Jenkins project.
<project.build.outputEncoding>UTF-8</project.build.outputEncoding> | ||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in pom
and plugin-pom
, use UTF-8 everywhere by defining all three properties.
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version> | ||
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version> | ||
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version> | ||
<maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version> | ||
<maven-release-plugin.version>3.0.1</maven-release-plugin.version> | ||
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version> | ||
<maven-source-plugin.version>3.3.0</maven-source-plugin.version> | ||
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in pom
and plugin-pom
, define version numbers of Maven plugins as properties for ease of testing upgrades on the command line.
</properties> | ||
|
||
<build> | ||
<pluginManagement> | ||
<plugins> | ||
<plugin> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in pom
and plugin-pom
, define all versions in <pluginManagement>
based on properties.
<plugin> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
<version>3.12.1</version> | ||
<configuration> | ||
<release>8</release> | ||
</configuration> | ||
</plugin> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The version is now defined in <pluginManagement>
. The Java release level is now defined via the maven.compiler.release
property.
@@ -158,23 +197,22 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-project-info-reports-plugin</artifactId> | |||
<version>3.5.0</version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now managed in <pluginManagement>
.
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For consistency with other entries in this file, all of which define both <groupId>
and <artifactId>
.
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-gpg-plugin</artifactId> | ||
<version>3.1.0</version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now managed in <pluginManagement>
.
@@ -194,7 +232,6 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-source-plugin</artifactId> | |||
<version>3.3.0</version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now managed in <pluginManagement>
.
@@ -207,7 +244,6 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-javadoc-plugin</artifactId> | |||
<version>3.6.3</version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now managed in <pluginManagement>
.
Miscellaneous cleanup. Explanation in self-review.
Testing done
Tested local builds of both
archetypes
andincrementals-tools
with these changes and the-Pjenkins-release
profile.