Skip to content

Commit

Permalink
Merge pull request #2 from TheTransitClock/develop
Browse files Browse the repository at this point in the history
Syn dev
  • Loading branch information
vsperez authored Jan 28, 2019
2 parents bcd19e1 + 787afd5 commit f5e834f
Show file tree
Hide file tree
Showing 134 changed files with 9,435 additions and 1,345 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
*.jar
*.war
*.ear
*.log
/bin/
/.settings/
/.settings/
.DS_Store

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: java
jdk: oraclejdk8
jdk: openjdk8
cache:
directories:
- "$HOME/.m2"
Expand All @@ -24,4 +24,4 @@ deploy:
on:
repo: TheTransitClock/transitime
tags: false
all_branches: true
branch: develop
4 changes: 4 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<module>transitclockApi</module>
<module>transitclockWebapp</module>
<module>transitclockQuickStart</module>
<module>transitclockTraccarClient</module>
<module>transitclockBarefootClient</module>
</modules>
<profiles>
<profile>
Expand All @@ -28,6 +30,8 @@
<module>transitclockApi</module>
<module>transitclockWebapp</module>
<module>transitclockQuickStart</module>
<module>transitclockTraccarClient</module>
<module>transitclockBarefootClient</module>
</modules>
</profile>
</profiles>
Expand Down
53 changes: 49 additions & 4 deletions transitclock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<name>transitclockCore</name>
<repositories>

<!-- Needed to fix problem with one-jar not working with AWS SDK. Was getting
<!-- Needed to fix problem with one-jar not working with AWS SDK. Was getting
error message "Fatal: Failed to load the internal config for AWS" -->
<repository>
<snapshots>
Expand All @@ -30,7 +30,21 @@
</pluginRepository>
</pluginRepositories>
<dependencies>

<dependency>
<groupId>TheTransitClock</groupId>
<artifactId>transitclockBarefootClient</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>TheTransitClock</groupId>
<artifactId>transitclockTraccarClient</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
<version>1.1</version>
</dependency>
<!-- Needed to fix problem with one-jar not working with AWS SDK. Was getting
error message "Fatal: Failed to load the internal config for AWS" -->
<dependency>
Expand Down Expand Up @@ -230,13 +244,44 @@
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-jcs-core -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-core</artifactId>
<version>2.2</version>
</dependency>

<!-- Servlet related functionality -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>

<!-- OLS regression algorithm -->
<dependency>
<groupId>com.github.haifengl</groupId>
<artifactId>smile-core</artifactId>
<version>1.5.1</version>
</dependency>

<!-- Logback log appender for AWS CloudWatch -->
<dependency>
<groupId>com.j256.cloudwatchlogbackappender</groupId>
<artifactId>cloudwatchlogbackappender</artifactId>
<version>1.11</version>
</dependency>

<!-- OLS regression algorithm -->
<dependency>
<groupId>com.github.haifengl</groupId>
<artifactId>smile-core</artifactId>
<version>1.5.1</version>
</dependency>



</dependencies>

<build>
Expand All @@ -245,8 +290,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down
Loading

0 comments on commit f5e834f

Please sign in to comment.