You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2025/06/20 19:53:36 UTC
(fineract) 02/04: Revert "FINERACT-2181: Make 'staticWeaveJPA' gradle task cacheable"
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit d46ab4e73e1c7ce302bb2c406aac573bfddac6a6
Author: Arnold Galovics <ga...@gmail.com>
AuthorDate: Fri Jun 20 13:47:48 2025 +0200
Revert "FINERACT-2181: Make 'staticWeaveJPA' gradle task cacheable"
This reverts commit dd2c29fb91cfb5e93b8a705ff23dbcd303a6af9c.
---
.../fineract/gradle/StaticWeaveJpaTask.groovy | 66 ----------------------
fineract-accounting/build.gradle | 22 ++++++--
fineract-branch/build.gradle | 24 +++++---
fineract-charge/build.gradle | 24 +++++---
fineract-command/build.gradle | 22 ++++++--
fineract-core/build.gradle | 22 ++++++--
fineract-document/build.gradle | 22 ++++++--
fineract-investor/build.gradle | 22 ++++++--
fineract-loan/build.gradle | 24 +++++---
fineract-progressive-loan/build.gradle | 22 ++++++--
fineract-provider/build.gradle | 23 ++++++--
fineract-rates/build.gradle | 24 +++++---
fineract-report/build.gradle | 24 +++++---
fineract-savings/build.gradle | 24 +++++---
fineract-tax/build.gradle | 24 +++++---
15 files changed, 238 insertions(+), 151 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/fineract/gradle/StaticWeaveJpaTask.groovy b/buildSrc/src/main/groovy/org/apache/fineract/gradle/StaticWeaveJpaTask.groovy
deleted file mode 100644
index 5b1bf2162a..0000000000
--- a/buildSrc/src/main/groovy/org/apache/fineract/gradle/StaticWeaveJpaTask.groovy
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.gradle
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.CacheableTask
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
-import org.gradle.api.tasks.TaskAction
-
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-
-@CacheableTask
-abstract class StaticWeaveJpaTask extends DefaultTask {
-
- @InputDirectory
- @PathSensitive(PathSensitivity.RELATIVE)
- final DirectoryProperty inputClasses = project.objects.directoryProperty()
-
- @InputFile
- @PathSensitive(PathSensitivity.RELATIVE)
- final RegularFileProperty persistenceXml = project.objects.fileProperty()
-
- @OutputDirectory
- final DirectoryProperty outputDir = project.objects.directoryProperty()
-
- @TaskAction
- void weave() {
- File weavingRoot = new File(temporaryDir, "static-weaving")
- File metaInf = new File(weavingRoot, "META-INF")
- metaInf.mkdirs()
- Files.copy(persistenceXml.get().asFile.toPath(), new File(metaInf, "persistence.xml").toPath(), StandardCopyOption.REPLACE_EXISTING)
-
- project.javaexec {
- mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
- classpath = project.sourceSets.main.runtimeClasspath
- args = [
- "-persistenceinfo", weavingRoot.absolutePath,
- inputClasses.get().asFile.absolutePath,
- outputDir.get().asFile.absolutePath
- ]
- }
- }
-}
diff --git a/fineract-accounting/build.gradle b/fineract-accounting/build.gradle
index 6140df2787..eb91427a71 100644
--- a/fineract-accounting/build.gradle
+++ b/fineract-accounting/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Accounting'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/accounting/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/accounting/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
tasks.register("weavedJar", Jar) {
diff --git a/fineract-branch/build.gradle b/fineract-branch/build.gradle
index ae2f3d6cc5..b3c2c6ff37 100644
--- a/fineract-branch/build.gradle
+++ b/fineract-branch/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Branch'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/branch/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/branch/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
@@ -60,8 +72,6 @@ compileJava {
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-
-import org.apache.fineract.gradle.StaticWeaveJpaTask
import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/fineract-charge/build.gradle b/fineract-charge/build.gradle
index a562e7ea49..5128875f80 100644
--- a/fineract-charge/build.gradle
+++ b/fineract-charge/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Charge'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/charge/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/charge/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
@@ -60,8 +72,6 @@ compileJava {
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-
-import org.apache.fineract.gradle.StaticWeaveJpaTask
import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/fineract-command/build.gradle b/fineract-command/build.gradle
index e6ea64f40d..d585dce852 100644
--- a/fineract-command/build.gradle
+++ b/fineract-command/build.gradle
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Command'
apply plugin: 'java'
@@ -82,12 +81,25 @@ jmh {
benchmarkMode = ['thrpt'] // Default benchmark mode
}
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/command/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/command/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
tasks.register("weavedJar", Jar) {
diff --git a/fineract-core/build.gradle b/fineract-core/build.gradle
index 91b22a029c..19281887da 100644
--- a/fineract-core/build.gradle
+++ b/fineract-core/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Core'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/core/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/core/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
diff --git a/fineract-document/build.gradle b/fineract-document/build.gradle
index e289d08ecf..dd1e3bf65e 100644
--- a/fineract-document/build.gradle
+++ b/fineract-document/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Document'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/document/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/document/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
diff --git a/fineract-investor/build.gradle b/fineract-investor/build.gradle
index f61bef0415..ce13e7b06e 100644
--- a/fineract-investor/build.gradle
+++ b/fineract-investor/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Investor'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/investor/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/investor/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
diff --git a/fineract-loan/build.gradle b/fineract-loan/build.gradle
index 1b0aabffbc..3da2ce80ed 100644
--- a/fineract-loan/build.gradle
+++ b/fineract-loan/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Loan'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/loan/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/loan/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
@@ -58,8 +70,6 @@ compileJava {
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-
-import org.apache.fineract.gradle.StaticWeaveJpaTask
import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/fineract-progressive-loan/build.gradle b/fineract-progressive-loan/build.gradle
index bc72281f0d..4581893421 100644
--- a/fineract-progressive-loan/build.gradle
+++ b/fineract-progressive-loan/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Progressive Loan'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/progressive-loan/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/progressive-loan/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index f9653e4ef8..51d79f16a7 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Provider'
apply plugin: 'org.zeroturnaround.gradle.jrebel'
@@ -31,12 +30,25 @@ apply plugin: 'se.thinkcode.cucumber-runner'
check.dependsOn('cucumber')
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/provider/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/provider/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
tasks.register("weavedJar", Jar) {
@@ -474,7 +486,6 @@ javadoc {
tasks.register('devRun', org.springframework.boot.gradle.tasks.run.BootRun) {
description = 'Runs the application quickly for development by skipping quality checks'
group = 'Application'
- dependsOn staticWeaveJpa
// Configure the build to skip quality checks
gradle.taskGraph.whenReady { graph ->
diff --git a/fineract-rates/build.gradle b/fineract-rates/build.gradle
index b41971bc0c..c6cbed7ef2 100644
--- a/fineract-rates/build.gradle
+++ b/fineract-rates/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Rates'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/rates/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/rates/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
@@ -60,8 +72,6 @@ compileJava {
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-
-import org.apache.fineract.gradle.StaticWeaveJpaTask
import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/fineract-report/build.gradle b/fineract-report/build.gradle
index 8272b43a22..7e1d515672 100644
--- a/fineract-report/build.gradle
+++ b/fineract-report/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Report'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/report/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/report/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
@@ -60,8 +72,6 @@ compileJava {
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-
-import org.apache.fineract.gradle.StaticWeaveJpaTask
import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/fineract-savings/build.gradle b/fineract-savings/build.gradle
index 7c074e7f7e..e915417d4f 100644
--- a/fineract-savings/build.gradle
+++ b/fineract-savings/build.gradle
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Savings'
apply plugin: 'java'
@@ -26,12 +25,25 @@ tasks.named('classes') {
finalizedBy staticWeaveJpa
}
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/savings/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/savings/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
tasks.register("weavedJar", Jar) {
@@ -62,8 +74,6 @@ compileJava {
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-
-import org.apache.fineract.gradle.StaticWeaveJpaTask
import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/fineract-tax/build.gradle b/fineract-tax/build.gradle
index c0b2e616a2..170bb0c380 100644
--- a/fineract-tax/build.gradle
+++ b/fineract-tax/build.gradle
@@ -16,18 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.fineract.gradle.StaticWeaveJpaTask
description = 'Fineract Taxes'
apply plugin: 'java'
apply plugin: 'eclipse'
-tasks.register("staticWeaveJpa", StaticWeaveJpaTask) {
+tasks.register('staticWeaveJpa', JavaExec) {
dependsOn classes
- inputClasses.set(layout.buildDirectory.dir("classes/java/main").get())
- persistenceXml.set(file("src/main/resources/jpa/static-weaving/module/tax/persistence.xml"))
- outputDir.set(layout.buildDirectory.dir("weaved-classes").get())
+ def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+ def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+ def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+ copy {
+ from file("src/main/resources/jpa/static-weaving/module/tax/persistence.xml")
+ into "${persistenceInfo}/META-INF/"
+ }
+
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = sourceSets.main.runtimeClasspath
+
+ args = [
+ '-persistenceinfo', persistenceInfo,
+ classesDir.absolutePath,
+ outputDir.absolutePath
+ ]
}
@@ -60,8 +72,6 @@ compileJava {
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-
-import org.apache.fineract.gradle.StaticWeaveJpaTask
import org.apache.tools.ant.filters.ReplaceTokens