Skip to content

Commit

Permalink
Merge pull request #222 from aadrian/patch_1
Browse files Browse the repository at this point in the history
update bouncycastle and logback versions
  • Loading branch information
lhazlewood committed May 16, 2017
2 parents 5c0cfdc + 6546332 commit 879ed12
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 18 deletions.
24 changes: 21 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
# https://travis-ci.org/jwtk/jjwt

dist: trusty

sudo: required

language: java

jdk:
- oraclejdk7
- oraclejdk8
matrix:
include:
- jdk: oraclejdk8
addons:
apt:
packages:
- oracle-java8-installer
- jdk: oraclejdk7
addons:
apt:
packages:
- oracle-java7-installer

before_install:
- export BUILD_COVERAGE="$([ $TRAVIS_JDK_VERSION == 'oraclejdk8' ] && echo 'true')"

install: echo "No need to run mvn install -DskipTests then mvn install. Running mvn install."

script: mvn install

after_success:
- test -z "$BUILD_COVERAGE" || mvn clean test jacoco:report coveralls:report

30 changes: 15 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<properties>

<maven.jar.version>3.0.2</maven.jar.version>
<maven.compiler.version>3.5.1</maven.compiler.version>
<maven.compiler.version>3.6.1</maven.compiler.version>

<jdk.version>1.6</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -64,14 +64,14 @@
<jackson.version>2.8.2</jackson.version>

<!-- Optional Runtime Dependencies: -->
<bouncycastle.version>1.55</bouncycastle.version>
<bouncycastle.version>1.56</bouncycastle.version>

<!-- Test Dependencies: Only required for testing when building. Not required by users at runtime: -->
<groovy.version>2.4.7</groovy.version>
<logback.version>1.1.7</logback.version>
<groovy.version>2.4.11</groovy.version>
<logback.version>1.2.3</logback.version>
<easymock.version>3.4</easymock.version>
<junit.version>4.12</junit.version>
<powermock.version>1.6.5</powermock.version>
<powermock.version>1.6.6</powermock.version>
<failsafe.plugin.version>2.19.1</failsafe.plugin.version>

</properties>
Expand Down Expand Up @@ -159,7 +159,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<version>1.4.1</version>
<executions>
<execution>
<id>enforce-banned-dependencies</id>
Expand Down Expand Up @@ -247,7 +247,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<version>2.20</version>
<configuration>
<includes>
<include>**/*IT.java</include>
Expand All @@ -272,7 +272,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.6.201602180812</version>
<version>0.7.9</version>
<configuration>
<excludes>
<exclude>**/io/jsonwebtoken/lang/*</exclude>
Expand All @@ -290,12 +290,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
<version>2.5.3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9</version>
<version>1.9.5</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -308,7 +308,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<extensions>true</extensions>
<executions>
<execution>
Expand All @@ -334,7 +334,7 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.0.0</version>
<version>4.3.0</version>
</plugin>
</plugins>
</build>
Expand All @@ -356,7 +356,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -377,7 +377,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.3</version>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -390,7 +390,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down

0 comments on commit 879ed12

Please sign in to comment.