From 98bb5dc01796728de5b18f84e19766276d12d1db Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 5 Apr 2016 12:22:38 -0400 Subject: [PATCH] Finished Maven migration --- .checkstyle | 10 ----- .classpath | 29 ------------- .gitignore | 18 ++------ .gitmodules | 0 .project | 23 ----------- README.md | 13 +----- build.moxie | 110 ------------------------------------------------- build.xml | 98 ------------------------------------------- checkstyle.xml | 109 ------------------------------------------------ pom.xml | 16 ++++++- 10 files changed, 21 insertions(+), 405 deletions(-) delete mode 100644 .checkstyle delete mode 100644 .classpath delete mode 100644 .gitmodules delete mode 100644 .project delete mode 100644 build.moxie delete mode 100644 build.xml delete mode 100644 checkstyle.xml diff --git a/.checkstyle b/.checkstyle deleted file mode 100644 index 3eb52c0..0000000 --- a/.checkstyle +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.classpath b/.classpath deleted file mode 100644 index c7a5889..0000000 --- a/.classpath +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 637886e..181301d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,9 @@ /.idea +/.settings /bin -/build -/doclava -/ext -/javadoc -/site /target -/*.zip -/*.jar -/build.properties -/derby.log -/performance.txt -/performance_db.txt -/performance_sql.txt +/*.log /testdbs -/*.sh -/*.ps1 /*.iml +/.classpoath +/.project diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/.project b/.project deleted file mode 100644 index 1b602b8..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - Iciql - - - - - - org.eclipse.jdt.core.javabuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/README.md b/README.md index 0bf1bda..465eb73 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,6 @@ Issues & source code @ [GitHub](http://github.com/gitblit/iciql) Building iciql ---------------- -## Maven - You may use Maven to build the project: mvn clean package @@ -74,13 +72,6 @@ You may use Maven to run the test suite on the default database: mvn clean test -## Ant - -You may use Ant to build this project: - - ant clean build - -You may execute the full test suite against all tested databases: - - ant testsuite +You may use Maven to run the test suite on all tested databases: + mvn clean exec:exec diff --git a/build.moxie b/build.moxie deleted file mode 100644 index 15fe508..0000000 --- a/build.moxie +++ /dev/null @@ -1,110 +0,0 @@ -# -# Iciql project descriptor -# - -# Specify minimum Moxie version required to build -requires: 0.9.2 - -# Project Metadata -name: Iciql -description: 'a model-based database access wrapper for JDBC' -groupId: com.gitblit.iciql -artifactId: iciql -version: 2.0.0 -packaging: jar+zip -inceptionYear: 2011 - -# Current stable release -releaseVersion: 2.0.0 -releaseDate: 2016-04-04 - -# Project urls -url: 'http://iciql.com' -issuesUrl: 'https://github.com/gitblit/iciql/issues' -mavenUrl: 'http://gitblit.github.io/iciql/maven' - -licenses: -- { - name: 'Apache ASL v2.0' - url: 'http://www.apache.org/licenses/LICENSE-2.0.html' - } - -developers: -- { - id: james - name: 'James Moger' - email: 'james.moger@gmail.com' - organization: 'gitblit.com' - organizationUrl: 'https://github.com/gitblit' - } - -scm: { - connection: 'scm:git:git://github.com/gitblit/iciql.git' - developerConnection: 'scm:git:https://github.com/gitblit/iciql.git' - url: 'https://github.com/gitblit/iciql' - tag: HEAD - } - -# Model generation tool -mainclass: com.iciql.util.GenerateModels - -sourceDirectories: -- compile 'src/main/java' -- test 'src/test/java' -- site 'src/site' - -resourceDirectories: -- test 'src/test/resources' -- site 'src/site/resources' - -# compile for Java 6 class format -tasks: { - 'mx:javac' : { - source: 1.6 - target: 1.6 - compiler: javac1.6 - encoding: UTF-8 - # stop complaints about bootstrap classpath when compiling with Java 7 - compilerArgs: '-Xlint:-options' - } -} - -# Generate Eclipse project files. -apply: eclipse - -# Copy all retrieved dependencies to the "ext" directory. -# Generated IDE settings (.classpath, etc) will use the artifacts -# from this project-relative directory. This allows the IDE settings -# to be version-controlled and shared. -dependencyDirectory: ext - -# Source all dependencies from the following repositories in the specified order -repositories: central - -properties: { - h2.version : 1.4.191 - hsqldb.version : 2.3.3 - derby.version : 10.12.1.1 - mysql.version : 5.6 - postgresql.version : 9.5 - sqlite.version : 3.8.11.2 -} - -dependencies: -- provided 'com.beust:jcommander:1.17' -- provided 'com.h2database:h2:${h2.version}' -- provided 'org.hsqldb:hsqldb:${hsqldb.version}' -- provided 'org.apache.derby:derby:${derby.version}' -- provided 'org.apache.derby:derbyclient:${derby.version}' -- provided 'org.apache.derby:derbynet:${derby.version}' -- provided 'mysql:mysql-connector-java:5.1.38' -- provided 'org.postgresql:postgresql:9.4.1208' -- provided 'org.xerial:sqlite-jdbc:${sqlite.version}' -- provided 'org.slf4j:slf4j-api:1.7.20' -- provided 'commons-pool:commons-pool:1.5.6' -- provided 'commons-dbcp:commons-dbcp:1.4' -- provided 'com.google.code.gson:gson:2.3' -- provided 'com.thoughtworks.xstream:xstream:1.4.9' -- provided 'org.yaml:snakeyaml:1.17' -- test 'junit' -- build 'jacoco' diff --git a/build.xml b/build.xml deleted file mode 100644 index eabd62d..0000000 --- a/build.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This will take a minute or two... - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/checkstyle.xml b/checkstyle.xml deleted file mode 100644 index 49b091b..0000000 --- a/checkstyle.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 3958b0b..8a584e1 100644 --- a/pom.xml +++ b/pom.xml @@ -175,13 +175,27 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12.4 + 2.19.1 com/iciql/test/IciqlSuite.java + + org.codehaus.mojo + exec-maven-plugin + 1.4.0 + + java + test + + -classpath + + com.iciql.test.IciqlSuite + + + org.apache.maven.plugins -- 2.39.5