Skip to content

Commit

Permalink
Merge pull request #14 from mkdecisiondev/dev
Browse files Browse the repository at this point in the history
Updated projects to Java 11 (#13)
  • Loading branch information
aabiabdallah authored Jan 26, 2023
2 parents 742b516 + 0e1d7c1 commit 7b216c4
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ apply plugin: 'groovy'
def moquiDir = file(projectDir.absolutePath + '/../../..')
def frameworkDir = file(moquiDir.absolutePath + '/framework')
def jarBaseName = 'moqui-pac4j-authentication'
sourceCompatibility = '1.8'

repositories {
flatDir name: 'localLib', dirs: frameworkDir.absolutePath + '/lib'
mavenCentral()
}

dependencies {
compile project(':framework')
implementation project(':framework')

// use more recent version of bcprov-jdk15on to match what is used in moqui-sftp by sshj to avoid duplicate jars (org.pac4j:pac4j-jwt:3.0.2 uses org.bouncycastle:bcprov-jdk15on:1.59)
compile 'org.bouncycastle:bcprov-jdk15on:1.70'
implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
// use more recent version of commons-collections4 to match version used elsewhere
compile 'org.apache.commons:commons-collections4:4.4'
implementation 'org.apache.commons:commons-collections4:4.4'

// pac4j
compile 'org.pac4j:pac4j-oidc:3.0.2'
compile 'org.pac4j:pac4j-jwt:3.0.2'
// compile 'org.pac4j:jee-pac4j:5.0.0'
implementation 'org.pac4j:pac4j-oidc:3.0.2'
implementation 'org.pac4j:pac4j-jwt:3.0.2'
// implementation 'org.pac4j:jee-pac4j:5.0.0'
}

check.dependsOn.clear()
Expand All @@ -34,7 +33,7 @@ jar {
baseName = jarBaseName
}
task copyDependencies { doLast {
copy { from (configurations.runtime - project(':framework').configurations.runtime - project(':framework').jar.archivePath)
copy { from (configurations.runtimeClasspath - project(':framework').configurations.runtimeClasspath - project(':framework').jar.archivePath)
into file(projectDir.absolutePath + '/lib') }
} }
copyDependencies.dependsOn cleanLib
Expand Down

0 comments on commit 7b216c4

Please sign in to comment.