Fix issues after merging in master

This commit is contained in:
Martijn van Groningen 2015-12-11 14:51:45 +01:00
parent 503a166b71
commit d38cccb8a1
5 changed files with 19 additions and 1 deletions

View File

@ -33,9 +33,10 @@ dependencies {
compile('com.fasterxml.jackson.core:jackson-databind:2.5.3')
compile('com.maxmind.db:maxmind-db:1.0.0')
compile "com.github.spullara.mustache.java:compiler:0.9.1"
compile 'joda-time:joda-time:2.8.2'
testCompile 'org.elasticsearch:geolite2-databases:20151029'
testCompile 'org.elasticsearch:securemock:1.1'
testCompile 'org.elasticsearch:securemock:1.2'
}
sourceSets {

View File

@ -0,0 +1 @@
14aec5344639782ee76441401b773946c65eb2b3

View File

@ -0,0 +1,14 @@
Copyright 2010 RightTime, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -0,0 +1 @@

View File

@ -20,4 +20,5 @@
grant {
// needed because geoip2 is using reflection to deserialize data into its own domain classes
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
permission java.lang.RuntimePermission "accessDeclaredMembers";
};