re-enable forbidden apis

elastic · Sep 18, 2015 · a8f8f15 · uschindler · Sep 19, 2015 · a8f8f15
1 parent c55e556
commit a8f8f15
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,6 +1,15 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 apply plugin: 'groovy'
+// TODO: move common IDE configuration to a common file to include
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+idea {
+  project {
+    languageLevel = '1.8'
+    vcs = 'Git'
+  }
+}
 
 if (System.getenv().get('JAVA_HOME') == null) {
   throw new InvalidUserDataException('JAVA_HOME must be set')
@@ -19,14 +28,20 @@ repositories {
   }
 }
 
+configurations.all {
+    // check for updates every build
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
 dependencies {
   compile gradleApi()
   compile localGroovy()
   compile "com.carrotsearch.randomizedtesting:junit4-ant:2.2.0-snapshot-${randomizedRunnerSnapshotRevision}"
   compile(group: 'junit', name: 'junit', version: '4.11') {
     transitive = false
   }
-  compile 'de.thetaphi:forbiddenapis:2.0-SNAPSHOT'
+  //compile 'de.thetaphi:forbiddenapis:2.0-SNAPSHOT'
+  compile group: 'de.thetaphi', name: 'forbiddenapis', version: '2.0-SNAPSHOT', changing: true
 }
 
 Properties props = new Properties()

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -15,17 +15,18 @@ class BuildPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
+        //getClass().getResource('/forbidden/core-signatures.txt').openConnection().setDefaultUseCaches(false)
         project.pluginManager.apply('java')
         project.pluginManager.apply('carrotsearch.randomizedtesting')
-        //project.pluginManager.apply('de.thetaphi.forbiddenapis')
+        project.pluginManager.apply('de.thetaphi.forbiddenapis')
         // TODO: license checker
 
         Closure testConfig = createSharedTestConfig(project)
         RandomizedTestingTask test = configureTest(project.tasks, testConfig)
         RandomizedTestingTask integTest = configureIntegTest(project.tasks, getIntegTestClass(), test, testConfig)
 
         List<Task> precommitTasks = new ArrayList<>()
-        //precommitTasks.add(configureForbiddenApis(project))
+        precommitTasks.add(configureForbiddenApis(project))
         precommitTasks.add(configureForbiddenPatterns(project.tasks))
 
         Map precommitOptions = [

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/ForbiddenPatternsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/ForbiddenPatternsTask.groovy
@@ -63,7 +63,7 @@ class ForbiddenPatternsTask extends DefaultTask {
         Pattern allPatterns = Pattern.compile('(' + patterns.values().join(')|(') + ')')
         List<String> failures = new ArrayList<>()
         for (File f : files()) {
-            f.eachLine { line, lineNumber ->
+            f.eachLine('UTF-8') { line, lineNumber ->
                 if (allPatterns.matcher(line).find()) {
                     addErrorMessages(failures, f, (String)line, (int)lineNumber)
                 }