Dbeaver/pro#9454 change utils to standard mvn project

modules/org.jkiss.utils/build.properties

@@ -1,3 +1,3 @@
-source.. = src/
+source.. = src/main/java
 output.. = target/classes/
 bin.includes = META-INF/,.

modules/org.jkiss.utils/pom.xml

@@ -21,6 +21,40 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+
+        <!-- Tests -->
+        <!-- JUnit -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Mockito -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <licenses>
@@ -48,7 +82,24 @@
     </scm>
 
     <build>
-        <sourceDirectory>${project.basedir}/src/</sourceDirectory>
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
 </project>

modules/org.jkiss.utils/src/org/jkiss/api/CompositeObjectId.java → modules/org.jkiss.utils/src/main/java/org/jkiss/api/CompositeObjectId.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/org.jkiss.utils/src/org/jkiss/api/FileSystemPathProvider.java → modules/org.jkiss.utils/src/main/java/org/jkiss/api/FileSystemPathProvider.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/org.jkiss.utils/src/org/jkiss/api/ObjectWithContextParameters.java → modules/org.jkiss.utils/src/main/java/org/jkiss/api/ObjectWithContextParameters.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/org.jkiss.utils/src/org/jkiss/api/verification/FileSystemAccessVerifyer.java → modules/org.jkiss.utils/src/main/java/org/jkiss/api/verification/FileSystemAccessVerifyer.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/org.jkiss.utils/src/org/jkiss/api/verification/ObjectWithVerification.java → modules/org.jkiss.utils/src/main/java/org/jkiss/api/verification/ObjectWithVerification.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/org.jkiss.utils/src/org/jkiss/utils/AlphanumericComparator.java → modules/org.jkiss.utils/src/main/java/org/jkiss/utils/AlphanumericComparator.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public int compare(CharSequence o1, CharSequence o2) {
         return compare(o1, o2, false);
     }
 
-    public int compareIgnoreCase(@NotNull CharSequence o1,@NotNull CharSequence o2) {
+    public int compareIgnoreCase(@NotNull CharSequence o1, @NotNull CharSequence o2) {
         return compare(o1, o2, true);
     }
 
@@ -80,7 +80,7 @@ private static int compare(@NotNull CharBuffer b1, @NotNull CharBuffer b2, boole
         return ignoreCase ? compareLettersIgnoreCase(b1, b2) : b1.compareTo(b2);
     }
 
-    private static int compareLettersIgnoreCase(@NotNull CharBuffer b1,@NotNull CharBuffer b2) {
+    private static int compareLettersIgnoreCase(@NotNull CharBuffer b1, @NotNull CharBuffer b2) {
         int len = Math.min(b1.remaining(), b2.remaining());
         for (int i = 0; i < len; i++) {
             char c1 = Character.toUpperCase(b1.get(b1.position() + i));

modules/org.jkiss.utils/src/org/jkiss/utils/ArgumentTokenizer.java → modules/org.jkiss.utils/src/main/java/org/jkiss/utils/ArgumentTokenizer.java

@@ -1,35 +1,18 @@
 /*
- * Copyright (c) 2001-2010, JavaPLT group at Rice University (drjava@rice.edu)
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the names of DrJava, the JavaPLT group, Rice University, nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
- * This software is Open Source Initiative approved Open Source Software.
- * Open Source Initative Approved is a trademark of the Open Source Initiative.
- * 
- * This file is part of DrJava.  Download the current version of this project
- * from http://www.drjava.org/ or http://sourceforge.net/projects/drjava/
+ * Licensed 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.jkiss.utils;
@@ -117,27 +100,27 @@ public static List<String> tokenize(String arguments, boolean stringify) {
                             currArg.append(c);
                         }
                         break;
-//          case NORMAL_TOKEN_STATE:
-//            if (Character.isWhitespace(c)) {
-//              // Whitespace ends the token; start a new one
-//              argList.add(currArg.toString());
-//              currArg = new StringBuffer();
-//              state = NO_TOKEN_STATE;
-//            }
-//            else if (c == '\\') {
-//              // Backslash in a normal token: escape the next character
-//              escaped = true;
-//            }
-//            else if (c == '\'') {
-//              state = SINGLE_QUOTE_STATE;
-//            }
-//            else if (c == '"') {
-//              state = DOUBLE_QUOTE_STATE;
-//            }
-//            else {
-//              currArg.append(c);
-//            }
-//            break;
+                    //          case NORMAL_TOKEN_STATE:
+                    //            if (Character.isWhitespace(c)) {
+                    //              // Whitespace ends the token; start a new one
+                    //              argList.add(currArg.toString());
+                    //              currArg = new StringBuffer();
+                    //              state = NO_TOKEN_STATE;
+                    //            }
+                    //            else if (c == '\\') {
+                    //              // Backslash in a normal token: escape the next character
+                    //              escaped = true;
+                    //            }
+                    //            else if (c == '\'') {
+                    //              state = SINGLE_QUOTE_STATE;
+                    //            }
+                    //            else if (c == '"') {
+                    //              state = DOUBLE_QUOTE_STATE;
+                    //            }
+                    //            else {
+                    //              currArg.append(c);
+                    //            }
+                    //            break;
                     case NO_TOKEN_STATE:
                     case NORMAL_TOKEN_STATE:
                         switch (c) {