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:54:29 UTC
svn commit: r1706128 - in /lucene/dev/trunk:
dev-tools/maven/pom.xml.template lucene/common-build.xml
lucene/tools/forbiddenApis/base.txt solr/common-build.xml
Author: uschindler
Date: Wed Sep 30 18:54:29 2015
New Revision: 1706128
URL: http://svn.apache.org/viewvc?rev=1706128&view=rev
Log:
LUCENE-6594: Update forbiddenapis to 2.0
Modified:
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/lucene/tools/forbiddenApis/base.txt
lucene/dev/trunk/solr/common-build.xml
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1706128&r1=1706127&r2=1706128&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Wed Sep 30 18:54:29 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/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1706128&r1=1706127&r2=1706128&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Wed Sep 30 18:54:29 2015
@@ -2361,9 +2361,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>
@@ -2392,12 +2392,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/trunk/lucene/tools/forbiddenApis/base.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/forbiddenApis/base.txt?rev=1706128&r1=1706127&r2=1706128&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/forbiddenApis/base.txt (original)
+++ lucene/dev/trunk/lucene/tools/forbiddenApis/base.txt Wed Sep 30 18:54:29 2015
@@ -37,37 +37,3 @@ java.lang.Character#codePointAt(char[],i
java.io.File#delete() @ use Files.delete for real exception, IOUtils.deleteFilesIgnoringExceptions if you dont care
java.util.Collections#shuffle(java.util.List) @ Use shuffle(List, Random) instead so that it can be reproduced
-
-# START: forbidden-apis patch
-# TODO: remove this once forbidden-apis was updated to next version with following commit:
-# https://github.com/policeman-tools/forbidden-apis/commit/c34a02afcd7856478e9adfd32be2fc5bf82ca268
-
-@defaultMessage Uses default time zone
-java.time.LocalDateTime#now()
-java.time.LocalDate#now()
-java.time.LocalTime#now()
-java.time.OffsetDateTime#now()
-java.time.OffsetTime#now()
-java.time.Year#now()
-java.time.YearMonth#now()
-java.time.MonthDay#now()
-java.time.chrono.Chronology#dateNow()
-java.time.chrono.HijrahChronology#dateNow()
-java.time.chrono.JapaneseChronology#dateNow()
-java.time.chrono.MinguoChronology#dateNow()
-java.time.chrono.ThaiBuddhistChronology#dateNow()
-java.time.chrono.IsoChronology#dateNow()
-java.time.chrono.HijrahDate#now()
-java.time.chrono.JapaneseDate#now()
-java.time.chrono.MinguoDate#now()
-java.time.chrono.ThaiBuddhistDate#now()
-
-@defaultMessage Uses default locale
-java.time.format.DateTimeFormatterBuilder#toFormatter(java.time.format.ResolverStyle,java.time.chrono.Chronology)
-java.time.format.DateTimeFormatter#ofLocalizedDate(java.time.format.FormatStyle)
-java.time.format.DateTimeFormatter#ofLocalizedDateTime(java.time.format.FormatStyle,java.time.format.FormatStyle)
-java.time.format.DateTimeFormatter#ofLocalizedDateTime(java.time.format.FormatStyle)
-java.time.format.DateTimeFormatter#ofLocalizedTime(java.time.format.FormatStyle)
-java.time.format.DateTimeFormatter#ofPattern(java.lang.String)
-
-# END: forbidden-apis patch
\ No newline at end of file
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1706128&r1=1706127&r2=1706128&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Wed Sep 30 18:54:29 2015
@@ -494,14 +494,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>