Updated dependencies.

This commit is contained in:
Erik C. Thauvin 2018-06-25 13:43:40 -07:00
parent 545b682035
commit 47b5ebc462
7 changed files with 27 additions and 78 deletions

View file

@ -1,6 +1,7 @@
plugins { plugins {
id "com.ewerk.gradle.plugins.annotation-processor" version "1.0.4" id "com.ewerk.gradle.plugins.annotation-processor" version "1.0.4"
id "com.github.ben-manes.versions" version "0.17.0" id "com.github.ben-manes.versions" version "0.20.0"
id "org.owasp.dependencycheck" version "3.2.1"
} }
apply plugin: 'java' apply plugin: 'java'
@ -52,32 +53,32 @@ dependencies {
compile 'pircbot:pircbot:1.5.0' compile 'pircbot:pircbot:1.5.0'
compileOnly 'pircbot:pircbot:1.5.0:sources' compileOnly 'pircbot:pircbot:1.5.0:sources'
compile 'org.apache.logging.log4j:log4j-api:2.10.0' compile 'org.apache.logging.log4j:log4j-api:2.11.0'
compile 'org.apache.logging.log4j:log4j-core:2.10.0' compile 'org.apache.logging.log4j:log4j-core:2.11.0'
compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.0'
compile 'commons-cli:commons-cli:1.4' compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6' compile 'commons-net:commons-net:3.6'
compile 'com.squareup.okhttp3:okhttp:3.9.1' compile 'com.squareup.okhttp3:okhttp:3.10.0'
compile 'com.rometools:rome:1.9.0' compile 'com.rometools:rome:1.10.0'
compile 'org.json:json:20171018' compile 'org.json:json:20180130'
compile 'org.ostermiller:utils:1.07.00' compile 'org.ostermiller:utils:1.07.00'
compile 'org.jsoup:jsoup:1.11.2' compile 'org.jsoup:jsoup:1.11.3'
compile 'net.objecthunter:exp4j:0.4.8' compile 'net.objecthunter:exp4j:0.4.8'
compile 'org.twitter4j:twitter4j-core:4.0.6' compile 'org.twitter4j:twitter4j-core:4.0.6'
compile 'net.thauvin.erik:pinboard-poster:0.9.3' compile 'net.thauvin.erik:pinboard-poster:1.0.0'
// https://bitbucket.org/akapribot/owm-japis // https://bitbucket.org/akapribot/owm-japis
compile files('lib/owm-japis-2.5.0.5.jar') compile files('lib/owm-japis-2.5.0.5.jar')
compileOnly semverJar compileOnly semverJar
testCompile 'org.testng:testng:6.13.1' testCompile 'org.testng:testng:6.14.3'
testCompile 'org.assertj:assertj-core:3.9.0' testCompile 'org.assertj:assertj-core:3.10.0'
} }
test { test {
@ -115,10 +116,6 @@ run {
args '--v' args '--v'
} }
task wrapper(type: Wrapper) {
gradleVersion = gradle.gradleVersion
}
task copyToDeploy(type: Copy) { task copyToDeploy(type: Copy) {
from('properties') from('properties')
from jar from jar

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View file

@ -57,22 +57,22 @@ val p = project {
compile("pircbot:pircbot:1.5.0") compile("pircbot:pircbot:1.5.0")
//compileOnly("pircbot:pircbot::sources:1.5.0") //compileOnly("pircbot:pircbot::sources:1.5.0")
compile("org.apache.logging.log4j:log4j-api:2.10.0", compile("org.apache.logging.log4j:log4j-api:2.11.0",
"org.apache.logging.log4j:log4j-core:2.10.0", "org.apache.logging.log4j:log4j-core:2.11.0",
"org.apache.logging.log4j:log4j-slf4j-impl:jar:2.10.0") "org.apache.logging.log4j:log4j-slf4j-impl:jar:2.11.0")
compile("commons-cli:commons-cli:1.4", "commons-net:commons-net:3.6") compile("commons-cli:commons-cli:1.4", "commons-net:commons-net:3.6")
compile("com.squareup.okhttp3:okhttp:3.9.1") compile("com.squareup.okhttp3:okhttp:3.10.0")
compile("com.rometools:rome:1.9.0") compile("com.rometools:rome:1.10.0")
compile("org.json:json:20171018") compile("org.json:json:20180130")
compile("org.ostermiller:utils:1.07.00") compile("org.ostermiller:utils:1.07.00")
compile("org.jsoup:jsoup:1.11.2") compile("org.jsoup:jsoup:1.11.3")
compile("net.objecthunter:exp4j:0.4.8") compile("net.objecthunter:exp4j:0.4.8")
compile("org.twitter4j:twitter4j-core:4.0.6") compile("org.twitter4j:twitter4j-core:4.0.6")
compile("net.thauvin.erik:pinboard-poster:0.9.3") compile("net.thauvin.erik:pinboard-poster:1.0.0")
// https://bitbucket.org/akapribot/owm-japis/ // https://bitbucket.org/akapribot/owm-japis/
compile(file("lib/owm-japis-2.5.0.5.jar")) compile(file("lib/owm-japis-2.5.0.5.jar"))
@ -82,8 +82,8 @@ val p = project {
} }
dependenciesTest { dependenciesTest {
compile("org.testng:testng:6.13.1") compile("org.testng:testng:6.14.3")
compile("org.assertj:assertj-core:3.9.0") compile("org.assertj:assertj-core:3.10.0")
} }
apt { apt {

View file

@ -1 +1 @@
kobalt.version=1.0.100 kobalt.version=1.0.114

View file

@ -1,19 +1,3 @@
/* enableFeaturePreview('STABLE_PUBLISHING')
* This settings file was auto generated by the Gradle buildInit task
* by 'erik' at '4/19/14 12:47 PM' with Gradle 1.11
*
* The settings file is used to specify which projects to include in your build.
* In a single project build this file can be empty or even removed.
*
* Detailed information about configuring a multi-project build in Gradle can be found
* in the user guide at http://gradle.org/docs/1.11/userguide/multi_project_builds.html
*/
/*
// To declare projects as part of a multi-project build use the 'include' method
include 'shared'
include 'api'
include 'services:webservice'
*/
rootProject.name = 'mobibot' rootProject.name = 'mobibot'

View file

@ -1,35 +1,3 @@
/*
* ReleaseInfo.java
*
* Copyright (c) 2004-2018, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* Neither the name of this project nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* /*
* This file is automatically generated. * This file is automatically generated.
* Do not modify! -- ALL CHANGES WILL BE ERASED! * Do not modify! -- ALL CHANGES WILL BE ERASED!
@ -50,7 +18,7 @@ public final class ReleaseInfo {
public final static String PROJECT = "mobibot"; public final static String PROJECT = "mobibot";
public final static LocalDateTime BUILDDATE = public final static LocalDateTime BUILDDATE =
LocalDateTime.ofInstant(Instant.ofEpochMilli(1516151817482L), ZoneId.systemDefault()); LocalDateTime.ofInstant(Instant.ofEpochMilli(1529959364831L), ZoneId.systemDefault());
public final static int MAJOR = 0; public final static int MAJOR = 0;
public final static int MINOR = 7; public final static int MINOR = 7;
public final static int PATCH = 2; public final static int PATCH = 2;