Repository navigation
LDEV-3189 use the upstream argon2-jvm Maven artifact - #4
Merged
Merged
Conversation
…dled OSGi jars Reference de.mkammerer:argon2-jvm:2.12 (with argon2-jvm-nolibs and JNA as transitive dependencies) by Maven coordinates instead of the rebundled org.lucee.argon2 / org.lucee.argon2-jvm-nolibs / com.sun.jna OSGi bundles. - new source/java/pom.xml builds org.lucee:argon2-functions - the .lex ships the artifacts in a maven/ folder, the FLD uses maven= - remove the bundled jars and the OSGi MANIFEST.MF (Require-Bundle) - build, CI and the Maven publishing follow extension-compress - needs Lucee 7.1.0.204 or newer (luceeCoreVersion)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
LDEV-3189 use upstream argon2 osgi bundle
Lucee is moving to Maven coordinates and leaving OSGi, so instead of the upstream OSGi manifest (what the ticket originally asked for) this references the upstream artifact by Maven coordinates, like extension-compress does since LDEV-6719.
What changes
de.mkammerer:argon2-jvm:2.12(latest upstream release) replaces the rebundledorg.lucee.argon2,org.lucee.argon2-jvm-nolibsandcom.sun.jna5.8.0 jars.argon2-jvm-nolibsand JNA (5.16.0) come in transitively.source/java/pom.xmlbuildsorg.lucee:argon2-functions, the.lexships it plus all runtime dependencies in amaven/folder, andfunction.fldusesmaven="..."instead ofbundle-name/bundle-version.source/java/libs/*.jarand the OSGiMANIFEST.MF(Require-Bundle).build.xml, rootpom.xml,copy-parent-poms.shand.github/workflows/main.ymlfollow extension-compress (full and lite.lex, Maven Central publishing, test matrix limited to supported cores).1.1.0.0-SNAPSHOT,luceeCoreVersionis7.1.0.204(the first final withmaven=for functions). Older Lucee versions stay on the previous 1.0.0.x release.Tested
mvn -f pom.xml clean install -Dgoal=installbuilds, the.lexhas the upstream jars undermaven/de/mkammerer/...andmaven/net/java/dev/jna/....lexinstalled,GenerateArgon2HashandArgon2CheckHashwork for the default, argon2i, argon2d and argon2id (native library loads through JNA)tests/functions/GenerateArgon2Hash.cfcandArgon2CheckHash.cfcrun unchanged in CI