Merge branch 'rel_1.7.3'

socrata · Dec 6, 2016 · 45f2302 · 45f2302
2 parents 1af8cbe + a7fa8c5
commit 45f2302
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Socrata Datasync
 ================
 
-Last updated: December 1, 2016
+Last updated: December 6, 2016
 
 Authors: [Adrian Laurenzi](http://www.github.com/alaurenz) & [Louis Fettet](http://www.github.com/LouisFettet)
 
@@ -28,7 +28,7 @@ Standard jobs can be set up to take a CSV data file from a local machine or netw
 ![standard job tab](http://i.imgur.com/byN0ibq.png?1)
 
 ### GIS Jobs
-GIS jobs can be set up to handle geospatial datasets, such as zipped shapefiles, geoJSON, KML, or KMZ files and replace specific datasets on Socrata. The job can then be automated in a similar fashion to standard jobs. 
+GIS jobs can be set up to handle geospatial datasets, such as zipped shapefiles, geoJSON, KML, or KMZ files and replace specific datasets on Socrata. The job can then be automated in a similar fashion to standard jobs.
 
 ### Port Jobs
 Port jobs are used for moving data around that is already on the Socrata platform. Users that have publisher rights can make copies of datasets through this tool. Port jobs allow the copying of both dataset schemas (metadata and columns) and data (rows).
@@ -54,7 +54,7 @@ mvn clean compile -Dmaven.test.skip=true assembly:single
 This puts the JAR file into the "target" directory inside the repo.  So to open DataSync, simply:
 ```
 cd target
-java -jar DataSync-1.7.2-jar-with-dependencies.jar
+java -jar DataSync-1.7.3-jar-with-dependencies.jar
 ```
 
 ### Java SDK

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>DataSync</groupId>
     <artifactId>DataSync</artifactId>
-    <version>1.8</version>
+    <version>1.7.3</version>
     <developers>
         <developer>
             <name>Ayn Leslie-Cook</name>
@@ -30,9 +30,20 @@
             <organization>Socrata</organization>
         </developer>
         <developer>
+<<<<<<< HEAD
+            <name>Urmila Nadkarni</name>
+            <email>urmila.nadkarni@socrata.com</email>
+            <organization>Socrata</organization>
+        </developer>
+        <developer>
+            <name>Robert Macbomber</name>
+            <email>robert.macomber@socrata.com</email>
+            <organization>Socrata</organization>
+=======
           <name>Peter Austin Moore</name>
           <email>peter.moore@socrata.com</email>
           <organization>Socrata</organization>
+>>>>>>> master
         </developer>
     </developers>
     <build>

diff --git a/src/test/java/com/socrata/datasync/VersionProviderTest.java b/src/test/java/com/socrata/datasync/VersionProviderTest.java
@@ -35,7 +35,7 @@ public void testVersionMajorNumbers() {
 
     @Test
     public void testGetLatestVersion() throws URISyntaxException {
-        TestCase.assertEquals("1.8", VersionProvider.getLatestVersion());
+        TestCase.assertEquals("1.7.3", VersionProvider.getLatestVersion());
     }
 
     @Test
@@ -48,6 +48,6 @@ public void testIsLatestVersion() throws URISyntaxException {
 
     @Test
     public void testGetThisVersion() {
-        TestCase.assertEquals("1.8", VersionProvider.getThisVersion());
+        TestCase.assertEquals("1.7.3", VersionProvider.getThisVersion());
     }
 }