It builds now, but no tests enabled yet.

- Removed maven-assembly-plugin, because no dependencies used.
- JDBC changed a lot...
- Tests need some serious changes (Junit upgrade).

Author: CptTZ

pom.xml

@@ -70,28 +70,18 @@
                 </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <mainClass>smallsql</mainClass>
-                                </manifest>
-                            </archive>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                    </execution>
-                </executions>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>smallsql.tools.CommandLine</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

src/main/java/smallsql/database/SQLToken.java

@@ -6,60 +6,59 @@
  *
  * Project Info:  http://www.smallsql.de/
  *
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Lesser General Public License as published by 
- * the Free Software Foundation; either version 2.1 of the License, or 
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public 
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
  * License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
- * USA.  
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
  *
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc. 
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
  * in the United States and other countries.]
  *
  * ---------------
  * SQLToken.java
  * ---------------
  * Author: Volker Berlin
- * 
+ *
  */
 package smallsql.database;
 
 /**
  * @author Volker Berlin
- *
  */
-class SQLToken{
-	int value;
-	int offset;  // the start offset the token in the SQL string
-	int length;  // the length of the token
-	String name;
+class SQLToken {
+    int value;
+    int offset;  // the start offset the token in the SQL string
+    int length;  // the length of the token
+    String name;
 
-	SQLToken (int value, int tokenStart, int tokenEnd){
-		this.value  = value;
-		this.offset = tokenStart;
-		this.length = tokenEnd-tokenStart;
-	}
+    SQLToken(int value, int tokenStart, int tokenEnd) {
+        this.value = value;
+        this.offset = tokenStart;
+        this.length = tokenEnd - tokenStart;
+    }
 
-	/**
-	 * Constructor used for quoted strings 
-	 */
-	SQLToken (String name, int value, int tokenStart, int tokenEnd){
-		this.value  = value;
-		this.offset = tokenStart;
-		this.length = tokenEnd-tokenStart;
-		this.name   = name;
-	}
+    /**
+     * Constructor used for quoted strings
+     */
+    SQLToken(String name, int value, int tokenStart, int tokenEnd) {
+        this.value = value;
+        this.offset = tokenStart;
+        this.length = tokenEnd - tokenStart;
+        this.name = name;
+    }
 
-	String getName(char[] sql){
-		if(name != null) return name;
-		return new String( sql, offset, length );
-	}
+    String getName(char[] sql) {
+        if (name != null) return name;
+        return new String(sql, offset, length);
+    }
 }