Commit 3af8268b authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

16: Finalize initial v2 release version

Task-Url: #16
parent 30a3ab2a
Pipeline #17841 passed with stages
in 5 minutes and 34 seconds
plugins { plugins {
id 'java-library' id 'io.spring.dependency-management' version "1.0.10.RELEASE"
id 'io.spring.dependency-management' version "1.0.8.RELEASE" id 'org.springframework.boot' version "2.3.5.RELEASE" apply false
} }
allprojects { allprojects {
...@@ -18,9 +18,9 @@ allprojects { ...@@ -18,9 +18,9 @@ allprojects {
springPac4jVersion = "5.1.0" springPac4jVersion = "5.1.0"
webmvcPac4jVersion = "4.0.1" webmvcPac4jVersion = "4.0.1"
pac4jVersion = "4.1.0" pac4jVersion = "4.1.0"
lombokVersion = "1.18.14" /*lombokVersion = "1.18.14"
servletApiVersion = "4.0.1" servletApiVersion = "4.0.1"
jspApiVersion = "2.3.3" jspApiVersion = "2.3.3"*/
librarySets = [ librarySets = [
commonTest: [ commonTest: [
...@@ -41,6 +41,13 @@ subprojects { ...@@ -41,6 +41,13 @@ subprojects {
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'io.spring.dependency-management'
dependencyManagement {
imports {
mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
}
}
publishing { publishing {
publications { publications {
......
...@@ -11,10 +11,10 @@ dependencies { ...@@ -11,10 +11,10 @@ dependencies {
api "org.pac4j:pac4j-saml:$pac4jVersion" api "org.pac4j:pac4j-saml:$pac4jVersion"
api "org.pac4j:pac4j-http:$pac4jVersion" api "org.pac4j:pac4j-http:$pac4jVersion"
implementation "org.springframework:spring-webmvc" implementation "org.springframework:spring-webmvc"
implementation "javax.servlet:javax.servlet-api:$servletApiVersion" implementation "javax.servlet:javax.servlet-api"
compileOnly "org.projectlombok:lombok:$lombokVersion" compileOnly "org.projectlombok:lombok"
annotationProcessor "org.projectlombok:lombok:$lombokVersion" annotationProcessor "org.projectlombok:lombok"
testImplementation librarySets.commonTest testImplementation librarySets.commonTest
} }
...@@ -27,8 +27,14 @@ task customFatJar(type: Jar) { ...@@ -27,8 +27,14 @@ task customFatJar(type: Jar) {
manifest { manifest {
attributes 'Main-Class': ' eu.dariah.de.dariahsp.BCryptPasswordCreator' attributes 'Main-Class': ' eu.dariah.de.dariahsp.BCryptPasswordCreator'
} }
archiveBaseName = 'dariahsp-core-fatjar' archiveClassifier = 'fatjar'
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } dependsOn configurations.runtimeClasspath
from {
configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) }
}
exclude 'META-INF/*.RSA'
exclude 'META-INF/*.SF'
exclude 'META-INF/*.DSA'
with jar with jar
} }
......
...@@ -10,9 +10,6 @@ public class BCryptPasswordCreator { ...@@ -10,9 +10,6 @@ public class BCryptPasswordCreator {
Scanner scanner = new Scanner (System.in); Scanner scanner = new Scanner (System.in);
System.out.println("CLI Tool to create BCrypt passwords to be used with a dariahsp derived application"); System.out.println("CLI Tool to create BCrypt passwords to be used with a dariahsp derived application");
System.out.println("------------------------------------------------------"); System.out.println("------------------------------------------------------");
System.out.println("Please make sure to provide BCrypt initialization arguments exactly \n as they are configured in the security-context-common.xml");
System.out.println("If you have not changed the default initialization of the BCryptPasswordEncoder \n (and you dont have to), choose the default values for rounds:");
System.out.println("------------------------------------------------------");
System.out.println("Please choose rounds [4-31; default: 10]"); System.out.println("Please choose rounds [4-31; default: 10]");
......
plugins { apply plugin: 'org.springframework.boot'
id 'war'
id 'org.springframework.boot' version "2.3.4.RELEASE"
id 'io.spring.dependency-management'
}
dependencies { dependencies {
implementation project(':dariahsp-core') implementation project(':dariahsp-core')
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.apache.tomcat.embed:tomcat-embed-jasper' implementation 'org.apache.tomcat.embed:tomcat-embed-jasper'
implementation "javax.servlet:jstl" implementation "javax.servlet:jstl"
providedCompile "javax.servlet:javax.servlet-api"
providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:$jspApiVersion" //providedCompile "javax.servlet:javax.servlet-api"
//providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:$jspApiVersion"
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools' developmentOnly 'org.springframework.boot:spring-boot-devtools'
annotationProcessor 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok'
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' //providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation librarySets.commonTest testImplementation librarySets.commonTest
testImplementation('org.springframework.boot:spring-boot-starter-test') { testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
} }
} }
bootJar { bootJar {
enabled = true enabled = true
mainClassName = 'eu.dariah.de.dariahsp.sample.SampleApplication'
} }
publishing { publishing {
...@@ -36,4 +34,4 @@ publishing { ...@@ -36,4 +34,4 @@ publishing {
artifact(javadocJar) {} artifact(javadocJar) {}
} }
} }
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment