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

[MRESOLVER-408] Make master 2.0.0-SNAPSHOT #335

Merged
merged 13 commits into from
Oct 12, 2023
Merged

[MRESOLVER-408] Make master 2.0.0-SNAPSHOT #335

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aaefaf1
Make master 2.0.0-SNAPSHOT
cstamas Oct 10, 2023
6f974f9
Up Java, drop animal sniffer, leave test scoped deps out of bytecodee…
cstamas Oct 10, 2023
0c88f1d
Limit matrix
cstamas Oct 10, 2023
981ad85
Drop undefined
cstamas Oct 10, 2023
14fae66
Fix CI jobs
cstamas Oct 11, 2023
cf21738
Add Java 21 fix for spotless
cstamas Oct 11, 2023
1fec038
PR comment
cstamas Oct 11, 2023
217b8c1
POM fixes:
cstamas Oct 12, 2023
16c8d8a
Lower to latest 11 LTS
cstamas Oct 12, 2023
6b9d179
Return JDK 11 to CI
cstamas Oct 12, 2023
9bc11e6
Merge remote-tracking branch 'origin/master' into resolver-2.x
cstamas Oct 12, 2023
05d3aa2
Add page to track migration gotchas
cstamas Oct 12, 2023
7cf2a66
Rename page source
cstamas Oct 12, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/maven-verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
ff-site-run: false
jdk-matrix: '[ "17" ]'
jdk-matrix: '[ "17", "21" ]'

2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

// Currently we can only build with JDK8+ based on the usage
michael-o marked this conversation as resolved.
Show resolved Hide resolved
// of bnd-maven-plugin.
asfMavenTlpStdBuild( 'jdks' : [ "8", "11", "17" ] )
asfMavenTlpStdBuild( 'jdks' : [ "17", "21" ] )

34 changes: 32 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@

<properties>
<javaVersion>8</javaVersion>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
<maven.compiler.release>${javaVersion}</maven.compiler.release>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<failsafe.redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</failsafe.redirectTestOutputToFile>
Expand Down Expand Up @@ -510,6 +508,38 @@
</archive>
</configuration>
</plugin>
<!-- Remove when Parent 41 used -->
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.40.0</version>
<configuration>
<java>
<!-- orders of used formatters are important MPOM-376 -->
<!-- eg. palantir override importOrder, so should be first -->
<palantirJavaFormat>
<version>2.38.0</version>
</palantirJavaFormat>
<removeUnusedImports />
<importOrder>
<file>config/maven-eclipse-importorder.txt</file>
</importOrder>
<licenseHeader>
<file>config/maven-header-plain.txt</file>
</licenseHeader>
</java>
<pom>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
<!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
</sortPom>
</pom>
<upToDateChecking>
<enabled>true</enabled>
</upToDateChecking>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down