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.

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

PHOENIX-7140 Update Apache Parent and Maven Plugin Versions in Core #1760

Closed
wants to merge 2 commits into from

Conversation

NihalJain
Copy link
Contributor

  • Apache Parent pom updated to v30
  • Versions for the following plugins removed as they are derived from parent pom:
    • maven-enforcer-plugin
    • maven-shade-plugin
    • maven-project-info-reports-plugin
  • Unused property surefire.version has been removed
  • Properties findbugs-annotations.version, maven-owasp-plugin.version, and os.maven.version have been relocated
  • Versions for these plugins are now managed via properties:
    • jasmine-maven-plugin
    • lifecycle-mapping
    • maven-bundle-plugin
    • exec-maven-plugin
    • maven-checkstyle-plugin
  • Upgraded versions for these plugins:
    • maven-eclipse-plugin to 2.10
    • maven-build-helper-plugin to 3.5.0
    • restrict-imports.enforcer to 2.4.0
    • spotbugs-maven-plugin to 4.8.1.0
    • spotbugs to 4.8.1
    • jacoco-maven-plugin to 0.8.11
    • sonar-maven-plugin to 3.10.0.2594
    • maven-owasp-plugin to 8.4.0
    • os.maven to 1.7.1
    • maven-bundle-plugin to 5.1.9
    • exec-maven-plugin to 3.1.1
    • maven-checkstyle-plugin to 3.3.0
  • Updated checker.xml based on updated checkstyle, refer Change LineLength Check parent from TreeWalker to Checker checkstyle/checkstyle#2116
  • Switched to as the old declaration variant no longer supported, refer https://github.com/skuzzle/restrict-imports-enforcer-rule/releases/tag/v2.0.0
  • Temporarily retained old version of apache parent for maven-dependency-plugin as upgrading is causing build to fail

pom.xml Show resolved Hide resolved
@NihalJain
Copy link
Contributor Author

NihalJain commented Dec 13, 2023

Ran following locally and verified build is SUCCESS:

  • mvn clean install -DskipTests
  • mvn clean compile test-compile site -Dspotbugs.site
  • mvn checkstyle:checkstyle
  • mvn pmd:pmd
  • mvn exec:exec -q -N -Dexec.executable="echo" -Dexec.args='${hbase.profile.list}'

Also could not figure out how to pretty format the message in patch mode. Tried to commit with a message stored in a file having \n at end: git commit -F message.txt . Still no rescue. :(

CC: @stoty

@stoty
Copy link
Contributor

stoty commented Dec 13, 2023

You can just use git commit --amend, and edit the patch in your favourite unix-ish command line editor.
Maybe your editor uses CR instead of NL ?

@stoty stoty closed this Dec 13, 2023
@stoty stoty reopened this Dec 13, 2023
@stoty
Copy link
Contributor

stoty commented Dec 13, 2023

Sorry, misclicked.

@NihalJain NihalJain force-pushed the PHOENIX-7140 branch 2 times, most recently from fb07e9e to 8df68fa Compare December 13, 2023 20:04
- Apache Parent pom updated to v30
- Versions for the following plugins removed as they are derived from parent pom:
  - maven-enforcer-plugin
  - maven-shade-plugin
  - maven-project-info-reports-plugin
- Unused property surefire.version has been removed
- Properties findbugs-annotations.version, maven-owasp-plugin.version, and os.maven.version have been relocated
- Versions for these plugins are now managed via properties:
  - jasmine-maven-plugin
  - lifecycle-mapping
  - maven-bundle-plugin
  - exec-maven-plugin
  - maven-checkstyle-plugin
- Upgraded versions for these plugins:
  - maven-eclipse-plugin to 2.10
  - maven-build-helper-plugin to 3.5.0
  - restrict-imports.enforcer to 2.4.0
  - spotbugs-maven-plugin to 4.8.1.0
  - spotbugs to 4.8.1
  - jacoco-maven-plugin to 0.8.11
  - sonar-maven-plugin to 3.10.0.2594
  - maven-owasp-plugin to 8.4.0
  - os.maven to 1.7.1
  - maven-bundle-plugin to 5.1.9
  - exec-maven-plugin to 3.1.1
  - maven-checkstyle-plugin to 3.3.0
- Updated checker.xml based on updated checkstyle, refer checkstyle/checkstyle#2116
- Updated DTD version to be inline with phoenix-omid
- Switched to <RestrictImports> as the old declaration variant no longer supported, refer https://github.com/skuzzle/restrict-imports-enforcer-rule/releases/tag/v2.0.0
- Temporarily retained old version of apache parent for maven-dependency-plugin as upgrading is causing build to fail
@NihalJain
Copy link
Contributor Author

You can just use git commit --amend, and edit the patch in your favourite unix-ish command line editor. Maybe your editor uses CR instead of NL ?

Phew! Fixed the message:
https://github.com/apache/phoenix/commit/47bf1371abe9ab43d200c1e436bdfdc9dae34030.patch Thank you.

Force pushed: updated DTD version to be same as omid, not sure how to validate as mvn checkstyle:checkstyle runs seemlessly locally without the change also, so waiting for build result.

pom.xml Show resolved Hide resolved
@stoty stoty closed this Dec 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants