Skip to content

Commit f015573

Browse files
author
Dave Syer
committed
Update for recent changes in mvn build
1 parent 4df621b commit f015573

File tree

2 files changed

+9
-29
lines changed

2 files changed

+9
-29
lines changed

build.gradle

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
1-
buildscript {
2-
dependencies {
3-
classpath 'ro.isdc.wro4j.gradle:wro4j-gradle-plugin:1.8.0.Beta4'
4-
}
5-
}
6-
71
plugins {
8-
id 'org.springframework.boot' version '2.4.5'
2+
id 'org.springframework.boot' version '2.6.1'
93
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
104
id 'java'
115
}
126

137
apply plugin: 'java'
14-
apply plugin: 'wro4j'
158

169
group = 'org.springframework.samples'
17-
version = '2.4.5'
10+
version = '2.6.0'
1811
sourceCompatibility = '11'
1912

2013
repositories {
2114
mavenCentral()
2215
}
2316

24-
ext.webjarsJqueryVersion = "2.2.4"
25-
ext.webjarsJqueryUiVersion = "1.11.4"
26-
ext.webjarsBootstrapVersion = "3.3.6"
17+
ext.webjarsFontawesomeVersion = "4.7.0"
18+
ext.webjarsBootstrapVersion = "5.1.3"
2719

2820
dependencies {
2921
implementation 'org.springframework.boot:spring-boot-starter-cache'
@@ -32,29 +24,17 @@ dependencies {
3224
implementation 'org.springframework.boot:spring-boot-starter-web'
3325
implementation 'org.springframework.boot:spring-boot-starter-validation'
3426
implementation 'javax.cache:cache-api'
35-
webjarsRuntime 'org.webjars:webjars-locator-core'
36-
webjarsRuntime "org.webjars:jquery:${webjarsJqueryVersion}"
37-
webjarsRuntime "org.webjars:jquery-ui:${webjarsJqueryUiVersion}"
38-
webjarsRuntime "org.webjars:bootstrap:${webjarsBootstrapVersion}"
39-
webjarsRuntime "org.webjars:bootstrap:${webjarsBootstrapVersion}"
27+
runtimeOnly 'org.webjars:webjars-locator-core'
28+
runtimeOnly "org.webjars.npm:bootstrap:${webjarsBootstrapVersion}"
29+
runtimeOnly "org.webjars.npm:font-awesome:${webjarsFontawesomeVersion}"
4030
runtimeOnly 'org.ehcache:ehcache'
4131
runtimeOnly 'com.h2database:h2'
4232
runtimeOnly 'mysql:mysql-connector-java'
33+
runtimeOnly 'org.postgresql:postgresql'
4334
developmentOnly 'org.springframework.boot:spring-boot-devtools'
4435
testImplementation 'org.springframework.boot:spring-boot-starter-test'
4536
}
4637

4738
test {
4839
useJUnitPlatform()
4940
}
50-
51-
webResources {
52-
srcMainDir = layout.projectDirectory.dir('src/main').asFile
53-
dstStaticFolder = 'static/resources/css'
54-
bundle ('petclinic') {
55-
css 'webjars/bootstrap/3.3.6/less/bootstrap.less'
56-
css 'less/petclinic.less'
57-
preProcessor 'lessCssImport'
58-
postProcessor 'less4j'
59-
}
60-
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)