Merge branch 'devel' into #20602-load-controls-for-extra-pages

dbeaver · Jan 31, 2024 · 9bf851f · 9bf851f
2 parents 782a9e9 + cecb96a
commit 9bf851f
Show file tree

Hide file tree

Showing 489 changed files with 3,089 additions and 10,583 deletions.
diff --git a/build.cmd b/build.cmd
@@ -0,0 +1,5 @@
+set MAVEN_OPTS=-Xmx2048m
+IF NOT EXIST ..\dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git ..\dbeaver-common
+cd product/aggregate
+call mvn clean install -T 1C
+cd ../..
diff --git a/build.sh b/build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+[ ! -d ../dbeaver-common ] && git clone https://github.com/dbeaver/dbeaver-common.git ../dbeaver-common
+
+cd product/aggregate
+mvn clean install -T 1C
+cd ../..
+
diff --git a/bundles/org.jkiss.utils/META-INF/MANIFEST.MF b/bundles/org.jkiss.utils/META-INF/MANIFEST.MF
diff --git a/bundles/org.jkiss.utils/build.properties b/bundles/org.jkiss.utils/build.properties
diff --git a/bundles/org.jkiss.utils/src/org/jkiss/code/NotNull.java b/bundles/org.jkiss.utils/src/org/jkiss/code/NotNull.java
diff --git a/bundles/org.jkiss.utils/src/org/jkiss/utils/AlphanumericComparator.java b/bundles/org.jkiss.utils/src/org/jkiss/utils/AlphanumericComparator.java
diff --git a/bundles/org.jkiss.utils/src/org/jkiss/utils/ArgumentTokenizer.java b/bundles/org.jkiss.utils/src/org/jkiss/utils/ArgumentTokenizer.java