Skip to content

Commit

Permalink
Merged in shibui-372 (pull request #21)
Browse files Browse the repository at this point in the history
Shibui 372

* Current MVP version and custom banner

* SHIBUI-384

* SHIBUI-384: set up buildInfo

* Nebula release plugin

* Nebula release plugin

* Test nebula release plugin

* Testing Nebula release plugin

* Change war archive name
  • Loading branch information
dima767 authored and Jonathan Johnson committed Mar 22, 2018
1 parent b1ec220 commit 0551ebf
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 9 deletions.
17 changes: 11 additions & 6 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
id 'groovy'
id 'war'
id 'org.springframework.boot' version '2.0.0.RELEASE'
id 'com.gorylenko.gradle-git-properties' version '1.4.21'
}

apply plugin: 'io.spring.dependency-management'
Expand All @@ -19,16 +20,20 @@ processResources.dependsOn(':ui:npm_run_buildProd')

//Integration of the frontend and backend into the build to have all of the UI resources available in the app's executable war
bootWar.dependsOn(':ui:npm_run_buildProd')
bootWar.baseName = 'shibui'
bootWar {
from(tasks.findByPath(':ui:npm_run_buildProd').outputs) {
manifest {
attributes("Manifest-Version" : "1.0", "Implementation-Version" : "${project.version}")
}
from(tasks.findByPath(':ui:npm_run_buildProd').outputs) {
into '/'
}
archiveName = 'shibui.war'
archiveName = "${baseName}.war"
}
bootWar.baseName = 'shibui'

springBoot {
mainClassName = 'edu.internet2.tier.shibboleth.admin.ui.ShibbolethUiApplication'
buildInfo()
}

dependencies {
Expand All @@ -48,15 +53,15 @@ dependencies {
}

// spring boot auto-config starters
['starter-web', 'starter-data-jpa', 'starter-security', 'devtools'].each {
['starter-web', 'starter-data-jpa', 'starter-security', 'starter-actuator', 'devtools'].each {
compile "org.springframework.boot:spring-boot-${it}"
}
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'

compile "org.liquibase:liquibase-core"
compile group: 'org.jadira.usertype', name: 'usertype.core', version: '6.0.1.GA'

//So it works on Java 9 without explicitly requiring to load that module (needed ny Hibernate)
//So it works on Java 9 without explicitly requiring to load that module (needed by Hibernate)
runtimeOnly 'javax.xml.bind:jaxb-api:2.3.0'

// TODO: these will likely only be runtimeOnly or test scope, unless we want to ship the libraries with the final product
Expand Down Expand Up @@ -151,4 +156,4 @@ tasks.withType(JavaExec) {

compileJava {
dependsOn generateSources
}
}
6 changes: 5 additions & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,8 @@ shibui.logout-url=/dashboard

spring.profiles.active=default

#shibui.default-password=
#shibui.default-password=

#Actuator endpoints (info)
# Un-comment to get full git details exposed like author, abbreviated SHA-1, commit message
#management.info.git.mode=full
10 changes: 10 additions & 0 deletions backend/src/main/resources/banner.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
____ _ _ _ _ _ ___
/ ___| | |__ (_) | |__ | | | | |_ _|
\___ \ | '_ \ | | | '_ \ | | | | | |
___) | | | | | | | | |_) | | |_| | | |
|____/ |_| |_| |_| |_.__/ \___/ |___|

${AnsiColor.GREEN}
Application Version: ${application.formatted-version}
Spring Boot Version: ${spring-boot.formatted-version}
${AnsiColor.DEFAULT}
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
plugins {
id 'nebula.release' version '6.0.0'
}

release {
defaultVersionStrategy = org.ajoberstar.gradle.git.release.opinion.Strategies.SNAPSHOT
}

task wrapper(type: Wrapper) {
gradleVersion = 4.6
}
6 changes: 4 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
version=1.0.0-SNAPSHOT
name=shibui
group=edu.internet2.tier.shibboleth.admin.ui
version=1.0.1-SNAPSHOT

shibboleth.version=3.4.0-SNAPSHOT
opensaml.version=3.4.0-SNAPSHOT
xmltooling.version=1.4.7-SNAPSHOT

spring-boot.version=2.0.0.RELEASE

hibernate.version=5.2.11.Final
hibernate.version=5.2.11.Final

0 comments on commit 0551ebf

Please sign in to comment.