Merge pull request #190 from keeps/bf-permissive

Permissive approach and some fixes
keeps · May 11, 2016 · 95bb47b · 95bb47b
2 parents c23f56b + ba347b7
commit 95bb47b
Show file tree

Hide file tree

Showing 127 changed files with 4,944 additions and 4,352 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ target/
 **/.DS_Store
 
 log/
+dbptk-report-*
 dbptk-app.log
 dbptk-app.log.txt
 exported-dbs/

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 sudo: false
-script: mvn -Dtestng.groups="travis-ci" clean verify
+script: mvn -Dtestng.groups="travis-ci" -Dlogback.configurationFile=logback-travis.xml verify
 jdk:
   - oraclejdk8
   - oraclejdk7

diff --git a/dbptk-bindings/pom.xml b/dbptk-bindings/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.databasepreservation</groupId>
         <artifactId>dbptk</artifactId>
-        <version>2.0.0-beta4.0</version>
+        <version>2.0.0-beta4.2</version>
         <relativePath>..</relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/dbptk-core/pom.xml b/dbptk-core/pom.xml
@@ -6,11 +6,11 @@
     <name>dbptk-core</name>
     <groupId>com.databasepreservation</groupId>
     <artifactId>dbptk-core</artifactId>
-    <version>2.0.0-beta4.0</version>
+    <version>2.0.0-beta4.2</version>
     <parent>
         <groupId>com.databasepreservation</groupId>
         <artifactId>dbptk</artifactId>
-        <version>2.0.0-beta4.0</version>
+        <version>2.0.0-beta4.2</version>
         <relativePath>..</relativePath>
     </parent>
     <properties>
@@ -60,6 +60,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
+                    <argLine>-Xmx128m</argLine>
                     <suiteXmlFiles>
                         <suiteXmlFile>${basedir}/testng.xml</suiteXmlFile>
                     </suiteXmlFiles>
@@ -109,10 +110,6 @@
             <groupId>org.w3c</groupId>
             <artifactId>w3c-utils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>pt.keep</groupId>
-            <artifactId>file-format-utility</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
@@ -129,10 +126,6 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-transaction</groupId>
             <artifactId>commons-transaction</artifactId>
@@ -144,25 +137,30 @@
         <dependency>
             <groupId>org.jdom</groupId>
             <artifactId>jdom2</artifactId>
-            <version>2.0.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
         </dependency>
 
-		<!-- database connectors -->
+        <!-- database connectors -->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>pt.gov.dgarq.roda</groupId>
-			<artifactId>mets-1.7</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.microsoft.sqlserver.jdbc</groupId>
 			<artifactId>sqljdbc4</artifactId>
@@ -200,5 +198,5 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-	</dependencies>
+    </dependencies>
 </project>