Merge branch 'release/3.1.0'

Author: bivab

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.0
+current_version = 3.1.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>\w+))?
 tag = False
 commit = True

.travis.yml

@@ -24,7 +24,7 @@ script:
   - lein launch4j
 
 after_success:
-- travis-custom-deploy sftp target/mincer-3.0.0-standalone.jar target/mincer-3.0.0.exe
+- travis-custom-deploy sftp target/mincer-3.1.0-standalone.jar target/mincer-3.1.0.exe
 env:
   global:
   - DISPLAY=:99.0

README.md

@@ -17,7 +17,7 @@ Mincer supports two usage modes: batch/CLI and GUI modes.
 To start the graphical user-interface run the provided jar without arguments:
 
 ```
-$ java -jar mincer-3.0.0-standalone.jar
+$ java -jar mincer-3.1.0-standalone.jar
 ```
 
 ### CLI

config.xml

@@ -2,8 +2,8 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>target/mincer-3.0.0-standalone.jar</jar>
-  <outfile>target/mincer-3.0.0.exe</outfile>
+  <jar>target/mincer-3.1.0-standalone.jar</jar>
+  <outfile>target/mincer-3.1.0.exe</outfile>
   <errTitle></errTitle>
   <priority>normal</priority>
   <downloadUrl>http://java.com/download</downloadUrl>
@@ -23,15 +23,15 @@
   </jre>
   <versionInfo>
     <fileVersion>0.0.0.1</fileVersion>
-    <txtFileVersion>3.0.0-dev</txtFileVersion>
+    <txtFileVersion>3.1.0-dev</txtFileVersion>
     <fileDescription>mincer</fileDescription>
     <copyright>ISC</copyright>
     <productVersion>0.0.0.1</productVersion>
-    <txtProductVersion>3.0.0-dev</txtProductVersion>
+    <txtProductVersion>3.1.0-dev</txtProductVersion>
     <productName>mincer</productName>
     <companyName></companyName>
     <internalName>mincer</internalName>
-    <originalFilename>mincer-3.0.0.exe</originalFilename>
+    <originalFilename>mincer-3.1.0.exe</originalFilename>
   </versionInfo>
   <messages>
     <startupErr>Startup Error</startupErr>

project.clj

@@ -1,16 +1,16 @@
-(defproject mincer "3.0.0"
+(defproject mincer "3.1.0"
   :description "Tool to create a SQLite database from PlüS module tree and data XML files."
   :url "https://github.com/plues/mincer"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/java.jdbc "0.6.1"]
+                 [org.clojure/java.jdbc "0.7.0"]
                  [org.clojure/math.combinatorics "0.1.4"]
                  [org.clojure/test.check "0.9.0"]
                  [org.clojure/tools.cli "0.3.5"]
                  [org.clojure/tools.logging "0.4.0"]
                  [org.slf4j/slf4j-log4j12 "1.7.25"]
-                 [org.xerial/sqlite-jdbc "3.18.0"]
+                 [org.xerial/sqlite-jdbc "3.19.3"]
                  [seesaw "1.4.5"]]
   :plugins [[jonase/eastwood "0.2.3"]
             [lein-kibit "0.1.2"]

src/mincer/db.clj

@@ -5,7 +5,7 @@
     [clojure.java.jdbc :refer [with-db-transaction]]
     [clojure.tools.logging :as log]))
 
-(def mincer-version "3.0.0") ; updated with bumpversion
+(def mincer-version "3.1.0") ; updated with bumpversion
 
 (defn now [] (new java.util.Date))
 

src/mincer/ui.clj

@@ -161,7 +161,7 @@
   (let [lbl-mincer      (label ::mincer)
         lbl-icon        (label :icon logo)
         lbl-file-select (label ::file-select)
-        lbl-version     (label "3.0.0") ; managed by bumpversion
+        lbl-version     (label "3.1.0") ; managed by bumpversion
         lbl-save        (label ::save)]
     (doall (map #(config! % :border 10) [lbl-mincer lbl-file-select lbl-version lbl-icon]))
     (config! lbl-save :halign :center)