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 2015/09/30 20:55:57 UTC
svn commit: r1706130 - in /lucene/dev/branches/branch_5x: ./ dev-tools/
dev-tools/maven/pom.xml.template lucene/ lucene/common-build.xml
lucene/tools/ solr/ solr/common-build.xml
Author: uschindler
Date: Wed Sep 30 18:55:57 2015
New Revision: 1706130
URL: http://svn.apache.org/viewvc?rev=1706130&view=rev
Log:
Merged revision(s) 1706128 from lucene/dev/trunk:
LUCENE-6594: Update forbiddenapis to 2.0
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/dev-tools/ (props changed)
lucene/dev/branches/branch_5x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_5x/lucene/tools/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_5x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/maven/pom.xml.template?rev=1706130&r1=1706129&r2=1706130&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_5x/dev-tools/maven/pom.xml.template Wed Sep 30 18:55:57 2015
@@ -159,7 +159,7 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
- <version>1.8</version>
+ <version>2.0</version>
<configuration>
<!--
This is the default setting, we don't support too new Java versions.
Modified: lucene/dev/branches/branch_5x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/common-build.xml?rev=1706130&r1=1706129&r2=1706130&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/common-build.xml Wed Sep 30 18:55:57 2015
@@ -2447,9 +2447,9 @@ ${ant.project.name}.test.dependencies=${
<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="1.8"
+ <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="2.0"
inline="true" conf="default" transitive="true" pathid="forbidden-apis.classpath"/>
- <taskdef name="forbidden-apis" classname="de.thetaphi.forbiddenapis.AntTask" classpathref="forbidden-apis.classpath"/>
+ <taskdef name="forbidden-apis" classname="de.thetaphi.forbiddenapis.ant.AntTask" classpathref="forbidden-apis.classpath"/>
<property name="forbidden-apis.loaded" value="true"/>
</target>
@@ -2478,12 +2478,14 @@ ${ant.project.name}.test.dependencies=${
<!-- applies to both source and test code -->
<target name="-check-forbidden-all" depends="-init-forbidden-apis,compile-core,compile-test">
<forbidden-apis internalRuntimeForbidden="true" suppressAnnotation="**.SuppressForbidden" classpathref="forbidden-apis.allclasses.classpath">
- <bundledSignatures name="jdk-unsafe-${javac.target}"/>
- <bundledSignatures name="jdk-deprecated-${javac.target}"/>
- <signaturesFileSet dir="${common.dir}/tools/forbiddenApis">
- <include name="base.txt"/>
- <include name="lucene.txt" if="forbidden-isLucene"/>
- </signaturesFileSet>
+ <signatures>
+ <bundled name="jdk-unsafe-${javac.target}"/>
+ <bundled name="jdk-deprecated-${javac.target}"/>
+ <fileset dir="${common.dir}/tools/forbiddenApis">
+ <include name="base.txt"/>
+ <include name="lucene.txt" if="forbidden-isLucene"/>
+ </fileset>
+ </signatures>
<fileset dir="${build.dir}/classes/java" excludes="${forbidden-base-excludes}"/>
<fileset dir="${build.dir}/classes/test" excludes="${forbidden-tests-excludes}" erroronmissingdir="false"/>
</forbidden-apis>
Modified: lucene/dev/branches/branch_5x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/common-build.xml?rev=1706130&r1=1706129&r2=1706130&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/common-build.xml Wed Sep 30 18:55:57 2015
@@ -504,14 +504,16 @@
<target name="-check-forbidden-all" depends="-init-forbidden-apis,compile-core,compile-test">
<property file="${common.dir}/ivy-versions.properties"/> <!-- for commons-io version -->
<forbidden-apis internalRuntimeForbidden="true" suppressAnnotation="**.SuppressForbidden" classpathref="forbidden-apis.allclasses.classpath">
- <bundledSignatures name="jdk-unsafe-${javac.target}"/>
- <bundledSignatures name="jdk-deprecated-${javac.target}"/>
- <bundledSignatures name="commons-io-unsafe-${/commons-io/commons-io}"/>
- <signaturesFileSet dir="${common.dir}/tools/forbiddenApis">
- <include name="base.txt" />
- <include name="servlet-api.txt" />
- <include name="solr.txt" />
- </signaturesFileSet>
+ <signatures>
+ <bundled name="jdk-unsafe-${javac.target}"/>
+ <bundled name="jdk-deprecated-${javac.target}"/>
+ <bundled name="commons-io-unsafe-${/commons-io/commons-io}"/>
+ <fileset dir="${common.dir}/tools/forbiddenApis">
+ <include name="base.txt" />
+ <include name="servlet-api.txt" />
+ <include name="solr.txt" />
+ </fileset>
+ </signatures>
<fileset dir="${build.dir}/classes/java" excludes="${forbidden-base-excludes}"/>
<fileset dir="${build.dir}/classes/test" excludes="${forbidden-tests-excludes}" erroronmissingdir="false"/>
</forbidden-apis>