version bump and removing merge artifacts.

laidig · Jan 19, 2017 · ae42f18 · ae42f18
1 parent 284754c
commit ae42f18
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/gtfs-validation-lib/pom.xml b/gtfs-validation-lib/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>gtfs-validator</artifactId>
 		<groupId>com.conveyal</groupId>
-		<version>0.1.3</version>
+		<version>0.1.4</version>
 	</parent>
 	<groupId>com.conveyal</groupId>
 	<artifactId>gtfs-validation-lib</artifactId>
-	<version>0.1.3</version>
+	<version>0.1.4</version>
 	<description>A Java framework for GTFS validation and statistics</description>
 
 	<properties>

diff --git a/gtfs-validation-lib/src/main/java/com/conveyal/gtfs/service/impl/GtfsStatisticsService.java b/gtfs-validation-lib/src/main/java/com/conveyal/gtfs/service/impl/GtfsStatisticsService.java
@@ -2,16 +2,9 @@
 
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-<<<<<<< HEAD
-import java.util.ArrayList;
-import java.util.Calendar;
-=======
 import java.time.Duration;
-import java.util.ArrayList;
 import java.time.ZoneId;
->>>>>>> bec383dbc97456658f7cacb0a7a14fc608ec5e6a
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.Optional;
 import java.util.TimeZone;
@@ -26,12 +19,6 @@
 import org.onebusaway.gtfs.model.Stop;
 import org.onebusaway.gtfs.model.StopTime;
 import org.onebusaway.gtfs.model.Trip;
-import org.onebusaway.gtfs.serialization.comparators.ServiceCalendarDateComparator;
-import org.onebusaway.gtfs.model.calendar.ServiceDate;
-import org.onebusaway.gtfs.serialization.comparators.ServiceCalendarDateComparator;
-=======
->>>>>>> bec383dbc97456658f7cacb0a7a14fc608ec5e6a
-import org.onebusaway.gtfs.services.GtfsDao;
 import org.onebusaway.gtfs.services.calendar.CalendarService;
 
 import com.conveyal.gtfs.model.Statistic;

diff --git a/gtfs-validator-json/pom.xml b/gtfs-validator-json/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.conveyal</groupId>
       <artifactId>gtfs-validation-lib</artifactId>
-      <version>0.1.3</version>
+      <version>0.1.4</version>
     </dependency>
     <dependency>
       <groupId>org.onebusaway</groupId>
@@ -59,8 +59,8 @@
    	 	<artifactId>maven-compiler-plugin</artifactId>
    	 	<version>3.1</version>
    	 	<configuration>
-   	 		<source>1.6</source>
-   	 		<target>1.6</target>
+   	 		<source>1.8</source>
+   	 		<target>1.8</target>
    	 	</configuration>
    	 </plugin>
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.conveyal</groupId>
     <artifactId>gtfs-validator</artifactId>
-    <version>0.1.3</version>
+    <version>0.1.4</version>
     <packaging>pom</packaging>
 
     <repositories>