From 85bb7d81cd64dfefc9a6850f3bd727277032b2db Mon Sep 17 00:00:00 2001
From: Gray Watson <gray.github@mailnull.com>
Date: Mon, 2 Jul 2018 15:17:04 -0400
Subject: [PATCH 1/3] Updated circleci

---
 .circleci/config.yml | 34 ++++++++++++++++++++++++++++++++++
 circle.yml           | 20 --------------------
 2 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..9a69aa873
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,34 @@
+# config file for circleci
+version: 2 
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:8-jdk-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: j256-simplecsv-{{ checksum "pom.xml" }}
+      - run:
+          name: Get maven project dependencies
+          command: mvn -U dependency:go-offline compile
+      # save the project dependencies
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: j256-simplecsv-{{ checksum "pom.xml" }}
+      - run:
+          name: mvn package
+          command: mvn package
+      # uploads the test metadata from the `target/surefire-reports` directory so that it can show up in the CircleCI dashboard. 
+      - store_test_results: 
+          path: target/surefire-reports
+      - run:
+          name: Generate coverage report using jacoco
+          command: mvn jacoco:report
+      - run:
+          name: Upload coverage report to CodeCov
+          command: bash <(curl -s https://codecov.io/bash)
+      # deploys whenever we check into master to our s3 snapshot repo so ormlite-jdbc can run its tests
+      - run:
+          name: mvn deploy
+          command: mvn -DskipTests deploy
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 673c3a6ba..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# config file for circleci
-machine:
-  java:
-    version: openjdk7
-
-dependencies:
-  override:
-    - mvn dependency:go-offline compile
-
-test:
-  post:
-    - mvn jacoco:report
-    - bash <(curl -s https://codecov.io/bash)
-
-# deploys whenever we check into master to our s3 snapshot repo so ormlite-jdbc can run its tests
-deployment:
-  main:
-    branch: master
-    commands:
-      - mvn -DskipTests deploy

From c9755bf7353362936d459d5a88be0ebb48d79267 Mon Sep 17 00:00:00 2001
From: Gray Watson <gray.github@mailnull.com>
Date: Mon, 2 Jul 2018 15:17:44 -0400
Subject: [PATCH 2/3] cp

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a69aa873..fb017917e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: j256-simplecsv-{{ checksum "pom.xml" }}
+          key: j256-ormlite-core-{{ checksum "pom.xml" }}
       - run:
           name: Get maven project dependencies
           command: mvn -U dependency:go-offline compile
@@ -15,7 +15,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.m2
-          key: j256-simplecsv-{{ checksum "pom.xml" }}
+          key: j256-ormlite-core-{{ checksum "pom.xml" }}
       - run:
           name: mvn package
           command: mvn package

From 4a1fa3d5ef523297a5dd3fe0b266ee7e863257c3 Mon Sep 17 00:00:00 2001
From: Gray Watson <gray.github@mailnull.com>
Date: Mon, 2 Jul 2018 15:23:03 -0400
Subject: [PATCH 3/3] cp

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb017917e..acc6aad62 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,4 +31,4 @@ jobs:
       # deploys whenever we check into master to our s3 snapshot repo so ormlite-jdbc can run its tests
       - run:
           name: mvn deploy
-          command: mvn -DskipTests deploy
+          command: mvn -Ptesting -DskipTests deploy