You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/06/19 19:27:45 UTC
lucene-solr:master: LUCENE-7346: Update forbiddenapis to version 2.2
Repository: lucene-solr
Updated Branches:
refs/heads/master 0aec9dd24 -> 0179b3fb2
LUCENE-7346: Update forbiddenapis to version 2.2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0179b3fb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0179b3fb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0179b3fb
Branch: refs/heads/master
Commit: 0179b3fb2d47a99e778e7d39c0b0a22aa4a89b30
Parents: 0aec9dd
Author: Uwe Schindler <us...@apache.org>
Authored: Sun Jun 19 21:27:34 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sun Jun 19 21:27:34 2016 +0200
----------------------------------------------------------------------
dev-tools/maven/pom.xml.template | 4 ++--
dev-tools/maven/solr/pom.xml.template | 6 ++----
lucene/CHANGES.txt | 3 +++
lucene/common-build.xml | 2 +-
solr/common-build.xml | 3 +--
.../core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java | 4 ++--
.../test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java | 2 +-
.../apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java | 3 ++-
.../org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java | 3 ++-
.../src/test/org/apache/solr/core/TestConfigSetImmutable.java | 3 ++-
10 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/dev-tools/maven/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index ccf22ca..adfe5b6 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -44,7 +44,7 @@
<specification.version>@spec.version@</specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>8</java.compat.version>
- <!-- HACK: the enforce and forbiddenapis plugin does not like new versioning: -->
+ <!-- HACK: the enforce plugin does not like new versioning: -->
<java.legacy-compat.version>1.${java.compat.version}</java.legacy-compat.version>
<jetty.version>9.3.8.v20160314</jetty.version>
@@ -161,7 +161,7 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<!--
This is the default setting, we don't support too new Java versions.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/dev-tools/maven/solr/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/pom.xml.template b/dev-tools/maven/solr/pom.xml.template
index 92b493d..6f2eb6d 100644
--- a/dev-tools/maven/solr/pom.xml.template
+++ b/dev-tools/maven/solr/pom.xml.template
@@ -124,8 +124,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
<bundledSignature>jdk-non-portable</bundledSignature>
<bundledSignature>jdk-reflection</bundledSignature>
- <!--TODO: fix this <bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature>-->
- <bundledSignature>commons-io-unsafe-2.4</bundledSignature>
+ <bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature>
</bundledSignatures>
<signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
@@ -147,8 +146,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
<bundledSignature>jdk-non-portable</bundledSignature>
<bundledSignature>jdk-reflection</bundledSignature>
- <!--TODO: fix this <bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature>-->
- <bundledSignature>commons-io-unsafe-2.4</bundledSignature>
+ <bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature>
</bundledSignatures>
<signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index c4c4f4c..a6170cd 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -66,6 +66,9 @@ Other
* LUCENE-7334: Update ASM dependency to 5.1. (Uwe Schindler)
+* LUCENE-7346: Update forbiddenapis to version 2.2.
+ (Uwe Schindler)
+
======================= Lucene 6.1.0 =======================
New Features
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/lucene/common-build.xml
----------------------------------------------------------------------
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 94b7910..0e588c6 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2330,7 +2330,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<property name="forbidden-sysout-excludes" value=""/>
<target name="-install-forbidden-apis" unless="forbidden-apis.loaded" depends="ivy-availability-check,ivy-configure">
- <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="2.1"
+ <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="2.2"
inline="true" conf="default" transitive="true" pathid="forbidden-apis.classpath"/>
<taskdef name="forbidden-apis" classname="de.thetaphi.forbiddenapis.ant.AntTask" classpathref="forbidden-apis.classpath"/>
<property name="forbidden-apis.loaded" value="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/solr/common-build.xml
----------------------------------------------------------------------
diff --git a/solr/common-build.xml b/solr/common-build.xml
index c6ff092..235070a 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -504,8 +504,7 @@
<!-- Forbidden API Task, customizations for Solr -->
<target name="-check-forbidden-all" depends="-init-forbidden-apis,compile-core,compile-test">
- <!--<property prefix="ivyversions" file="${common.dir}/ivy-versions.properties"/>--> <!-- for commons-io version -->
- <!-- HACK: --><property name="ivyversions./commons-io/commons-io" value="2.4"/>
+ <property prefix="ivyversions" file="${common.dir}/ivy-versions.properties"/><!-- for commons-io version -->
<forbidden-apis suppressAnnotation="**.SuppressForbidden" classpathref="forbidden-apis.allclasses.classpath" targetVersion="${javac.release}">
<signatures>
<bundled name="jdk-unsafe"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
index d7c590d..e3870dc 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
@@ -135,7 +135,7 @@ public class TestConfigSetsAPI extends SolrTestCaseJ4 {
FileUtils.copyDirectory(configDir, tmpConfigDir);
if (oldProps != null) {
FileUtils.write(new File(tmpConfigDir, ConfigSetProperties.DEFAULT_FILENAME),
- getConfigSetProps(oldProps));
+ getConfigSetProps(oldProps), StandardCharsets.UTF_8);
}
solrCluster.uploadConfigDir(tmpConfigDir, baseConfigSetName);
}
@@ -242,7 +242,7 @@ public class TestConfigSetsAPI extends SolrTestCaseJ4 {
// Ensure ConfigSet is immutable
FileUtils.copyDirectory(configDir, tmpConfigDir);
FileUtils.write(new File(tmpConfigDir, "configsetprops.json"),
- getConfigSetProps(ImmutableMap.<String, String>of("immutable", "true")));
+ getConfigSetProps(ImmutableMap.<String, String>of("immutable", "true")), StandardCharsets.UTF_8);
solrCluster.uploadConfigDir(tmpConfigDir, "configSet");
// no ConfigSet name
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
index eaade28..8fe9cb6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
@@ -134,7 +134,7 @@ public class TestConfigSetsAPIZkFailure extends SolrTestCaseJ4 {
FileUtils.copyDirectory(configDir, tmpConfigDir);
if (oldProps != null) {
FileUtils.write(new File(tmpConfigDir, ConfigSetProperties.DEFAULT_FILENAME),
- getConfigSetProps(oldProps));
+ getConfigSetProps(oldProps), StandardCharsets.UTF_8);
}
solrCluster.uploadConfigDir(tmpConfigDir, baseConfigSetName);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java
index 48f1710..37439b0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
import javax.security.auth.login.Configuration;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.Locale;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
@@ -113,7 +114,7 @@ public class TestMiniSolrCloudClusterKerberos extends TestMiniSolrCloudCluster {
javax.security.auth.login.Configuration.setConfiguration(conf);
String jaasFilePath = kdcDir+File.separator + "jaas-client.conf";
- FileUtils.write(new File(jaasFilePath), jaas);
+ FileUtils.write(new File(jaasFilePath), jaas, StandardCharsets.UTF_8);
System.setProperty("java.security.auth.login.config", jaasFilePath);
System.setProperty("solr.kerberos.cookie.domain", "127.0.0.1");
System.setProperty("solr.kerberos.principal", principal);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
index 1e2b242..6ac2254 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
@@ -17,6 +17,7 @@
package org.apache.solr.cloud;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
@@ -127,7 +128,7 @@ public class TestSolrCloudWithKerberosAlt extends LuceneTestCase {
Configuration.setConfiguration(conf);
String jaasFilePath = kdcDir+File.separator+"jaas-client.conf";
- FileUtils.write(new File(jaasFilePath), jaas);
+ FileUtils.write(new File(jaasFilePath), jaas, StandardCharsets.UTF_8);
System.setProperty("java.security.auth.login.config", jaasFilePath);
System.setProperty("solr.kerberos.jaas.appname", "SolrClient"); // Get this app name from the jaas file
System.setProperty("solr.kerberos.cookie.domain", "127.0.0.1");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0179b3fb/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
index 7c47ab1..30fac6a 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
@@ -18,6 +18,7 @@ package org.apache.solr.core;
import java.io.File;
import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.commons.io.FileUtils;
@@ -46,7 +47,7 @@ public class TestConfigSetImmutable extends RestTestBase {
File tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
// make the ConfigSet immutable
- FileUtils.write(new File(tmpConfDir, "configsetprops.json"), new StringBuilder("{\"immutable\":\"true\"}"));
+ FileUtils.write(new File(tmpConfDir, "configsetprops.json"), new StringBuilder("{\"immutable\":\"true\"}"), StandardCharsets.UTF_8);
System.setProperty("managed.schema.mutable", "true");