Skip to content

Commit

Permalink
Merge pull request #64 from lenhard/master
Browse files Browse the repository at this point in the history
Update dependencies if possible
  • Loading branch information
simonharrer committed Jul 21, 2015
2 parents c8017eb + cce4784 commit ede66ae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[master]
- Update dependencies: jersey, commons.logging, pdfbox, jgoodies, lazedlists, JDBC connectors
- Refactored preferences
- Remove local jgoodies dependency: replace SimpleInteralFrame with swingx JXTitledPanel and UIFSplitPane by JSplitPane
- Fix several FindBugs warnings
Expand Down
26 changes: 13 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ configurations {
dependencies {

// jgoodies
compile 'com.jgoodies:jgoodies-common:1.4.0'
compile 'com.jgoodies:jgoodies-forms:1.6.0'
compile 'com.jgoodies:jgoodies-looks:2.5.2'
compile 'com.jgoodies:jgoodies-common:1.7.0'
compile 'com.jgoodies:jgoodies-forms:1.7.2'
compile 'com.jgoodies:jgoodies-looks:2.5.3'

compile 'org.swinglabs:swingx:1.6.1'

compile 'org.apache.pdfbox:pdfbox:1.7.1'
compile 'org.apache.pdfbox:fontbox:1.7.1'
compile 'org.apache.pdfbox:jempbox:1.7.1'
compile 'org.apache.pdfbox:pdfbox:1.8.9'
compile 'org.apache.pdfbox:fontbox:1.8.9'
compile 'org.apache.pdfbox:jempbox:1.8.9'

compile 'commons-cli:commons-cli:1.3.1'

Expand All @@ -92,23 +92,23 @@ dependencies {
antlr3 'org.antlr:antlr:3.4'
compile 'org.antlr:antlr-runtime:3.4'

compile 'mysql:mysql-connector-java:5.0.7'
compile 'org.postgresql:postgresql:9.2-1002-jdbc4'
compile 'mysql:mysql-connector-java:5.1.36'
compile 'org.postgresql:postgresql:9.4-1201-jdbc41'

compile 'net.java.dev.glazedlists:glazedlists_java15:1.8.0'
compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
compile fileTree(dir: 'lib', includes: ['microba.jar', 'spin.jar'])

compile 'net.java.dev.jna:jna:4.1.0'

compile 'com.google.guava:guava:18.0'

compile 'commons-logging:commons-logging:1.0.2'
compile 'commons-logging:commons-logging:1.2'
// not available in maven repository
compile fileTree(dir: 'lib/plugin', includes: ['jpf.jar', 'jpf-boot.jar', 'JPFCodeGenerator-rt.jar'])

compile 'com.sun.jersey:jersey-client:1.14'
compile 'com.sun.jersey:jersey-core:1.14'
compile 'com.sun.jersey.contribs:jersey-multipart:1.14'
compile 'com.sun.jersey:jersey-client:1.19'
compile 'com.sun.jersey:jersey-core:1.19'
compile 'com.sun.jersey.contribs:jersey-multipart:1.19'

compile fileTree(dir: 'lib/spl/sciplore', includes: ['*.jar'])

Expand Down

0 comments on commit ede66ae

Please sign in to comment.