Skip to content

Commit

Permalink
Merge pull request #43 from TheTransitClock/tc_issue_31
Browse files Browse the repository at this point in the history
Tc issue 31
  • Loading branch information
scrudden authored Feb 6, 2018
2 parents 98a5d91 + 6c23c93 commit 7bdca84
Show file tree
Hide file tree
Showing 17 changed files with 67 additions and 378 deletions.
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@
*.classpath
*.iml
.idea/

# Package Files #
*.jar
*.war
*.ear
/bin/
<<<<<<< HEAD
.project
.classpath
=======
>>>>>>> 7f9fa2df466fd81ee86c633c4151b0dbb0c583f2
/.settings/
4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

25 changes: 22 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
language: java
jdk: oraclejdk8

cache:
directories:
- $HOME/.m2

- "$HOME/.m2"
script: mvn install -DskipTests
deploy:
provider: releases
api_key:
secure: gT/9kJv4oLzhXUsVOpASZi41BTiXRDohrryYg7o8txZG6caeki2B5lsLCYQlONe09IR3Mv2BwY6hcPX+GJlJa1Npvfn3Q9Th5IbYLAglRQoqDN/d3iyY8WhEY/ZqbUZ7vJXdpPNjwcyoA0dd2aA8N9pOC8QaFK43n47LCDAe+F16uGyxQN72TX4jCIANOvagVq8iUZtJUByFyubIGEHv0boEQNdODu5NdwzHsd0anCSd+Z/8zIu/rV5Ck1J5ecslqVJFSCs0LRrA3aFu31tf87KgT4+HomC79WHeo3hqrzCZ+PaqPJGrxYQ5j02Lw7rDBX3C8U9SqiP8piKKTXoHflNTWp4rrBT7Z/KehRChfXPvj3l+Oo6Nlz8e49du9HGpMbDRF6IUA5NiCrUotMR+MRMPrCmJcyLwaupPPr4Ha0+Tiy72T7Rp4oYpByuBvIrp8lzEZjKgKv4kpIkSiYhep7N3SoU5S98y6/S/FPWJvLceJrusi/LNFGCcMSY9Ntn4q1qKNt426eqksymcSy5G36DYopRDYg/z3vlTX1lyzPEWEkQv7PPlZu9MFJh0+7pUpadxuRLSiIpL9PtJ1sDPUvGVYSKGnBH2H64Wd8D13tnfPbtqPAsT+9bLFBk0mUbEGqXp93vMSs/Q9n+LC5+29rSdsO2IIR7gbLEquH/9rGo=
file:
- "transitclock/target/Core.jar"
- "transitclock/target/CreateAPIKey.jar"
- "transitclock/target/CreateWebAgency.jar"
- "transitclock/target/GtfsFileProcessor.jar"
- "transitclock/target/RmiQuery.jar"
- "transitclock/target/ScheduleGenerator.jar"
- "transitclock/target/SchemaGenerator.jar"
- "transitclock/target/transitclockCore-2.0.0-SNAPSHOT.jar"
- "transitclock/target/UpdateTravelTimes.jar"
- "transitclockWebapp/target/web.war"
- "transitclockApi/target/api.war"
skip_cleanup: true
on:
repo: TheTransitClock/transitime
tags: false
all_branches: true
37 changes: 0 additions & 37 deletions transitclock/.classpath

This file was deleted.

19 changes: 11 additions & 8 deletions transitclock/.gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
/bin/
*.class
*.project
*.classpath
*.iml
.idea/
# Package Files #
*.jar
*.war
*.ear
/target/
/.settings/
<<<<<<< HEAD
.project
.classpath
=======

>>>>>>> 7f9fa2df466fd81ee86c633c4151b0dbb0c583f2
/bin/
/.settings/
60 changes: 0 additions & 60 deletions transitclock/.project

This file was deleted.

32 changes: 0 additions & 32 deletions transitclockApi/.classpath

This file was deleted.

17 changes: 11 additions & 6 deletions transitclockApi/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
*.class
*.project
*.classpath
*.iml
.idea/
# Package Files #
*.jar
*.war
*.ear
/target/
/.settings/
<<<<<<< HEAD
/target/
=======

>>>>>>> 7f9fa2df466fd81ee86c633c4151b0dbb0c583f2
/bin/
/.settings/
67 changes: 0 additions & 67 deletions transitclockApi/.project

This file was deleted.

11 changes: 11 additions & 0 deletions transitclockIntegration/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
*.class
*.project
*.classpath
*.iml
.idea/
# Package Files #
*.jar
*.war
*.ear
/target/
/bin/
/.settings/
5 changes: 0 additions & 5 deletions transitclockIntegration/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions transitclockIntegration/.settings/org.eclipse.m2e.core.prefs

This file was deleted.

36 changes: 0 additions & 36 deletions transitclockQuickStart/.classpath

This file was deleted.

11 changes: 11 additions & 0 deletions transitclockQuickStart/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
*.class
*.project
*.classpath
*.iml
.idea/
# Package Files #
*.jar
*.war
*.ear
/target/
/bin/
/.settings/
29 changes: 0 additions & 29 deletions transitclockQuickStart/.project

This file was deleted.

Loading

0 comments on commit 7bdca84

Please sign in to comment.