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

Upgrade parent 63 and Java 1.8 #461

Merged
merged 7 commits into from Jun 2, 2021
Merged

Upgrade parent 63 and Java 1.8 #461

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f199317
parent 63 and java 1.8
olamy Jun 2, 2021
fff4373
fix javadoc:
olamy Jun 2, 2021
e025e1b
Update pom.xml
olamy Jun 2, 2021
08a72e3
cleanup not anymore needed plugin configuration because of parent upg…
olamy Jun 2, 2021
3375d5a
no need to run with some many jdks
olamy Jun 2, 2021
d694a7f
Update .github/workflows/maven.yml
olamy Jun 2, 2021
86de1c2
Update .github/workflows/maven.yml
olamy Jun 2, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
java: [8, 11, 14, 15, 16, 17-ea]
java: [8, 11]
olamy marked this conversation as resolved.
Show resolved Hide resolved
jdk: [adopt, zulu]
olamy marked this conversation as resolved.
Show resolved Hide resolved
fail-fast: false

Expand Down
28 changes: 5 additions & 23 deletions pom.xml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.codehaus.mojo</groupId>
<artifactId>mojo-parent</artifactId>
<version>50</version>
<version>63</version>
</parent>

<artifactId>versions-maven-plugin</artifactId>
Expand Down Expand Up @@ -107,7 +107,8 @@
</issueManagement>

<properties>
<mojo.java.target>1.7</mojo.java.target>
<mojo.java.target>1.8</mojo.java.target>
olamy marked this conversation as resolved.
Show resolved Hide resolved
<maven.compiler.source>${mojo.java.target}</maven.compiler.source>

<mavenVersion>2.2.1</mavenVersion>
<wagonVersion>3.4.0</wagonVersion>
Expand Down Expand Up @@ -268,29 +269,12 @@
<artifactId>modello-maven-plugin</artifactId>
<version>1.11</version>
</plugin>
<!-- TODO remove when upgrading parent to 60 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.2.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
Expand All @@ -308,15 +292,15 @@
<artifactId>animal-sniffer-maven-plugin</artifactId>
<executions>
<execution>
<id>check-java17</id>
<id>check-java18</id>
<phase>test</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java17</artifactId>
<artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
Expand Down Expand Up @@ -390,7 +374,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.2</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down Expand Up @@ -429,7 +412,6 @@

<reporting>
<plugins>

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/mojo/versions/api/UpdateScope.java
View file
Open in desktop
Expand Up @@ -405,7 +405,7 @@ public final Class getDeclaringClass()
* @return the enum constant of the specified enum type with the specified name
* @throws IllegalArgumentException if the specified enum type has no constant with the specified name, or the
* specified class object does not represent an enum type
* @throws NullPointerException if <tt>enumType</tt> or <tt>name</tt> is null
* @throws NullPointerException if <code>name</code> is null
*/
public static UpdateScope valueOf( String name )
{
Expand Down