This is an automated email from the ASF dual-hosted git repository.
ieugen pushed a commit to branch OFBIZ-12308-split-util
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/OFBIZ-12308-split-util by this
push:
new 292274c4d3 Improved: Introduced base/util module (OFBIZ-12308)
292274c4d3 is described below
commit 292274c4d3dfdb249dccbdf59aa09d0afb5f5eba
Author: Eugen Stan <eugen.s...@netdava.com>
AuthorDate: Fri Sep 27 02:51:41 2024 +0300
Improved: Introduced base/util module (OFBIZ-12308)
* Movend lang package to util gradle project
* Moved some classes
* First road block: Debug + UtilValidation, UtilProperties
---
base/util/build.gradle | 25 ++++++++++++++++++++++
.../java/org/apache/ofbiz/base/lang/Appender.java | 0
.../org/apache/ofbiz/base/lang/ClassInvariant.java | 0
.../apache/ofbiz/base/lang/ComparableRange.java | 0
.../java/org/apache/ofbiz/base/lang/Factory.java | 0
.../java/org/apache/ofbiz/base/lang/IsEmpty.java | 0
.../main/java/org/apache/ofbiz/base/lang/JSON.java | 2 +-
.../java/org/apache/ofbiz/base/lang/Range.java | 0
.../apache/ofbiz/base/lang/SourceMonitored.java | 0
.../org/apache/ofbiz/base/lang/ThreadSafe.java | 0
.../java/org/apache/ofbiz/base/util/Assert.java | 1 -
.../apache/ofbiz/base/util/GeneralException.java | 0
.../ofbiz/base/util/GeneralRuntimeException.java | 0
.../apache/ofbiz/base/util/IndentingWriter.java | 0
.../apache/ofbiz/base/util/ReferenceCleaner.java | 0
dependencies.gradle | 1 +
settings.gradle | 2 ++
17 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/base/util/build.gradle b/base/util/build.gradle
new file mode 100644
index 0000000000..d6c7185ec1
--- /dev/null
+++ b/base/util/build.gradle
@@ -0,0 +1,25 @@
+plugins {
+ id 'java-library'
+ id 'maven-publish'
+}
+
+dependencies {
+ api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+ api 'commons-io:commons-io:2.15.1'
+
+ testImplementation 'junit:junit:4.13.1'
+}
+
+java {
+ withJavadocJar()
+ withSourcesJar()
+}
+
+publishing {
+ publications {
+ baseUtil(MavenPublication) {
+ artifactId = "base-${project.name}"
+ from components.java
+ }
+ }
+}
\ No newline at end of file
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/lang/Appender.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/Appender.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/lang/Appender.java
rename to base/util/src/main/java/org/apache/ofbiz/base/lang/Appender.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/lang/ClassInvariant.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/ClassInvariant.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/lang/ClassInvariant.java
rename to base/util/src/main/java/org/apache/ofbiz/base/lang/ClassInvariant.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
rename to
base/util/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/lang/Factory.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/Factory.java
similarity index 100%
rename from framework/base/src/main/java/org/apache/ofbiz/base/lang/Factory.java
rename to base/util/src/main/java/org/apache/ofbiz/base/lang/Factory.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/lang/IsEmpty.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/IsEmpty.java
similarity index 100%
rename from framework/base/src/main/java/org/apache/ofbiz/base/lang/IsEmpty.java
rename to base/util/src/main/java/org/apache/ofbiz/base/lang/IsEmpty.java
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/JSON.java
similarity index 100%
rename from framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java
rename to base/util/src/main/java/org/apache/ofbiz/base/lang/JSON.java
index 04e9aeb85c..fab20008a5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java
+++ b/base/util/src/main/java/org/apache/ofbiz/base/lang/JSON.java
@@ -23,9 +23,9 @@ import java.io.InputStream;
import java.io.Reader;
import org.apache.commons.io.IOUtils;
-import org.apache.ofbiz.base.util.Assert;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ofbiz.base.util.Assert;
/** A JSON object. */
@ThreadSafe
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/Range.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/Range.java
similarity index 100%
rename from framework/base/src/main/java/org/apache/ofbiz/base/lang/Range.java
rename to base/util/src/main/java/org/apache/ofbiz/base/lang/Range.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java
rename to
base/util/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/lang/ThreadSafe.java
b/base/util/src/main/java/org/apache/ofbiz/base/lang/ThreadSafe.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/lang/ThreadSafe.java
rename to base/util/src/main/java/org/apache/ofbiz/base/lang/ThreadSafe.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/Assert.java
b/base/util/src/main/java/org/apache/ofbiz/base/util/Assert.java
similarity index 99%
rename from framework/base/src/main/java/org/apache/ofbiz/base/util/Assert.java
rename to base/util/src/main/java/org/apache/ofbiz/base/util/Assert.java
index 1d406187cc..aa7f3a313e 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/Assert.java
+++ b/base/util/src/main/java/org/apache/ofbiz/base/util/Assert.java
@@ -19,7 +19,6 @@ package org.apache.ofbiz.base.util;
import java.util.Collection;
import java.util.Map;
-
import org.apache.ofbiz.base.lang.ThreadSafe;
/** Basic assertions. The static methods in this class provide a convenient way
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralException.java
b/base/util/src/main/java/org/apache/ofbiz/base/util/GeneralException.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralException.java
rename to
base/util/src/main/java/org/apache/ofbiz/base/util/GeneralException.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java
b/base/util/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java
rename to
base/util/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
b/base/util/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
rename to
base/util/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java
b/base/util/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java
similarity index 100%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java
rename to
base/util/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java
diff --git a/dependencies.gradle b/dependencies.gradle
index 38f4138979..18bd32bfdc 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,6 +17,7 @@
* under the License.
*/
dependencies {
+ implementation project (':base:util')
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
implementation 'com.google.zxing:core:3.5.3'
implementation
'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
diff --git a/settings.gradle b/settings.gradle
index 41f41b3608..8e60223453 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -63,3 +63,5 @@ activeComponents().each { File component ->
include subProject.replaceAll(fileSep, ':')
}
+
+include 'base:util'
\ No newline at end of file
