Skip to content

Commit

Permalink
solved SSH modules conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ar committed Aug 16, 2023
1 parent 3bd3977 commit 883289e
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 20 deletions.
41 changes: 22 additions & 19 deletions jpos/build.gradle
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
plugins {
id "org.gradlex.extra-java-module-info" version "1.1"
id "org.gradlex.extra-java-module-info" version "1.4.1"
id "org.owasp.dependencycheck" version "8.3.1"
// id 'checkstyle'
}

extraJavaModuleInfo {
automaticModule ('jdom2-2.0.6.jar', 'org.jdom2')
automaticModule ('javatuples-1.2.jar', 'org.javatuples')
automaticModule ('bsh-2.0b6.jar', 'bsh')
automaticModule ('commons-cli-1.5.0.jar', 'org.apache.commons.cli')
automaticModule ('je-18.3.12.jar', 'com.sleepycat.je')
automaticModule ('jdbm-1.0.jar', 'org.jdbm')
automaticModule ('HdrHistogram-2.1.12.jar', 'org.hdrhistogram.HdrHistogram')
automaticModule ('javassist-3.27.0-GA.jar', 'org.javassist.javassist')
automaticModule ('xmlunit-1.6.jar', 'xmlunit')
/*
module ("sshd-core-${sshdVersion}.jar", 'org.apache.sshd.core', "${sshdVersion}") {
failOnMissingModuleInfo.set(false)

automaticModule ('org.jdom:jdom2', 'org.jdom2')
automaticModule ('commons-cli:commons-cli', 'org.apache.commons.cli')
automaticModule ('org.javatuples:javatuples', 'org.javatuples')
automaticModule ('org.hdrhistogram:HdrHistogram', 'org.hdrhistogram.HdrHistogram')
automaticModule ('org.jline:jline', 'org.jline')
automaticModule ('org.apache-extras.beanshell:bsh', 'bsh')
automaticModule ('com.sleepycat:je', 'com.sleepycat.je')
automaticModule ('jdbm:jdbm', 'org.jdbm')

module ('org.apache.sshd:sshd-core', 'org.apache.sshd', "${sshdVersion}") {
mergeJar('org.apache.sshd:sshd-common')
mergeJar('net.i2p.crypto:eddsa')

exports('org.apache.sshd.server')
exports('org.apache.sshd.server.auth.pubkey')
exports('org.apache.sshd.server.session')
exports('org.apache.sshd.server.channel')
exports('org.apache.sshd.server.command')
exports('org.apache.sshd.server.shell')
}
module ("sshd-common-${sshdVersion}.jar", 'org.apache.sshd.common', "${sshdVersion}") {
exports('org.apache.sshd.server')

exports('org.apache.sshd.server.keyprovider')
exports('org.apache.sshd.common')
exports('org.apache.sshd.common.config.keys')
Expand All @@ -33,8 +35,9 @@ extraJavaModuleInfo {
exports('org.apache.sshd.common.util.buffer')
exports('org.apache.sshd.common.util.security')
exports('org.apache.sshd.common.config.keys.impl')
exports('net.i2p.crypto.eddsa')
exports('net.i2p.crypto.eddsa.spec')
}
*/
}

dependencies {
Expand All @@ -50,8 +53,8 @@ dependencies {
implementation libraries.yaml;
implementation libraries.jdbm
implementation libraries.sleepycat_je
// implementation libraries.sshd
// implementation libraries.eddsa
implementation libraries.sshd
implementation libraries.eddsa

testImplementation libraries.commons_lang3
testImplementation libraries.hamcrest
Expand Down
2 changes: 1 addition & 1 deletion jpos/libraries.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
sshdVersion = '2.9.2'
sshdVersion = '2.10.0'
bcVersion = '2.73.2'
libraries = [
jdom: 'org.jdom:jdom2:2.0.6.1',
Expand Down

0 comments on commit 883289e

Please sign in to comment.