Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade wicket to 8.9.0 and TODC bootstrap to 3.4.1 #201

Merged
merged 8 commits into from
Jul 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ NOTE: References to user stories are in the form Iteration/Story-Number.
//
.Changed
- Bumped detekt, jooq-modelator, gradle-wrapper, jasperreports, spring-cloud, jooq,
wicket, wicketstuff,
kotlin-logging, openfeign, fontawesome, equalsverifier, spek, spring-mockk,
jooq-modelator-plugin
- {url-issues}196[#196] Properly use UTF-8 property files for wicket localization
Expand Down
5 changes: 3 additions & 2 deletions buildSrc/src/main/kotlin/Lib.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ object Lib {
private const val springCloudStarterVersion = "2.2.3.RELEASE"

private const val wicketSpringBootStarterVersion = "2.1.9"
private const val wicketVersion = "8.8.0"
private const val wicketstuffVersion = "8.8.0"
private const val wicketVersion = "8.9.0"
private const val wicketstuffVersion = "8.9.0"
private const val wicketJqueryUiVersion = "8.8.0"
private const val wicketBootstrapVersion = "2.0.13"
private const val jasperReportVersion = "6.13.0"
Expand Down Expand Up @@ -188,6 +188,7 @@ class Plugin(val id: String, val version: String? = null) {
fun DependencyHandler.annotationProcessor(dependencyNotation: Dep): Dependency? = add("annotationProcessor", dependencyNotation.id)
fun DependencyHandler.api(dependencyNotation: Dep): Dependency? = add("api", dependencyNotation.id)
fun DependencyHandler.compileOnly(dependencyNotation: Dep): Dependency? = add("compileOnly", dependencyNotation.id)
fun DependencyHandler.developmentOnly(dependencyNotation: Dep): Dependency? = add("developmentOnly", dependencyNotation.id)
fun DependencyHandler.implementation(dependencyNotation: Dep): Dependency? = add("implementation", dependencyNotation.id)
fun DependencyHandler.runtimeOnly(dependencyNotation: Dep): Dependency? = add("runtimeOnly", dependencyNotation.id)

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ open class TestApplication : WicketBootSecuredWebApplication() {
override fun init() {
super.init()

/**
* Inject a customized AjaxRequestTarget implementation into the application
* that scales better with many listeners and therefore massively improves the
* build time.
*/
setAjaxRequestTargetProvider { page -> TestAjaxRequestHandler(page) }

// enable putting JavaScript into Footer Container
setHeaderResponseDecorator { r: IHeaderResponse? ->
ResourceAggregator(JavaScriptFilteredIntoFooterHeaderResponse(r, "footer-container"))
Expand Down
2 changes: 2 additions & 0 deletions public/public-web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@ dependencies {
testImplementation(project(Module.scipamatoCommon("test")))
testImplementation(Lib.lombok())
testAnnotationProcessor(Lib.lombok())

developmentOnly(Lib.springBoot("devtools"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ protected void init() {
super.init();

// enable putting JavaScript into Footer Container
setHeaderResponseDecorator(
r -> new ResourceAggregator(new JavaScriptFilteredIntoFooterHeaderResponse(r, "footer-container")));
setHeaderResponseDecorator(r -> new ResourceAggregator(new JavaScriptFilteredIntoFooterHeaderResponse(r, "footer-container")));

logSpecialConfiguration();
}
Expand Down
Loading