Skip to content

Commit

Permalink
updated for "clean" maven build process
Browse files Browse the repository at this point in the history
 - added more dependencies to pom (based on lib dir),
 - relocated sources and tests to src/{main,test}/java respectively,
 - added copy-resource to pom in lieu of re-defining resource location(s),
 - updated ant build.xml to align with new file locations (untested),
 - Ignored TestJPABBenchmark as it fails becuase it does not use a Catalog,
 - replaced references to "/home/pavlo/.../log4j.properties" with a more portable but no less obnixious system call
  • Loading branch information
Aaron Molitor committed Nov 17, 2016
1 parent eb83b39 commit 3ab3977
Show file tree
Hide file tree
Showing 573 changed files with 251 additions and 46 deletions.
11 changes: 6 additions & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<project basedir="." default="build" name="benchmark">
<property environment="env"/>
<property name="debuglevel" value="source,lines,vars"/>
<property name="javac.target" value="1.6"/>
<property name="javac.source" value="1.6"/>
<property name="javac.target" value="1.7"/>
<property name="javac.source" value="1.7"/>

<!-- *************************************** CONFIGURATION *************************************** -->

<property name="src.dir" location="src" />
<property name="tests.dir" location="tests" />
<property name="src.dir" location="src/main/java" />
<property name="tests.dir" location="src/test/java" />
<property name="resources.dir" location="src/main/resources" />
<property name="lib.dir" location="lib" />
<property name="build.dir" location="build" />
<property name="build.tests.dir" location="${build.dir}/tests" />
Expand Down Expand Up @@ -53,7 +54,7 @@
<!-- <echo message="${ant.project.name}: ${ant.file}"/> -->

<mkdir dir="${build.dir}/META-INF"/>
<copy file="${src.dir}/META-INF/persistence.xml" todir="${build.dir}/META-INF"/>
<copy file="${resources.dir}/META-INF/persistence.xml" todir="${build.dir}/META-INF"/>
<javac debug="true" debuglevel="${debuglevel}" includeantruntime="false"
destdir="${build.dir}"
source="${javac.source}"
Expand Down
252 changes: 220 additions & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,101 @@
<artifactId>oltpbench</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<repositories>
<repository>
<id>clojars</id>
<url>http://clojars.org/repo</url>
</repository>
<repository>
<id>splicemachine-public</id>
<url>http://repository.splicemachine.com/nexus/content/groups/public</url>
</repository>
<repository>
<id>maven.oracle.com</id>
<name>oracle-maven-repo</name>
<url>https://maven.oracle.com</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
</repository>
</repositories>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<includes>
<include>**/*.sql</include>
</includes>
</resource>
</resources>
<plugins>
<!-- In addition to the standard JAR file,this will create an executable
JAR with dependencies -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>com.oltpbenchmark.DBWorkload</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*-ddl.sql</include>
<include>**/*-dialects.xml</include>
<include>**/*.xsd</include>
<include>**/histogram.*.gz</include>
<include>**/table.*.gz</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-test-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>src/test/java</directory>
<includes>
<include>**/*-ddl.sql</include>
<include>**/*-dialects.xml</include>
<include>**/*.xsd</include>
<include>**/histogram.*.gz</include>
<include>**/table.*.gz</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -114,6 +176,12 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
Expand Down Expand Up @@ -146,9 +214,129 @@
$ mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.1.0 -Dpackaging=jar -Dfile=lib/ojdbc14-10.2.jar -DgeneratePom=true
-->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.1.0</version>
<groupId>com.oracle.jdbc</groupId>
<artifactId>ojdbc7</artifactId>
<version>12.1.0.2</version>
</dependency>
<dependency>
<groupId>com.oracle.jdbc</groupId>
<artifactId>ucp</artifactId>
<version>12.1.0.2</version>
</dependency>
<dependency>
<groupId>com.splicemachine</groupId>
<artifactId>db-client</artifactId>
<version>2.0.1.28</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.40</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>1.2.4</version>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.1-901.jdbc4</version>
</dependency>
<dependency>
<groupId>monetdb</groupId>
<artifactId>monetdb-jdbc</artifactId>
<version>2.23</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
<version>0.9.1.2</version>
</dependency>
<dependency>
<groupId>com.buschmais.jqassistant.plugin</groupId>
<artifactId>jpa2</artifactId>
<version>1.2-RC1</version>
</dependency>
<dependency>
<groupId>com.googlecode.log4jdbc</groupId>
<artifactId>log4jdbc</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.163</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.12.0.GA</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.6.20</version>
</dependency>
</dependencies>
</project>
</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 3ab3977

Please sign in to comment.