From 661aa9aa277aef96c57d7023a1496abd081b1017 Mon Sep 17 00:00:00 2001 From: oblonski Date: Fri, 29 Sep 2017 08:15:38 +0200 Subject: [PATCH] Merge branch 'master' into job-activity-refactoring # Conflicts: # jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ComputationalLaboratory.java # jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/HtmlBenchmarkTableWriter.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AccordingToPriorities.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractJob.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/MaxDistanceConstraint.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Job.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRoute.java # jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImpl.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/UnassignedJobListTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/LocationTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTraveledDistanceTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyDeliveryTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyPickupTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyServiceTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyShipmentTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImplTest.java # jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImplTest.java # jsprit-io/src/main/java/com/graphhopper/jsprit/io/problem/VrpXMLWriter.java # jsprit-io/src/test/java/com/graphhopper/jsprit/io/problem/VrpXMLWriterTest.java --- .travis.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40e6f9fc..2406cbd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,20 +4,3 @@ jdk: - oraclejdk7 - oraclejdk8 -deploy: - provider: script - script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy" - skip_cleanup: true - on: - tags: true - -# do not install anything instead return true via unix command true -install: true -script: mvn clean test -notifications: - email: - - github@graphhopper.com - -# enable container-based stack -sudo: false -