Skip to content

Commit

Permalink
Version overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
mgoellnitz committed Feb 19, 2019
1 parent c6728f2 commit 35f4ed9
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ allprojects {
useTestNG()
}
dependencies {
jacocoAgent "org.jacoco:org.jacoco.agent:0.7.9+"
jacocoAnt "org.jacoco:org.jacoco.ant:0.7.9+"
jacocoAgent "org.jacoco:org.jacoco.agent:0.8.3"
jacocoAnt "org.jacoco:org.jacoco.ant:0.8.3"
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright 2013-2017 Martin Goellnitz
* Copyright 2013-2019 Martin Goellnitz
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
Expand Down Expand Up @@ -36,12 +36,12 @@ public class TangramVersions {
String groovy = '2.4.13'
String asm = '5.2'
String velocity = '1.7'
String slf4j = '1.7.25'
String slf4j = '1.7.26'
String log4j = '1.2.17'
String logback = '1.2.3'
String yui = '2.4.7'
String mockito = '2.11.0'
String xstream = '1.4.10'
String yui = '2.4.8'
String mockito = '2.24.5'
String xstream = '1.4.11.1'
String pac4j = '2.1.0'
String mockftpserver = '2.7.1'
String tomcat = '8.0.47'
Expand All @@ -50,22 +50,22 @@ public class TangramVersions {

// For testing purposes
String junit = '4.12'
String testng = '6.13.1' // Gradle 4.2.1 has 6.3.1 - tests using e.g. testng listeners fail with other versions
String testng = '6.14.3' // Gradle 4.2.1 has 6.3.1 - tests using e.g. testng listeners fail with other versions
String hsqldb = '1.8.1.1'
String h2db = '1.4.196'
String h2db = '1.4.197'

// The dependency injection options
String dinistiq = '0.6'

String guice = '4.1.0'

String springframework = '4.3.12.RELEASE'
String springframework = '4.3.22.RELEASE'

String weld = '2.4.6.Final'
String openwebbeans = '2.0.3'

// Storage options
String jdo_api = 'org.datanucleus:javax.jdo:3.2.0-m7'
String jdo_api = 'org.datanucleus:javax.jdo:3.2.0-m10'
// There is no official source for a JPA API jar so we decide to use one of them
// String persistence_api = 'org.eclipse.persistence:javax.persistence:2.1.1'
String persistence_api = 'org.datanucleus:javax.persistence:2.2.0-release'
Expand Down
4 changes: 2 additions & 2 deletions servlet/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
*
* Copyright 2013-2017 Martin Goellnitz
* Copyright 2013-2019 Martin Goellnitz
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
Expand All @@ -20,7 +20,7 @@ apply from: '../lib.gradle'

dependencies {
compile project (':tangram-core')
compile "commons-fileupload:commons-fileupload:1.3.3"
compile "commons-fileupload:commons-fileupload:1.4"

testCompile "org.testng:testng:$versions.testng"
// test logging at debug level through special logback.groovy
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
*
* Copyright 2011-2017 Martin Goellnitz
* Copyright 2011-2019 Martin Goellnitz
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
Expand All @@ -20,7 +20,7 @@ println "Gradle: ${gradle.gradleVersion}"

rootProject.name = 'tangram'

include 'buildSrc', 'core', 'spring', 'servlet', 'dinistiq', 'guicy', 'mutable', 'editor', 'ftp', 'jdo', 'nucleus', 'jpa', 'coma', 'ebean', 'morphia', 'solr'
include 'buildSrc', 'core', 'spring', 'servlet', 'dinistiq', 'guicy', 'mutable', 'editor', 'ftp', 'jdo', 'nucleus', 'jpa', 'coma', 'ebean', 'morphia'

rootProject.children.each() {
it.name = it.parent.name + '-' + it.name
Expand Down
4 changes: 2 additions & 2 deletions spring/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
*
* Copyright 2013-2017 Martin Goellnitz
* Copyright 2013-2019 Martin Goellnitz
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
Expand All @@ -20,7 +20,7 @@ apply from: '../lib.gradle'

dependencies {
compile project (':tangram-core')
compile "commons-fileupload:commons-fileupload:1.3.3"
compile "commons-fileupload:commons-fileupload:1.4"

compile "org.springframework:spring-beans:$versions.springframework"
compile ("org.springframework:spring-core:$versions.springframework") {
Expand Down

0 comments on commit 35f4ed9

Please sign in to comment.