9867396e9 gradle: плагины планирования ликвидности и маркетинга требуют *.html в качестве исходников.
e21feaa61 Gradle игры...
41e2d26e7 WIP: gradle...
e31db0a87 WIP: gradle...
200b50dc0 WIP: gradle...
9867396e9
gradle: плагины планирования ликвидности и маркетинга требуют *.html в качестве исходников.9867396e942e8b355eec11f1c4094c7db1993497
diff --git a/plugins/org.projectforge.plugins.marketing/build.gradle.kts b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
index 7027ee811..d6ee8eb94 100644
--- a/plugins/org.projectforge.plugins.marketing/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
@@ -18,4 +18,11 @@ dependencies {
testImplementation(libs.jakarta.servlet.api)
}
+tasks.withType<ProcessResources> {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+ from("src/main/java") {
+ include( "**/*.html") // Страницы Wicket.
+ }
+}
+
description = "org.projectforge.plugins.marketing" e21feaa61
Gradle игры...e21feaa61e66e09b312b8dfd9fc870aa0a820cf9
diff --git a/plugins/org.projectforge.plugins.marketing/build.gradle.kts b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
index 67db54281..7027ee811 100644
--- a/plugins/org.projectforge.plugins.marketing/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
@@ -1,5 +1,14 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
plugins {
id("buildlogic.pf-module-conventions")
+ id("org.jetbrains.kotlin.jvm")
+}
+
+tasks.withType<KotlinCompile> {
+ compilerOptions {
+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+ }
}
dependencies { 41e2d26e7
WIP: gradle...41e2d26e73a3c07779f45e21349f0586d840f4e7
diff --git a/plugins/org.projectforge.plugins.marketing/build.gradle.kts b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
index 8d90dd39f..67db54281 100644
--- a/plugins/org.projectforge.plugins.marketing/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
@@ -1,9 +1,5 @@
-/*
- * Этот файл был сгенерирован задачей 'init' Gradle.
- */
-
plugins {
- id("java-library")
+ id("buildlogic.pf-module-conventions")
}
dependencies {
@@ -11,7 +7,6 @@ dependencies {
api(project(":projectforge-rest"))
testImplementation(project(":projectforge-business"))
testImplementation(libs.jakarta.servlet.api)
- testImplementation(libs.org.postgresql.postgresql)
}
description = "org.projectforge.plugins.marketing" e31db0a87
WIP: gradle...e31db0a876e33a067c92924d6714b59368b05a1d
diff --git a/plugins/org.projectforge.plugins.marketing/build.gradle.kts b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
index 2c6c3fa03..8d90dd39f 100644
--- a/plugins/org.projectforge.plugins.marketing/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
@@ -3,7 +3,7 @@
*/
plugins {
- id("buildlogic.java-conventions")
+ id("java-library")
}
dependencies { 200b50dc0
WIP: gradle...200b50dc0ae9c563d06af8716471a0264f78ca9d
diff --git a/plugins/org.projectforge.plugins.marketing/build.gradle.kts b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
index 3ba8a88a4..2c6c3fa03 100644
--- a/plugins/org.projectforge.plugins.marketing/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.marketing/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
api(project(":projectforge-wicket"))
api(project(":projectforge-rest"))
testImplementation(project(":projectforge-business"))
- testImplementation(libs.jakarta.servlet.jakarta.servlet.api)
+ testImplementation(libs.jakarta.servlet.api)
testImplementation(libs.org.postgresql.postgresql)
}