diff --git a/pom.xml b/pom.xml index 7e72278..d77dde5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,27 +9,16 @@ sql2java code generator https://github.com/xgp/sql2java - - com.github.xgp - oss-parent - 0.1 - UTF-8 UTF-8 - 1.5 + 1.6 2.3.4 1.7.22 - - https://github.com/xgp/sql2java - scm:git:git://github.com/xgp/sql2java.git - scm:git:git@github.com:xgp/sql2java.git - master - - + GNU Library General Public License version 2.0 (LGPLv2) @@ -44,6 +33,19 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + sql2java-lib sql2java-maven-plugin diff --git a/sql2java-lib/pom.xml b/sql2java-lib/pom.xml index c4a5333..b51eef5 100644 --- a/sql2java-lib/pom.xml +++ b/sql2java-lib/pom.xml @@ -11,8 +11,20 @@ sql2java 0.9.1-SNAPSHOT - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + + org.slf4j slf4j-api diff --git a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/CodeWriter.java b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/CodeWriter.java index 8f50d9a..833c011 100755 --- a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/CodeWriter.java +++ b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/CodeWriter.java @@ -6,7 +6,6 @@ import java.io.*; import java.util.*; -import java.sql.Types; import org.apache.velocity.Template; import org.apache.velocity.app.Velocity; diff --git a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Database.java b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Database.java index 265885e..b707ec6 100755 --- a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Database.java +++ b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Database.java @@ -3,8 +3,6 @@ package net.sourceforge.sql2java; import java.sql.*; -import java.util.*; -import java.io.*; import java.util.Vector; import java.util.Hashtable; diff --git a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Main.java b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Main.java index bf20202..488cea3 100755 --- a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Main.java +++ b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/Main.java @@ -4,7 +4,6 @@ import java.util.*; import java.io.*; -import java.sql.SQLException; public class Main { diff --git a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/StringUtilities.java b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/StringUtilities.java index 6e47358..85b8940 100755 --- a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/StringUtilities.java +++ b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/StringUtilities.java @@ -2,8 +2,6 @@ package net.sourceforge.sql2java; -import java.io.*; - /** * @author Kelvin Nishikawa * diff --git a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/Sql2JavaMojo.java b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/Sql2JavaMojo.java index 013b46b..071d072 100644 --- a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/Sql2JavaMojo.java +++ b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/Sql2JavaMojo.java @@ -2,12 +2,10 @@ import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.util.ArrayList; import java.util.Properties; import java.util.StringTokenizer; import net.sourceforge.sql2java.*; -import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; diff --git a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/SqlFileMojo.java b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/SqlFileMojo.java index 6577b2e..d71fef2 100644 --- a/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/SqlFileMojo.java +++ b/sql2java-maven-plugin/src/main/java/net/sourceforge/sql2java/maven/SqlFileMojo.java @@ -2,13 +2,11 @@ import java.io.File; import java.io.FilenameFilter; -import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; import java.sql.SQLException; import java.util.Arrays; -import net.sourceforge.sql2java.*; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; diff --git a/sql2java-test/README b/sql2java-test/README index 65c0176..5423f26 100644 --- a/sql2java-test/README +++ b/sql2java-test/README @@ -5,14 +5,3 @@ Use this as a model for how to use the plugin in your environment. E.g. - Use sqlfile plugin in build->plugins to source it into a temporary hsqldb - Use sql2java plugin in build->plugins to generate managers and beans to generated source dir - Test, etc. - -Currently known problem: - - [WARNING] Some problems were encountered while building the effective model for net.sourceforge:sql2java-test:jar:1.0-SNAPSHOT - [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but found duplicate declaration of plugin net.sourceforge:sql2java-maven-plugin @ net.sourceforge:sql2java-test:[unknown-version], /Users/xgp/projects/sql2java/github/sql2java-test/pom.xml, line 74, column 15 - [WARNING] - [WARNING] It is highly recommended to fix these problems because they threaten the stability of your build. - [WARNING] - [WARNING] For this reason, future Maven versions might no longer support building such malformed projects. - -This is because, for some reason, my plugin mojos aren't picking up all the properties when they are specified in separate s of the same plugin. Will fix later. diff --git a/sql2java-test/pom.xml b/sql2java-test/pom.xml index 5aaffc0..2995598 100644 --- a/sql2java-test/pom.xml +++ b/sql2java-test/pom.xml @@ -1,133 +1,120 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0 - com.github.xgp - sql2java-test - jar - sql2java-test - - + 4.0.0 com.github.xgp - sql2java - 0.9.1-SNAPSHOT - + sql2java-test + jar + sql2java-test - - - org.slf4j - slf4j-api - - - com.github.xgp - sql2java-lib - ${project.parent.version} - - - org.slf4j - slf4j-simple - test - - - org.hsqldb - hsqldb - test - - - org.hsqldb - sqltool - test - - - junit - junit - test - - + + com.github.xgp + sql2java + 0.9.1-SNAPSHOT + - - - - com.github.xgp - sql2java-maven-plugin - ${project.parent.version} - - - sqlfile - initialize - - sqlfile - - - - - true - ${project.basedir}/src/main/sql - org.hsqldb.jdbc.JDBCDriver - jdbc:hsqldb:file:${project.build.directory}/databases/test - SA - - PUBLIC - - - - org.hsqldb - hsqldb - ${hsqldb.version} - - - - - com.github.xgp - sql2java-maven-plugin - ${project.parent.version} - - - sql2java - generate-sources - - sql2java - - - - - ${project.build.directory}/generated-sources/sql2java - ${project.basedir}/src/main/resources/sql2java.properties - org.hsqldb.jdbc.JDBCDriver - jdbc:hsqldb:file:${project.build.directory}/databases/test - SA - - PUBLIC - com.test - - - - org.hsqldb - hsqldb - ${hsqldb.version} - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.12 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/sql2java - - - - - - - + + + org.slf4j + slf4j-api + + + com.github.xgp + sql2java-lib + ${project.parent.version} + + + org.slf4j + slf4j-simple + test + + + org.hsqldb + hsqldb + test + + + org.hsqldb + sqltool + test + + + junit + junit + test + + + + + + com.github.xgp + sql2java-maven-plugin + ${project.parent.version} + + + sqlfile + initialize + + sqlfile + + + + sql2java + generate-sources + + sql2java + + + + + ${project.build.directory}/generated-sources/sql2java + ${project.basedir}/src/main/resources/sql2java.properties + + + ${project.basedir}/src/main/sql + org.hsqldb.jdbc.JDBCDriver + jdbc:hsqldb:file:${project.build.directory}/databases/test + SA + + PUBLIC + + true + + com.test.vinh + + + + + org.hsqldb + hsqldb + ${hsqldb.version} + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.12 + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/sql2java + + + + + + + + + 1.6 + 1.6 + diff --git a/sql2java-test/src/main/sql/00-test.sql b/sql2java-test/src/main/sql/00-test.sql index 5e1b542..ef41077 100644 --- a/sql2java-test/src/main/sql/00-test.sql +++ b/sql2java-test/src/main/sql/00-test.sql @@ -1,3 +1,6 @@ +DROP TABLE phone IF EXISTS; +DROP TABLE person IF EXISTS; + CREATE TABLE person ( id integer GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, username varchar(255) NOT NULL, diff --git a/sql2java-test/src/test/java/com/test/TransactionTest.java b/sql2java-test/src/test/java/com/test/TransactionTest.java index 88e0a9d..c4da131 100644 --- a/sql2java-test/src/test/java/com/test/TransactionTest.java +++ b/sql2java-test/src/test/java/com/test/TransactionTest.java @@ -1,8 +1,6 @@ package com.test; -import java.io.File; import java.util.Date; -import javax.sql.DataSource; import net.sourceforge.sql2java.lib.*; import org.hsqldb.jdbc.JDBCDataSource; import org.junit.*;