erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Updated dependencies.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-02-05 12:53:03 -08:00
parent 2c1602f331
commit e1685ba706
8 changed files with 151 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

21
build.gradle
View file

@ -1,9 +1,19 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.coders-kitchen:compileonlyplugin:1.0.0'
}
}
plugins { plugins {
id "com.ewerk.gradle.plugins.annotation-processor" version "1.0.2" id "com.ewerk.gradle.plugins.annotation-processor" version "1.0.2"
id "com.github.ben-manes.versions" version "0.12.0"
} }
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'application' apply plugin: 'application'
apply plugin: 'compileOnly'
defaultTasks 'deploy' defaultTasks 'deploy'
@ -51,17 +61,18 @@ dependencies {
compile 'commons-codec:commons-codec:1.10' compile 'commons-codec:commons-codec:1.10'
compile 'commons-logging:commons-logging:1.2' compile 'commons-logging:commons-logging:1.2'
compile 'commons-net:commons-net:1.4.1' compile 'commons-net:commons-net:3.4'
compile 'commons-cli:commons-cli:1.2' compile 'commons-cli:commons-cli:1.3.1'
compile 'commons-httpclient:commons-httpclient:3.1' compile 'commons-httpclient:commons-httpclient:3.1'
compile 'oro:oro:2.0.8' compile 'oro:oro:2.0.8'
compile 'org.jdom:jdom:1.1.3' compile 'org.jdom:jdom:1.1.3'
compile 'org.jdom:jdom2:2.0.6'
compile 'org.jsoup:jsoup:1.8.3' compile 'org.jsoup:jsoup:1.8.3'
compile 'rome:rome:1.0@jar' compile 'rome:rome:1.0@jar'
compile 'rome:rome-fetcher:1.0@jar' compile 'rome:rome-fetcher:1.0@jar'
compile 'org.json:json:20150729' compile 'org.json:json:20151123'
compile 'org.ostermiller:utils:1.07.00' compile 'org.ostermiller:utils:1.07.00'
compile 'net.sourceforge.jweather:jweather:0.3.0@jar' compile 'net.sourceforge.jweather:jweather:0.3.0@jar'
@ -70,12 +81,12 @@ dependencies {
compile 'org.twitter4j:twitter4j-core:4.0.4' compile 'org.twitter4j:twitter4j-core:4.0.4'
compile 'net.sf.delicious-java:delicious:1.14' compile 'net.sf.delicious-java:delicious:1.14'
compile 'net.thauvin.erik:semver:0.9.1-beta' compileOnly 'net.thauvin.erik:semver:0.9.5-beta'
} }
annotationProcessor { annotationProcessor {
project.version = getVersion(isRelease) project.version = getVersion(isRelease)
library 'net.thauvin.erik:semver:0.9.1-beta' library 'net.thauvin.erik:semver:0.9.5-beta'
processor 'net.thauvin.erik.semver.VersionProcessor' processor 'net.thauvin.erik.semver.VersionProcessor'
} }

12
mobibot.iml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.6.1" relativePaths="false" type="JAVA_MODULE" version="4"> <module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.6.1-beta+002" relativePaths="false" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false"> <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" /> <output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" /> <output-test url="file://$MODULE_DIR$/build/classes/test" />
@ -18,8 +18,6 @@
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: log4j:log4j:1.2.17" level="project" /> <orderEntry type="library" exported="" name="Gradle: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" exported="" name="Gradle: pircbot:pircbot:1.5.0" level="project" /> <orderEntry type="library" exported="" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-net:commons-net:1.4.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-cli:commons-cli:1.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" exported="" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: oro:oro:2.0.8" level="project" /> <orderEntry type="library" exported="" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" exported="" name="Gradle: rome:rome:1.0" level="project" /> <orderEntry type="library" exported="" name="Gradle: rome:rome:1.0" level="project" />
@ -31,13 +29,15 @@
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" /> <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" /> <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20150729" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom:1.1.3" level="project" />
<orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.5" level="project" /> <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.5" level="project" />
<orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.1-beta" level="project" />
<orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" /> <orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" /> <orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" /> <orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Gradle: commons-net:commons-net:3.4" level="project" />
<orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.3.1" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom:2.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20151123" level="project" />
<orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.5-beta" level="project" />
</component> </component>
<component name="org.twodividedbyzero.idea.findbugs"> <component name="org.twodividedbyzero.idea.findbugs">
<option name="_basePreferences"> <option name="_basePreferences">

30
mobibot.ipr
View file

@ -400,13 +400,13 @@
</option> </option>
</component> </component>
<component name="libraryTable"> <component name="libraryTable">
<library name="Gradle: commons-cli:commons-cli:1.2"> <library name="Gradle: commons-cli:commons-cli:1.3.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.2/2bf96b7aa8b611c177d329452af1dc933e14501c/commons-cli-1.2.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.3.1/1303efbc4b181e5a58bf2e967dc156a3132b97c0/commons-cli-1.3.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.2/6c5459816530a1962ac18cd315cc775b1b384329/commons-cli-1.2-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.3.1/12ec02d8cb9fbb33bd05506109a4fc8bcc3578/commons-cli-1.3.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: commons-codec:commons-codec:1.10"> <library name="Gradle: commons-codec:commons-codec:1.10">
@ -454,13 +454,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/ecf26c7507d67782a3bbd148d170b31dfad001aa/commons-logging-1.2-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/ecf26c7507d67782a3bbd148d170b31dfad001aa/commons-logging-1.2-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: commons-net:commons-net:1.4.1"> <library name="Gradle: commons-net:commons-net:3.4">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/1.4.1/abb932adb2c10790c1eaa4365d3ac2a1ac7cb700/commons-net-1.4.1.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.4/5e984db9554728564d58e90da5d90eff8ae8cf2d/commons-net-3.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/1.4.1/4c85b39e7f03471338bf7d36558eefe1e463e3de/commons-net-1.4.1-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.4/8439b8f20d7bdec502423732798a639501732c8/commons-net-3.4-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: log4j:log4j:1.2.17"> <library name="Gradle: log4j:log4j:1.2.17">
@ -499,13 +499,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.jweather/jweather/0.3.0/385ecc27f62f9d7c31de57cee468a8df58cb415e/jweather-0.3.0-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.jweather/jweather/0.3.0/385ecc27f62f9d7c31de57cee468a8df58cb415e/jweather-0.3.0-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: net.thauvin.erik:semver:0.9.1-beta"> <library name="Gradle: net.thauvin.erik:semver:0.9.5-beta">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/semver/0.9.1-beta/644e4543823ae014b38e5f089f9d1c5cf9b5b1db/semver-0.9.1-beta.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.5-beta/semver-0.9.5-beta.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/semver/0.9.1-beta/f100911addb16b8924d91897972ae074925908fc/semver-0.9.1-beta-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.5-beta/semver-0.9.5-beta-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.apache.velocity:velocity:1.7"> <library name="Gradle: org.apache.velocity:velocity:1.7">
@ -517,22 +517,22 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.velocity/velocity/1.7/eb11eb70171ed64842b2e5216d5904e21ed162ac/velocity-1.7-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.velocity/velocity/1.7/eb11eb70171ed64842b2e5216d5904e21ed162ac/velocity-1.7-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.jdom:jdom:1.1.3"> <library name="Gradle: org.jdom:jdom:2.0.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/1.1.3/8bdfeb39fa929c35f5e4f0b02d34350db39a1efc/jdom-1.1.3.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/2.0.2/d06c71e0df0ac4b94deb737718580ccce22d92e8/jdom-2.0.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/1.1.3/b8b961a9f20d1faf160681c49f773a66b87efd63/jdom-1.1.3-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/2.0.2/2c0614e33230394e42f5cfe55c20d5ae8949c108/jdom-2.0.2-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.json:json:20150729"> <library name="Gradle: org.json:json:20151123">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20150729/7ad48f520e9f94787fdbf2beb9916c76971bdcb0/json-20150729.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20151123/1675d5c1142000dedd6627a73af26a8b885ef0e1/json-20151123.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20150729/d71e3dbedb977d57f76453af0bb43eed162adc30/json-20150729-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20151123/9c179a1becb79c6af729c89f7b212b1cb5e68da3/json-20151123-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.jsoup:jsoup:1.8.3"> <library name="Gradle: org.jsoup:jsoup:1.8.3">

205
src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
View file

@ -1,128 +1,129 @@
/* /*
* This file is automatically generated by the Semantic Version Annotation Processor. * This file is automatically generated.
* Do not modify this file -- YOUR CHANGES WILL BE ERASED! * Do not modify! -- ALL CHANGES WILL BE ERASED!
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import java.util.Date; import java.util.Date;
/** /**
* This class provides semantic version information. * Provides semantic version information.
* *
* @author Semantic Version Annotation Processor * @author <a href="https://github.com/ethauvin/semver">Semantic Version
* Annotation Processor</a>
*/ */
public final class ReleaseInfo { public final class ReleaseInfo {
private final static String buildmeta = "002"; private final static String buildmeta = "003";
private final static Date date = new Date(1453769004642L); private final static Date date = new Date(1454706693276L);
private final static int major = 0; private final static int major = 0;
private final static int minor = 6; private final static int minor = 6;
private final static int patch = 1; private final static int patch = 1;
private final static String prerelease = "beta"; private final static String prerelease = "beta";
private final static String project = "mobibot"; private final static String project = "mobibot";
/** /**
* Returns the build date. * Disables the default constructor.
* *
* @return The build date. * @throws UnsupportedOperationException If the constructor is called.
*/ */
public static Date getBuildDate() { private ReleaseInfo()
return date; throws UnsupportedOperationException {
} throw new UnsupportedOperationException("Illegal constructor call.");
}
/** /**
* Returns the full version string. * Returns the build date.
* <p> *
* Formatted as: * @return The build date.
* <blockquote> */
* <code>MAJOR.MINOR.PATCH[-PRERELEASE][+BUILDMETADATA]</code> public static Date getBuildDate() {
* </blockquote> return date;
* <p> }
* For example:
* <ul>
* <li><code>1.0.0</code></li>
* <li><code>1.0.0-beta</code></li>
* <li><code>1.0.0+20160124144700</code></li>
* <li><code>1.0.0-alpha+001</code></li>
* </ul>
*
* @return The version string.
*/
public static String getVersion() {
return Integer.toString(getMajor()) + '.'
+ Integer.toString(getMinor()) + '.'
+ Integer.toString(getPatch())
+ getPreRelease() + getBuildMetadata();
}
/** /**
* Returns the major version. * Returns the project name.
* *
* @return The major version. * @return The project name, if any.
*/ */
public static int getMajor() { public static String getProject() {
return major; return project;
} }
/** /**
* Returns the minor version. * Returns the full version string.
* * <p>
* @return The minor version. * Formatted as:
*/ * <blockquote>
public static int getMinor() { * <code>MAJOR.MINOR.PATCH[-PRERELEASE][+BUILDMETADATA]</code>
return minor; * </blockquote>
} * <p>
* For example:
* <ul>
* <li><code>1.0.0</code></li>
* <li><code>1.0.0-beta</code></li>
* <li><code>1.0.0+20160124144700</code></li>
* <li><code>1.0.0-alpha+001</code></li>
* </ul>
*
* @return The version string.
*/
public static String getVersion() {
return Integer.toString(getMajor()) + '.'
+ Integer.toString(getMinor()) + '.'
+ Integer.toString(getPatch())
+ getPreRelease() + getBuildMetadata();
}
/** /**
* Returns the patch version. * Returns the major version.
* *
* @return The patch version. * @return The major version.
*/ */
public static int getPatch() { public static int getMajor() {
return patch; return major;
} }
/** /**
* Returns the pre-release version. * Returns the minor version.
* *
* @return The pre-release version, if any. * @return The minor version.
*/ */
public static String getPreRelease() { public static int getMinor() {
if (prerelease.length() > 0) { return minor;
return '-' + prerelease; }
}
return ""; /**
} * Returns the patch version.
*
* @return The patch version.
*/
public static int getPatch() {
return patch;
}
/** /**
* Returns the project name. * Returns the pre-release version.
* *
* @return The project name, if any. * @return The pre-release version, if any.
*/ */
public static String getProject() { public static String getPreRelease() {
return project; if (prerelease.length() > 0) {
} return '-' + prerelease;
}
/** return "";
* Returns the build metadata. }
*
* @return The build metadata, if any.
*/
public static String getBuildMetadata() {
if (buildmeta.length() > 0) {
return '+' + buildmeta;
}
return ""; /**
} * Returns the build metadata.
*
/** * @return The build metadata, if any.
* Disables the default constructor. */
* public static String getBuildMetadata() {
* @throws UnsupportedOperationException if the constructor is called. if (buildmeta.length() > 0) {
*/ return '+' + buildmeta;
private ReleaseInfo() }
throws UnsupportedOperationException {
throw new UnsupportedOperationException("Illegal constructor call."); return "";
} }
} }

10
src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java
View file

@ -31,11 +31,11 @@
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.JDOMException; import org.jdom2.JDOMException;
import org.jdom.Namespace; import org.jdom2.Namespace;
import org.jdom.input.SAXBuilder; import org.jdom2.input.SAXBuilder;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;

4
src/main/java/net/thauvin/erik/mobibot/Lookup.java
View file

@ -31,7 +31,7 @@
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import org.apache.commons.net.WhoisClient; import org.apache.commons.net.whois.WhoisClient;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
@ -155,4 +155,4 @@ final class Lookup
return lines; return lines;
} }
} }

7
src/main/java/net/thauvin/erik/mobibot/Mobibot.java
View file

@ -394,13 +394,12 @@ public class Mobibot extends PircBot
Commands.DEBUG_ARG, Commands.DEBUG_ARG,
false, false,
"print debug & logging data directly to the console"); "print debug & logging data directly to the console");
//noinspection AccessStaticViaInstance options.addOption(Option.builder(Commands.PROPS_ARG.substring(0, 1)).hasArg().argName("file")
options.addOption(OptionBuilder.withArgName("file").hasArg().withDescription("use alternate properties file") .desc("use alternate properties file").longOpt(Commands.PROPS_ARG).build());
.withLongOpt(Commands.PROPS_ARG).create(Commands.PROPS_ARG.substring(0, 1)));
options.addOption(Commands.VERSION_ARG.substring(0, 1), Commands.VERSION_ARG, false, "print version info"); options.addOption(Commands.VERSION_ARG.substring(0, 1), Commands.VERSION_ARG, false, "print version info");
// Parse the command line // Parse the command line
final CommandLineParser parser = new PosixParser(); final CommandLineParser parser = new DefaultParser();
CommandLine line = null; CommandLine line = null;
try try

2
version.properties
View file

@ -5,4 +5,4 @@ version.major=0
version.minor=6 version.minor=6
version.patch=1 version.patch=1
version.prerelease=beta version.prerelease=beta
version.buildmeta=002 version.buildmeta=003