JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Shaun Bennett 2016-02-19 19:33:52 -06:00
parent 7032568a92 a84f8dd2d0
commit 8d7453b78e
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java
View File

@ -23,7 +23,7 @@ public class Mineplexer extends Plugin
Handler sentry = new SentryHandler(new DefaultRavenFactory().createRavenInstance( Handler sentry = new SentryHandler(new DefaultRavenFactory().createRavenInstance(
new Dsn("https://470f12378af3453ba089e0c0a0c9aae6:292516b722594784807aebb06db8ec38@app.getsentry.com/66323" new Dsn("https://470f12378af3453ba089e0c0a0c9aae6:292516b722594784807aebb06db8ec38@app.getsentry.com/66323"
))); )));
sentry.setLevel(Level.WARNING); sentry.setLevel(Level.SEVERE);
getProxy().getLogger().addHandler(sentry); getProxy().getLogger().addHandler(sentry);
} }
}); });

9
Plugins/Mineplex.ServerData/pom.xml
View File

@ -17,13 +17,16 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>redis.clients</groupId> <groupId>mysql</groupId>
<artifactId>jedis</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId> <artifactId>commons-dbcp2</artifactId>
<version>2.0.1</version> </dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

6
Plugins/pom.xml
View File

@ -77,6 +77,12 @@
<version>1.4.7</version> <version>1.4.7</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.14</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>net.kencochrane.raven</groupId> <groupId>net.kencochrane.raven</groupId>
<artifactId>raven</artifactId> <artifactId>raven</artifactId>