Dependencies updates.
This commit is contained in:
parent
b1ff19ac20
commit
a375af1352
3 changed files with 125 additions and 30 deletions
42
build.gradle
42
build.gradle
|
|
@ -9,18 +9,18 @@ apply plugin: 'application'
|
||||||
|
|
||||||
defaultTasks 'deploy'
|
defaultTasks 'deploy'
|
||||||
|
|
||||||
def packageName = 'net.thauvin.erik.mobibot'
|
final def packageName = 'net.thauvin.erik.mobibot'
|
||||||
def deployDir = 'deploy'
|
final def deployDir = 'deploy'
|
||||||
def isRelease = 'release' in gradle.startParameter.taskNames
|
def isRelease = 'release' in gradle.startParameter.taskNames
|
||||||
def semverJar = 'net.thauvin.erik:semver:1.0.1'
|
final def semverJar = 'net.thauvin.erik:semver:1.0.1'
|
||||||
|
|
||||||
def getVersion(isIncrement = false) {
|
def getVersion(isIncrement = false) {
|
||||||
def propsFile = 'version.properties'
|
final def propsFile = 'version.properties'
|
||||||
def majorKey = 'version.major'
|
final def majorKey = 'version.major'
|
||||||
def minorKey = 'version.minor'
|
final def minorKey = 'version.minor'
|
||||||
def patchKey = 'version.patch'
|
final def patchKey = 'version.patch'
|
||||||
def metaKey = 'version.buildmeta'
|
final def metaKey = 'version.buildmeta'
|
||||||
def preKey = 'version.prerelease'
|
final def preKey = 'version.prerelease'
|
||||||
if (isIncrement) {
|
if (isIncrement) {
|
||||||
ant.propertyfile(file: propsFile) {
|
ant.propertyfile(file: propsFile) {
|
||||||
entry(key: patchKey,
|
entry(key: patchKey,
|
||||||
|
|
@ -30,9 +30,9 @@ def getVersion(isIncrement = false) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
def p = new Properties()
|
def p = new Properties()
|
||||||
file(propsFile).withInputStream { stream -> p.load(stream) }
|
file(propsFile).withInputStream { final stream -> p.load(stream) }
|
||||||
def metadata = p.getProperty(metaKey, '')
|
final def metadata = p.getProperty(metaKey, '')
|
||||||
def prerelease = p.getProperty(preKey, '')
|
final def prerelease = p.getProperty(preKey, '')
|
||||||
return (p.getProperty(majorKey, '1') + '.' + p.getProperty(minorKey, '0') + '.' + p.getProperty(patchKey, '0') +
|
return (p.getProperty(majorKey, '1') + '.' + p.getProperty(minorKey, '0') + '.' + p.getProperty(patchKey, '0') +
|
||||||
(prerelease.length() > 0 ? '-' + prerelease : '') + (metadata.length() > 0 ? '+' + metadata : ''))
|
(prerelease.length() > 0 ? '-' + prerelease : '') + (metadata.length() > 0 ? '+' + metadata : ''))
|
||||||
}
|
}
|
||||||
|
|
@ -52,32 +52,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.9.1'
|
compile 'org.apache.logging.log4j:log4j-api:2.10.0'
|
||||||
compile 'org.apache.logging.log4j:log4j-core:2.9.1'
|
compile 'org.apache.logging.log4j:log4j-core:2.10.0'
|
||||||
compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1'
|
compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.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.0'
|
compile 'com.squareup.okhttp3:okhttp:3.9.1'
|
||||||
|
|
||||||
compile 'com.rometools:rome:1.8.0'
|
compile 'com.rometools:rome:1.9.0'
|
||||||
|
|
||||||
compile 'org.json:json:20171018'
|
compile 'org.json:json:20171018'
|
||||||
compile 'org.ostermiller:utils:1.07.00'
|
compile 'org.ostermiller:utils:1.07.00'
|
||||||
compile 'org.jsoup:jsoup:1.10.3'
|
compile 'org.jsoup:jsoup:1.11.2'
|
||||||
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.1'
|
compile 'net.thauvin.erik:pinboard-poster:0.9.3'
|
||||||
|
|
||||||
// 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.12'
|
testCompile 'org.testng:testng:6.13.1'
|
||||||
testCompile 'org.assertj:assertj-core:3.8.0'
|
testCompile 'org.assertj:assertj-core:3.9.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
|
|
||||||
|
|
@ -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.9.1",
|
compile("org.apache.logging.log4j:log4j-api:2.10.0",
|
||||||
"org.apache.logging.log4j:log4j-core:2.9.1",
|
"org.apache.logging.log4j:log4j-core:2.10.0",
|
||||||
"org.apache.logging.log4j:log4j-slf4j-impl:jar:2.9.1")
|
"org.apache.logging.log4j:log4j-slf4j-impl:jar:2.10.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.0")
|
compile("com.squareup.okhttp3:okhttp:3.9.1")
|
||||||
|
|
||||||
compile("com.rometools:rome:1.8.0")
|
compile("com.rometools:rome:1.9.0")
|
||||||
|
|
||||||
compile("org.json:json:20171018")
|
compile("org.json:json:20171018")
|
||||||
compile("org.ostermiller:utils:1.07.00")
|
compile("org.ostermiller:utils:1.07.00")
|
||||||
compile("org.jsoup:jsoup:1.10.3")
|
compile("org.jsoup:jsoup:1.11.2")
|
||||||
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.1")
|
compile("net.thauvin.erik:pinboard-poster:0.9.3")
|
||||||
|
|
||||||
// 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.12")
|
compile("org.testng:testng:6.13.1")
|
||||||
compile("org.assertj:assertj-core:3.8.0")
|
compile("org.assertj:assertj-core:3.9.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
apt {
|
apt {
|
||||||
|
|
|
||||||
95
pom.xml
Normal file
95
pom.xml
Normal file
|
|
@ -0,0 +1,95 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<version>0.7.2-beta+030</version>
|
||||||
|
<name>mobibot</name>
|
||||||
|
<description></description>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>pircbot</groupId>
|
||||||
|
<artifactId>pircbot</artifactId>
|
||||||
|
<version>1.5.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-api</artifactId>
|
||||||
|
<version>2.10.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-core</artifactId>
|
||||||
|
<version>2.10.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-slf4j-impl</artifactId>
|
||||||
|
<version>2.10.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-cli</groupId>
|
||||||
|
<artifactId>commons-cli</artifactId>
|
||||||
|
<version>1.4</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-net</groupId>
|
||||||
|
<artifactId>commons-net</artifactId>
|
||||||
|
<version>3.6</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.squareup.okhttp3</groupId>
|
||||||
|
<artifactId>okhttp</artifactId>
|
||||||
|
<version>3.9.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.rometools</groupId>
|
||||||
|
<artifactId>rome</artifactId>
|
||||||
|
<version>1.9.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.json</groupId>
|
||||||
|
<artifactId>json</artifactId>
|
||||||
|
<version>20171018</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ostermiller</groupId>
|
||||||
|
<artifactId>utils</artifactId>
|
||||||
|
<version>1.07.00</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jsoup</groupId>
|
||||||
|
<artifactId>jsoup</artifactId>
|
||||||
|
<version>1.11.2</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.objecthunter</groupId>
|
||||||
|
<artifactId>exp4j</artifactId>
|
||||||
|
<version>0.4.8</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.twitter4j</groupId>
|
||||||
|
<artifactId>twitter4j-core</artifactId>
|
||||||
|
<version>4.0.6</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.thauvin.erik</groupId>
|
||||||
|
<artifactId>pinboard-poster</artifactId>
|
||||||
|
<version>0.9.3</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<systemPath>K:\java\mobibot\.\lib\owm-japis-2.5.0.5.jar</systemPath>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.testng</groupId>
|
||||||
|
<artifactId>testng</artifactId>
|
||||||
|
<version>6.13.1</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.assertj</groupId>
|
||||||
|
<artifactId>assertj-core</artifactId>
|
||||||
|
<version>3.9.0</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue