Changeset: 5f1853633b56 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f1853633b56
Added Files:
java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java
java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
java/src/main/java/nl/cwi/monetdb/merovingian/Control.java
java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java
java/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
java/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
java/src/main/java/nl/cwi/monetdb/util/Exporter.java
java/src/main/java/nl/cwi/monetdb/util/Extract.java
java/src/main/java/nl/cwi/monetdb/util/OptionsException.java
java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java
java/src/main/java/nl/cwi/monetdb/util/SQLRestore.java
java/src/main/java/nl/cwi/monetdb/util/XMLExporter.java
Removed Files:
java/src/nl/cwi/monetdb/client/JMonetDB.java
java/src/nl/cwi/monetdb/client/JdbcClient.java
java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/nl/cwi/monetdb/jdbc/MonetClob.java
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/nl/cwi/monetdb/jdbc/MonetDataSource.java
java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in
java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/nl/cwi/monetdb/jdbc/MonetSavepoint.java
java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/nl/cwi/monetdb/jdbc/MonetWrapper.java
java/src/nl/cwi/monetdb/jdbc/types/INET.java
java/src/nl/cwi/monetdb/jdbc/types/URL.java
java/src/nl/cwi/monetdb/mcl/MCLException.java
java/src/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
java/src/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
java/src/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
java/src/nl/cwi/monetdb/mcl/parser/MCLParseException.java
java/src/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
java/src/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
java/src/nl/cwi/monetdb/merovingian/Control.java
java/src/nl/cwi/monetdb/merovingian/MerovingianException.java
java/src/nl/cwi/monetdb/merovingian/SabaothDB.java
java/src/nl/cwi/monetdb/util/CmdLineOpts.java
java/src/nl/cwi/monetdb/util/Exporter.java
java/src/nl/cwi/monetdb/util/Extract.java
java/src/nl/cwi/monetdb/util/OptionsException.java
java/src/nl/cwi/monetdb/util/SQLExporter.java
java/src/nl/cwi/monetdb/util/SQLRestore.java
java/src/nl/cwi/monetdb/util/XMLExporter.java
Modified Files:
.hgignore
java/build.xml
java/pom.xml
Branch: Jul2015
Log Message:
Make POM more Maven central compatible
Move Java sources to standard mvn location src/main/java
Adjust the build.xml to the new location
Use the Ant generated MonetDriver.java via the Ant run plugin
diffs (truncated from 325 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -65,8 +65,10 @@ lex.yy.c
*.gem
# java:
*.jar
+java/build
java/target
java/bin
+java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
# python:
dist
diff --git a/java/build.xml b/java/build.xml
--- a/java/build.xml
+++ b/java/build.xml
@@ -20,7 +20,7 @@ Copyright 2008-2015 MonetDB B.V.
<!-- set global properties for this build -->
- <property name="srcdir" value="src" />
+ <property name="srcdir" value="src/main/java" />
<property name="libdir" value="lib" />
<property name="jardir" value="jars" />
<property name="builddir" value="build" />
@@ -184,7 +184,6 @@ Copyright 2008-2015 MonetDB B.V.
target="${jvm.version}"
>
<src path="${srcdir}" />
- <src path="${builddir}/src" />
<include name="${jdbc-package}/**/*.java" />
<compilerarg line="${javac.flags}" />
</javac>
@@ -281,10 +280,10 @@ Copyright 2008-2015 MonetDB B.V.
<fail unless="JDBC_VER_SUFFIX" message="'JDBC_VER_SUFFIX' undefined.
Please follow the directions in build.properties."/>
<!-- now copy and filter the file -->
- <copy file="${srcdir}/${jdbc-package}/MonetDriver.java.in"
- overwrite="true"
- tofile="${builddir}/src/${jdbc-package}/MonetDriver.java"
- filtering="yes" />
+ <copy file="${srcdir}/${jdbc-package}/MonetDriver.java.in"
+ overwrite="true"
+ tofile="${srcdir}/${jdbc-package}/MonetDriver.java"
+ filtering="yes" />
<echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR}
(${JDBC_VER_SUFFIX}) edition driver" />
</target>
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,31 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Copyright 2008-2015 MonetDB B.V.
--->
-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
+
<groupId>monetdb</groupId>
<artifactId>monetdb-jdbc</artifactId>
<version>2.17</version>
- <name>monetdb-jdbc</name>
+ <name>${project.groupId}:${project.artifactId}</name>
<description>MonetDB JDBC driver</description>
- <repositories>
+ <url>https://www.monetdb.org</url>
+
+ <licenses>
+ <license>
+ <name>Mozilla Public License, Version 2.0</name>
+ <url>https://www.mozilla.org/MPL/2.0/</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Sjoerd Mullender</name>
+ <email>sjo...@monetdb.org</email>
+ <organization>MonetDB</organization>
+
<organizationUrl>https://www.monetdb.org</organizationUrl>
+ </developer>
+ <developer>
+ <name>Dimitar Nedev</name>
+ <email>dimitar.ne...@monetdbsolutions.com</email>
+ <organization>MonetDB Solutions</organization>
+
<organizationUrl>https://www.monetdbsolutions.com</organizationUrl>
+ </developer>
+ </developers>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
<repository>
- <id>central</id>
- <url>http://repo1.maven.org/maven2</url>
+ <id>ossrh</id>
+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
- <repository>
- <id>clojars</id>
- <url>http://clojars.org/repo/</url>
- </repository>
- </repositories>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:hg:https://dev.monetdb.org/hg/MonetDB/</connection>
+
<developerConnection>scm:hg:ssh://h...@dev.monetdb.org/MonetDB/</developerConnection>
+ <url>https://dev.monetdb.org/hg/MonetDB/</url>
+ </scm>
+
+ <properties>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <ant
antfile="${basedir}/build.xml" target="driver" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+
<artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+
<autoVersionSubmodules>true</autoVersionSubmodules>
+
<useReleaseProfile>false</useReleaseProfile>
+
<releaseProfiles>release</releaseProfiles>
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/java/src/nl/cwi/monetdb/client/JMonetDB.java
b/java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
rename from java/src/nl/cwi/monetdb/client/JMonetDB.java
rename to java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
diff --git a/java/src/nl/cwi/monetdb/client/JdbcClient.java
b/java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
rename from java/src/nl/cwi/monetdb/client/JdbcClient.java
rename to java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetClob.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetClob.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetDataSource.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetDataSource.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
rename from java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetSavepoint.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetSavepoint.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetWrapper.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java
rename from java/src/nl/cwi/monetdb/jdbc/MonetWrapper.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/types/INET.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
rename from java/src/nl/cwi/monetdb/jdbc/types/INET.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
diff --git a/java/src/nl/cwi/monetdb/jdbc/types/URL.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
rename from java/src/nl/cwi/monetdb/jdbc/types/URL.java
rename to java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
diff --git a/java/src/nl/cwi/monetdb/mcl/MCLException.java
b/java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java
rename from java/src/nl/cwi/monetdb/mcl/MCLException.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java
diff --git a/java/src/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
b/java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
rename from java/src/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
diff --git a/java/src/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
b/java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
rename from java/src/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
diff --git a/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
b/java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
rename from java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
diff --git a/java/src/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
b/java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
rename from java/src/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
diff --git a/java/src/nl/cwi/monetdb/mcl/parser/MCLParseException.java
b/java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java
rename from java/src/nl/cwi/monetdb/mcl/parser/MCLParseException.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java
diff --git a/java/src/nl/cwi/monetdb/mcl/parser/MCLParser.java
b/java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
rename from java/src/nl/cwi/monetdb/mcl/parser/MCLParser.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
diff --git a/java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
b/java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
rename from java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
diff --git a/java/src/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
b/java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
rename from java/src/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
rename to java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
diff --git a/java/src/nl/cwi/monetdb/merovingian/Control.java
b/java/src/main/java/nl/cwi/monetdb/merovingian/Control.java
rename from java/src/nl/cwi/monetdb/merovingian/Control.java
rename to java/src/main/java/nl/cwi/monetdb/merovingian/Control.java
diff --git a/java/src/nl/cwi/monetdb/merovingian/MerovingianException.java
b/java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java
rename from java/src/nl/cwi/monetdb/merovingian/MerovingianException.java
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
