From 51141e7b44ca57653f2faa84cb3c581e1536417c Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Wed, 9 Sep 2015 22:57:26 +0200 Subject: [PATCH 1/3] Update to Java 6 (for now with foreign jarjar, version 1.3 is incompatible with Java 6 - TODO fix this) --- build.xml | 20 +- ivy.xml | 2 +- .../de/thetaphi/forbiddenapis/Checker.java | 2 +- .../forbiddenapis/ForbiddenViolation.java | 2 +- .../thetaphi/forbiddenapis/StdIoLogger.java | 3 + .../thetaphi/forbiddenapis/ant/AntTask.java | 3 + .../gradle/CheckForbiddenApis.java | 17 + .../gradle/ForbiddenApisPlugin.java | 2 +- .../maven/AbstractCheckMojo.java | 5 +- .../signatures/jdk-deprecated-1.5.txt | 407 ------------------ .../signatures/jdk-unsafe-1.5.txt | 106 ----- .../signatures/jdk-unsafe-1.6.txt | 87 +++- 12 files changed, 126 insertions(+), 530 deletions(-) delete mode 100644 src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-deprecated-1.5.txt delete mode 100644 src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.5.txt diff --git a/build.xml b/build.xml index 9f2fafc6..835689ff 100644 --- a/build.xml +++ b/build.xml @@ -25,9 +25,9 @@ - + - + @@ -53,7 +53,6 @@ --> - @@ -81,7 +80,7 @@ - + @@ -124,7 +123,6 @@ - @@ -194,7 +192,7 @@ - + @@ -529,17 +527,17 @@ + nowarn="true" source="1.6" target="1.6" debug="true" deprecation="false" encoding="${build.encoding}"> - - + + + nowarn="true" source="1.6" target="1.6" debug="true" deprecation="false" encoding="${build.encoding}"/> @@ -549,7 +547,7 @@ nowarn="true" source="1.8" target="1.8" debug="true" deprecation="false" encoding="${build.encoding}"/> - + diff --git a/ivy.xml b/ivy.xml index a23b42fe..15887c7a 100644 --- a/ivy.xml +++ b/ivy.xml @@ -43,7 +43,7 @@ --> - + diff --git a/src/main/java/de/thetaphi/forbiddenapis/Checker.java b/src/main/java/de/thetaphi/forbiddenapis/Checker.java index b0e00530..0f84cc6d 100644 --- a/src/main/java/de/thetaphi/forbiddenapis/Checker.java +++ b/src/main/java/de/thetaphi/forbiddenapis/Checker.java @@ -214,7 +214,7 @@ private ClassSignature getClassFromClassLoader(final String clazz) throws ClassN return c; } - // not before Java 6: @Override + @Override public ClassSignature lookupRelatedClass(String internalName) { final Type type = Type.getObjectType(internalName); if (type.getSort() != Type.OBJECT) { diff --git a/src/main/java/de/thetaphi/forbiddenapis/ForbiddenViolation.java b/src/main/java/de/thetaphi/forbiddenapis/ForbiddenViolation.java index f56289f4..d852e052 100644 --- a/src/main/java/de/thetaphi/forbiddenapis/ForbiddenViolation.java +++ b/src/main/java/de/thetaphi/forbiddenapis/ForbiddenViolation.java @@ -65,7 +65,7 @@ public String format(String className, String source) { return sb.toString(); } - // not before Java 6: @Override + @Override public int compareTo(ForbiddenViolation other) { if (this.groupId == other.groupId) { return Long.signum((long) this.lineNo - (long) other.lineNo); diff --git a/src/main/java/de/thetaphi/forbiddenapis/StdIoLogger.java b/src/main/java/de/thetaphi/forbiddenapis/StdIoLogger.java index c7525f48..12c25525 100644 --- a/src/main/java/de/thetaphi/forbiddenapis/StdIoLogger.java +++ b/src/main/java/de/thetaphi/forbiddenapis/StdIoLogger.java @@ -23,14 +23,17 @@ public final class StdIoLogger implements Logger { private StdIoLogger() {} + @Override public void error(String msg) { System.err.println("ERROR: " + msg); } + @Override public void warn(String msg) { System.err.println("WARNING: " + msg); } + @Override public void info(String msg) { System.out.println(msg); } diff --git a/src/main/java/de/thetaphi/forbiddenapis/ant/AntTask.java b/src/main/java/de/thetaphi/forbiddenapis/ant/AntTask.java index 8a25095c..e970623c 100644 --- a/src/main/java/de/thetaphi/forbiddenapis/ant/AntTask.java +++ b/src/main/java/de/thetaphi/forbiddenapis/ant/AntTask.java @@ -91,15 +91,18 @@ public void execute() throws BuildException { if (failOnViolation) options.add(FAIL_ON_VIOLATION); if (failOnUnresolvableSignatures) options.add(FAIL_ON_UNRESOLVABLE_SIGNATURES); final Checker checker = new Checker(new Logger() { + @Override public void error(String msg) { log(msg, Project.MSG_ERR); } + @Override public void warn(String msg) { // ANT has no real log levels printed, so prefix with "WARNING": log("WARNING: " + msg, Project.MSG_WARN); } + @Override public void info(String msg) { log(msg, Project.MSG_INFO); } diff --git a/src/main/java/de/thetaphi/forbiddenapis/gradle/CheckForbiddenApis.java b/src/main/java/de/thetaphi/forbiddenapis/gradle/CheckForbiddenApis.java index 84d19498..05ee7b18 100644 --- a/src/main/java/de/thetaphi/forbiddenapis/gradle/CheckForbiddenApis.java +++ b/src/main/java/de/thetaphi/forbiddenapis/gradle/CheckForbiddenApis.java @@ -215,10 +215,12 @@ public void setFailOnUnresolvableSignatures(boolean failOnUnresolvableSignatures * Other ForbiddenApis implementations use another name: {@code failOnViolation} * Default is {@code false}. */ + @Override public boolean getIgnoreFailures() { return data.ignoreFailures; } + @Override public void setIgnoreFailures(boolean ignoreFailures) { data.ignoreFailures = ignoreFailures; } @@ -256,11 +258,13 @@ public void setSuppressAnnotations(List suppressAnnotations) { * The default is a single include with pattern '**/*.class' * @since 1.0 */ + @Override @Input public Set getIncludes() { return getPatternSet().getIncludes(); } + @Override public CheckForbiddenApis setIncludes(Iterable includes) { getPatternSet().setIncludes(includes); return this; @@ -272,51 +276,61 @@ public CheckForbiddenApis setIncludes(Iterable includes) { * Set of patterns matching class files to be excluded from checking. * @since 1.0 */ + @Override @Input public Set getExcludes() { return getPatternSet().getExcludes(); } + @Override public CheckForbiddenApis setExcludes(Iterable excludes) { getPatternSet().setExcludes(excludes); return this; } + @Override public CheckForbiddenApis exclude(String... arg0) { getPatternSet().exclude(arg0); return this; } + @Override public CheckForbiddenApis exclude(Iterable arg0) { getPatternSet().exclude(arg0); return this; } + @Override public CheckForbiddenApis exclude(Spec arg0) { getPatternSet().exclude(arg0); return this; } + @Override public CheckForbiddenApis exclude(@SuppressWarnings("rawtypes") Closure arg0) { getPatternSet().exclude(arg0); return this; } + @Override public CheckForbiddenApis include(String... arg0) { getPatternSet().include(arg0); return this; } + @Override public CheckForbiddenApis include(Iterable arg0) { getPatternSet().include(arg0); return this; } + @Override public CheckForbiddenApis include(Spec arg0) { getPatternSet().include(arg0); return this; } + @Override public CheckForbiddenApis include(@SuppressWarnings("rawtypes") Closure arg0) { getPatternSet().include(arg0); return this; @@ -346,14 +360,17 @@ public void checkForbidden() throws ForbiddenApiException { } final Logger log = new Logger() { + @Override public void error(String msg) { getLogger().error(msg); } + @Override public void warn(String msg) { getLogger().warn(msg); } + @Override public void info(String msg) { getLogger().info(msg); } diff --git a/src/main/java/de/thetaphi/forbiddenapis/gradle/ForbiddenApisPlugin.java b/src/main/java/de/thetaphi/forbiddenapis/gradle/ForbiddenApisPlugin.java index b5dc856c..799bdab2 100644 --- a/src/main/java/de/thetaphi/forbiddenapis/gradle/ForbiddenApisPlugin.java +++ b/src/main/java/de/thetaphi/forbiddenapis/gradle/ForbiddenApisPlugin.java @@ -46,7 +46,7 @@ public class ForbiddenApisPlugin implements Plugin { /** Name of the base task that depends on one for every SourceSet */ public static final String FORBIDDEN_APIS_EXTENSION_NAME = "forbiddenApis"; - // Not before Java 6: @Override + @Override public void apply(final Project project) { final String scriptText; try { diff --git a/src/main/java/de/thetaphi/forbiddenapis/maven/AbstractCheckMojo.java b/src/main/java/de/thetaphi/forbiddenapis/maven/AbstractCheckMojo.java index 7a44009d..b15882c8 100644 --- a/src/main/java/de/thetaphi/forbiddenapis/maven/AbstractCheckMojo.java +++ b/src/main/java/de/thetaphi/forbiddenapis/maven/AbstractCheckMojo.java @@ -175,7 +175,7 @@ protected String getTargetVersion() { return targetVersion; } - // Not in Java 5: @Override + @Override public void execute() throws MojoExecutionException, MojoFailureException { final Log log = getLog(); @@ -219,14 +219,17 @@ public void execute() throws MojoExecutionException, MojoFailureException { if (failOnViolation) options.add(FAIL_ON_VIOLATION); if (failOnUnresolvableSignatures) options.add(FAIL_ON_UNRESOLVABLE_SIGNATURES); final Checker checker = new Checker(new Logger() { + @Override public void error(String msg) { log.error(msg); } + @Override public void warn(String msg) { log.warn(msg); } + @Override public void info(String msg) { log.info(msg); } diff --git a/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-deprecated-1.5.txt b/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-deprecated-1.5.txt deleted file mode 100644 index 6067cd8d..00000000 --- a/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-deprecated-1.5.txt +++ /dev/null @@ -1,407 +0,0 @@ -# This file contains API signatures extracted from the rt.jar / jimage file shipped with the class library of Oracle's Java Runtime Environment. -# It is provided here for reference, but can easily regenerated by executing from the source folder of forbidden-apis: -# $ ant generate-deprecated - -# This file contains all public, deprecated API signatures in Java version 1.5 (extracted from build 1.5.0_22). - -@ignoreUnresolvable -@defaultMessage Deprecated in Java 1.5 - -java.awt.BorderLayout#addLayoutComponent(java.lang.String,java.awt.Component) -java.awt.CardLayout#addLayoutComponent(java.lang.String,java.awt.Component) -java.awt.CheckboxGroup#getCurrent() -java.awt.CheckboxGroup#setCurrent(java.awt.Checkbox) -java.awt.Choice#countItems() -java.awt.Component#action(java.awt.Event,java.lang.Object) -java.awt.Component#bounds() -java.awt.Component#deliverEvent(java.awt.Event) -java.awt.Component#disable() -java.awt.Component#enable() -java.awt.Component#enable(boolean) -java.awt.Component#getPeer() -java.awt.Component#gotFocus(java.awt.Event,java.lang.Object) -java.awt.Component#handleEvent(java.awt.Event) -java.awt.Component#hide() -java.awt.Component#inside(int,int) -java.awt.Component#isFocusTraversable() -java.awt.Component#keyDown(java.awt.Event,int) -java.awt.Component#keyUp(java.awt.Event,int) -java.awt.Component#layout() -java.awt.Component#locate(int,int) -java.awt.Component#location() -java.awt.Component#lostFocus(java.awt.Event,java.lang.Object) -java.awt.Component#minimumSize() -java.awt.Component#mouseDown(java.awt.Event,int,int) -java.awt.Component#mouseDrag(java.awt.Event,int,int) -java.awt.Component#mouseEnter(java.awt.Event,int,int) -java.awt.Component#mouseExit(java.awt.Event,int,int) -java.awt.Component#mouseMove(java.awt.Event,int,int) -java.awt.Component#mouseUp(java.awt.Event,int,int) -java.awt.Component#move(int,int) -java.awt.Component#nextFocus() -java.awt.Component#postEvent(java.awt.Event) -java.awt.Component#preferredSize() -java.awt.Component#reshape(int,int,int,int) -java.awt.Component#resize(int,int) -java.awt.Component#resize(java.awt.Dimension) -java.awt.Component#show() -java.awt.Component#show(boolean) -java.awt.Component#size() -java.awt.ComponentOrientation#getOrientation(java.util.ResourceBundle) -java.awt.Container#countComponents() -java.awt.Container#deliverEvent(java.awt.Event) -java.awt.Container#insets() -java.awt.Container#layout() -java.awt.Container#locate(int,int) -java.awt.Container#minimumSize() -java.awt.Container#preferredSize() -java.awt.Dialog#hide() -java.awt.Dialog#show() -java.awt.Font#getPeer() -java.awt.FontMetrics#getMaxDecent() -java.awt.Frame#CROSSHAIR_CURSOR -java.awt.Frame#DEFAULT_CURSOR -java.awt.Frame#E_RESIZE_CURSOR -java.awt.Frame#HAND_CURSOR -java.awt.Frame#MOVE_CURSOR -java.awt.Frame#NE_RESIZE_CURSOR -java.awt.Frame#NW_RESIZE_CURSOR -java.awt.Frame#N_RESIZE_CURSOR -java.awt.Frame#SE_RESIZE_CURSOR -java.awt.Frame#SW_RESIZE_CURSOR -java.awt.Frame#S_RESIZE_CURSOR -java.awt.Frame#TEXT_CURSOR -java.awt.Frame#WAIT_CURSOR -java.awt.Frame#W_RESIZE_CURSOR -java.awt.Frame#getCursorType() -java.awt.Frame#setCursor(int) -java.awt.Graphics#getClipRect() -java.awt.List#addItem(java.lang.String) -java.awt.List#addItem(java.lang.String,int) -java.awt.List#allowsMultipleSelections() -java.awt.List#clear() -java.awt.List#countItems() -java.awt.List#delItem(int) -java.awt.List#delItems(int,int) -java.awt.List#isSelected(int) -java.awt.List#minimumSize() -java.awt.List#minimumSize(int) -java.awt.List#preferredSize() -java.awt.List#preferredSize(int) -java.awt.List#setMultipleSelections(boolean) -java.awt.Menu#countItems() -java.awt.MenuBar#countMenus() -java.awt.MenuComponent#getPeer() -java.awt.MenuComponent#postEvent(java.awt.Event) -java.awt.MenuContainer#postEvent(java.awt.Event) -java.awt.MenuItem#disable() -java.awt.MenuItem#enable() -java.awt.MenuItem#enable(boolean) -java.awt.Polygon#getBoundingBox() -java.awt.Polygon#inside(int,int) -java.awt.Rectangle#inside(int,int) -java.awt.Rectangle#move(int,int) -java.awt.Rectangle#reshape(int,int,int,int) -java.awt.Rectangle#resize(int,int) -java.awt.ScrollPane#layout() -java.awt.Scrollbar#getLineIncrement() -java.awt.Scrollbar#getPageIncrement() -java.awt.Scrollbar#getVisible() -java.awt.Scrollbar#setLineIncrement(int) -java.awt.Scrollbar#setPageIncrement(int) -java.awt.TextArea#appendText(java.lang.String) -java.awt.TextArea#insertText(java.lang.String,int) -java.awt.TextArea#minimumSize() -java.awt.TextArea#minimumSize(int,int) -java.awt.TextArea#preferredSize() -java.awt.TextArea#preferredSize(int,int) -java.awt.TextArea#replaceText(java.lang.String,int,int) -java.awt.TextField#minimumSize() -java.awt.TextField#minimumSize(int) -java.awt.TextField#preferredSize() -java.awt.TextField#preferredSize(int) -java.awt.TextField#setEchoCharacter(char) -java.awt.Toolkit#getFontList() -java.awt.Toolkit#getFontMetrics(java.awt.Font) -java.awt.Toolkit#getFontPeer(java.lang.String,int) -java.awt.Window#applyResourceBundle(java.lang.String) -java.awt.Window#applyResourceBundle(java.util.ResourceBundle) -java.awt.Window#hide() -java.awt.Window#postEvent(java.awt.Event) -java.awt.Window#show() -java.awt.datatransfer.DataFlavor#equals(java.lang.String) -java.awt.datatransfer.DataFlavor#normalizeMimeType(java.lang.String) -java.awt.datatransfer.DataFlavor#normalizeMimeTypeParameter(java.lang.String,java.lang.String) -java.awt.datatransfer.DataFlavor#plainTextFlavor -java.awt.event.KeyEvent#(java.awt.Component,int,long,int,int) -java.awt.event.KeyEvent#setModifiers(int) -java.awt.image.renderable.RenderContext#concetenateTransform(java.awt.geom.AffineTransform) -java.awt.image.renderable.RenderContext#preConcetenateTransform(java.awt.geom.AffineTransform) -java.io.ByteArrayOutputStream#toString(int) -java.io.DataInputStream#readLine() -java.io.LineNumberInputStream -java.io.ObjectInputStream#readLine() -java.io.ObjectOutputStream$PutField#write(java.io.ObjectOutput) -java.io.StreamTokenizer#(java.io.InputStream) -java.io.StringBufferInputStream -java.lang.Character#isJavaLetter(char) -java.lang.Character#isJavaLetterOrDigit(char) -java.lang.Character#isSpace(char) -java.lang.Character$UnicodeBlock#SURROGATES_AREA -java.lang.ClassLoader#defineClass(byte[],int,int) -java.lang.Runtime#getLocalizedInputStream(java.io.InputStream) -java.lang.Runtime#getLocalizedOutputStream(java.io.OutputStream) -java.lang.Runtime#runFinalizersOnExit(boolean) -java.lang.SecurityManager#checkMulticast(java.net.InetAddress,byte) -java.lang.SecurityManager#classDepth(java.lang.String) -java.lang.SecurityManager#classLoaderDepth() -java.lang.SecurityManager#currentClassLoader() -java.lang.SecurityManager#currentLoadedClass() -java.lang.SecurityManager#getInCheck() -java.lang.SecurityManager#inCheck -java.lang.SecurityManager#inClass(java.lang.String) -java.lang.SecurityManager#inClassLoader() -java.lang.String#(byte[],int) -java.lang.String#(byte[],int,int,int) -java.lang.String#getBytes(int,int,byte[],int) -java.lang.System#runFinalizersOnExit(boolean) -java.lang.Thread#countStackFrames() -java.lang.Thread#destroy() -java.lang.Thread#resume() -java.lang.Thread#stop() -java.lang.Thread#stop(java.lang.Throwable) -java.lang.Thread#suspend() -java.lang.ThreadGroup#allowThreadSuspension(boolean) -java.lang.ThreadGroup#resume() -java.lang.ThreadGroup#stop() -java.lang.ThreadGroup#suspend() -java.net.DatagramSocketImpl#getTTL() -java.net.DatagramSocketImpl#setTTL(byte) -java.net.HttpURLConnection#HTTP_SERVER_ERROR -java.net.MulticastSocket#getTTL() -java.net.MulticastSocket#send(java.net.DatagramPacket,byte) -java.net.MulticastSocket#setTTL(byte) -java.net.Socket#(java.lang.String,int,boolean) -java.net.Socket#(java.net.InetAddress,int,boolean) -java.net.URLConnection#getDefaultRequestProperty(java.lang.String) -java.net.URLConnection#setDefaultRequestProperty(java.lang.String,java.lang.String) -java.net.URLDecoder#decode(java.lang.String) -java.net.URLEncoder#encode(java.lang.String) -java.net.URLStreamHandler#setURL(java.net.URL,java.lang.String,java.lang.String,int,java.lang.String,java.lang.String) -java.rmi.RMISecurityException -java.rmi.ServerRuntimeException -java.rmi.dgc.VMID#isUnique() -java.rmi.registry.RegistryHandler -java.rmi.server.LoaderHandler -java.rmi.server.LogStream -java.rmi.server.Operation -java.rmi.server.RMIClassLoader#getSecurityContext(java.lang.ClassLoader) -java.rmi.server.RMIClassLoader#loadClass(java.lang.String) -java.rmi.server.RemoteCall -java.rmi.server.RemoteRef#done(java.rmi.server.RemoteCall) -java.rmi.server.RemoteRef#invoke(java.rmi.server.RemoteCall) -java.rmi.server.RemoteRef#newCall(java.rmi.server.RemoteObject,java.rmi.server.Operation[],int,long) -java.rmi.server.RemoteStub#setRef(java.rmi.server.RemoteStub,java.rmi.server.RemoteRef) -java.rmi.server.Skeleton -java.rmi.server.SkeletonMismatchException -java.rmi.server.SkeletonNotFoundException -java.security.Certificate -java.security.Identity -java.security.IdentityScope -java.security.Security#getAlgorithmProperty(java.lang.String,java.lang.String) -java.security.Signature#getParameter(java.lang.String) -java.security.Signature#setParameter(java.lang.String,java.lang.Object) -java.security.SignatureSpi#engineGetParameter(java.lang.String) -java.security.SignatureSpi#engineSetParameter(java.lang.String,java.lang.Object) -java.security.Signer -java.sql.CallableStatement#getBigDecimal(int,int) -java.sql.Date#(int,int,int) -java.sql.Date#getHours() -java.sql.Date#getMinutes() -java.sql.Date#getSeconds() -java.sql.Date#setHours(int) -java.sql.Date#setMinutes(int) -java.sql.Date#setSeconds(int) -java.sql.DriverManager#getLogStream() -java.sql.DriverManager#setLogStream(java.io.PrintStream) -java.sql.PreparedStatement#setUnicodeStream(int,java.io.InputStream,int) -java.sql.ResultSet#getBigDecimal(int,int) -java.sql.ResultSet#getBigDecimal(java.lang.String,int) -java.sql.ResultSet#getUnicodeStream(int) -java.sql.ResultSet#getUnicodeStream(java.lang.String) -java.sql.Time#(int,int,int) -java.sql.Time#getDate() -java.sql.Time#getDay() -java.sql.Time#getMonth() -java.sql.Time#getYear() -java.sql.Time#setDate(int) -java.sql.Time#setMonth(int) -java.sql.Time#setYear(int) -java.sql.Timestamp#(int,int,int,int,int,int,int) -java.util.Date#(int,int,int) -java.util.Date#(int,int,int,int,int) -java.util.Date#(int,int,int,int,int,int) -java.util.Date#(java.lang.String) -java.util.Date#UTC(int,int,int,int,int,int) -java.util.Date#getDate() -java.util.Date#getDay() -java.util.Date#getHours() -java.util.Date#getMinutes() -java.util.Date#getMonth() -java.util.Date#getSeconds() -java.util.Date#getTimezoneOffset() -java.util.Date#getYear() -java.util.Date#parse(java.lang.String) -java.util.Date#setDate(int) -java.util.Date#setHours(int) -java.util.Date#setMinutes(int) -java.util.Date#setMonth(int) -java.util.Date#setSeconds(int) -java.util.Date#setYear(int) -java.util.Date#toGMTString() -java.util.Date#toLocaleString() -java.util.Properties#save(java.io.OutputStream,java.lang.String) -javax.accessibility.AccessibleResourceBundle -javax.management.AttributeValueExp#() -javax.management.DefaultLoaderRepository -javax.management.MBeanServer#deserialize(java.lang.String,byte[]) -javax.management.MBeanServer#deserialize(java.lang.String,javax.management.ObjectName,byte[]) -javax.management.MBeanServer#deserialize(javax.management.ObjectName,byte[]) -javax.management.ValueExp#setMBeanServer(javax.management.MBeanServer) -javax.management.loading.DefaultLoaderRepository -javax.management.monitor.CounterMonitor#getDerivedGauge() -javax.management.monitor.CounterMonitor#getDerivedGaugeTimeStamp() -javax.management.monitor.CounterMonitor#getThreshold() -javax.management.monitor.CounterMonitor#setThreshold(java.lang.Number) -javax.management.monitor.CounterMonitorMBean#getDerivedGauge() -javax.management.monitor.CounterMonitorMBean#getDerivedGaugeTimeStamp() -javax.management.monitor.CounterMonitorMBean#getThreshold() -javax.management.monitor.CounterMonitorMBean#setThreshold(java.lang.Number) -javax.management.monitor.GaugeMonitor#getDerivedGauge() -javax.management.monitor.GaugeMonitor#getDerivedGaugeTimeStamp() -javax.management.monitor.GaugeMonitorMBean#getDerivedGauge() -javax.management.monitor.GaugeMonitorMBean#getDerivedGaugeTimeStamp() -javax.management.monitor.Monitor#alreadyNotified -javax.management.monitor.Monitor#dbgTag -javax.management.monitor.Monitor#getObservedObject() -javax.management.monitor.Monitor#setObservedObject(javax.management.ObjectName) -javax.management.monitor.MonitorMBean#getObservedObject() -javax.management.monitor.MonitorMBean#setObservedObject(javax.management.ObjectName) -javax.management.monitor.StringMonitor#getDerivedGauge() -javax.management.monitor.StringMonitor#getDerivedGaugeTimeStamp() -javax.management.monitor.StringMonitorMBean#getDerivedGauge() -javax.management.monitor.StringMonitorMBean#getDerivedGaugeTimeStamp() -javax.management.timer.TimerAlarmClockNotification -javax.security.auth.Policy -javax.sql.rowset.BaseRowSet#setUnicodeStream(int,java.io.InputStream,int) -javax.swing.AbstractButton#getLabel() -javax.swing.AbstractButton#setLabel(java.lang.String) -javax.swing.FocusManager#disableSwingFocusManager() -javax.swing.FocusManager#isFocusManagerEnabled() -javax.swing.JComponent#disable() -javax.swing.JComponent#enable() -javax.swing.JComponent#getNextFocusableComponent() -javax.swing.JComponent#isManagingFocus() -javax.swing.JComponent#requestDefaultFocus() -javax.swing.JComponent#reshape(int,int,int,int) -javax.swing.JComponent#setNextFocusableComponent(java.awt.Component) -javax.swing.JInternalFrame#getMenuBar() -javax.swing.JInternalFrame#setMenuBar(javax.swing.JMenuBar) -javax.swing.JMenuBar#getComponentAtIndex(int) -javax.swing.JPasswordField#getText() -javax.swing.JPasswordField#getText(int,int) -javax.swing.JPopupMenu#getComponentAtIndex(int) -javax.swing.JRootPane#defaultPressAction -javax.swing.JRootPane#defaultReleaseAction -javax.swing.JRootPane#getMenuBar() -javax.swing.JRootPane#setMenuBar(javax.swing.JMenuBar) -javax.swing.JTable#createScrollPaneForTable(javax.swing.JTable) -javax.swing.JTable#sizeColumnsToFit(boolean) -javax.swing.JViewport#backingStore -javax.swing.JViewport#isBackingStoreEnabled() -javax.swing.JViewport#setBackingStoreEnabled(boolean) -javax.swing.KeyStroke#getKeyStroke(char,boolean) -javax.swing.ScrollPaneLayout#getViewportBorderBounds(javax.swing.JScrollPane) -javax.swing.SwingUtilities#findFocusOwner(java.awt.Component) -javax.swing.plaf.basic.BasicDesktopPaneUI#closeKey -javax.swing.plaf.basic.BasicDesktopPaneUI#maximizeKey -javax.swing.plaf.basic.BasicDesktopPaneUI#minimizeKey -javax.swing.plaf.basic.BasicDesktopPaneUI#navigateKey -javax.swing.plaf.basic.BasicDesktopPaneUI#navigateKey2 -javax.swing.plaf.basic.BasicInternalFrameUI#openMenuKey -javax.swing.plaf.basic.BasicSplitPaneUI#createKeyboardDownRightListener() -javax.swing.plaf.basic.BasicSplitPaneUI#createKeyboardEndListener() -javax.swing.plaf.basic.BasicSplitPaneUI#createKeyboardHomeListener() -javax.swing.plaf.basic.BasicSplitPaneUI#createKeyboardResizeToggleListener() -javax.swing.plaf.basic.BasicSplitPaneUI#createKeyboardUpLeftListener() -javax.swing.plaf.basic.BasicSplitPaneUI#dividerResizeToggleKey -javax.swing.plaf.basic.BasicSplitPaneUI#downKey -javax.swing.plaf.basic.BasicSplitPaneUI#endKey -javax.swing.plaf.basic.BasicSplitPaneUI#getDividerBorderSize() -javax.swing.plaf.basic.BasicSplitPaneUI#homeKey -javax.swing.plaf.basic.BasicSplitPaneUI#keyboardDownRightListener -javax.swing.plaf.basic.BasicSplitPaneUI#keyboardEndListener -javax.swing.plaf.basic.BasicSplitPaneUI#keyboardHomeListener -javax.swing.plaf.basic.BasicSplitPaneUI#keyboardResizeToggleListener -javax.swing.plaf.basic.BasicSplitPaneUI#keyboardUpLeftListener -javax.swing.plaf.basic.BasicSplitPaneUI#leftKey -javax.swing.plaf.basic.BasicSplitPaneUI#rightKey -javax.swing.plaf.basic.BasicSplitPaneUI#upKey -javax.swing.plaf.basic.BasicTabbedPaneUI#downKey -javax.swing.plaf.basic.BasicTabbedPaneUI#leftKey -javax.swing.plaf.basic.BasicTabbedPaneUI#rightKey -javax.swing.plaf.basic.BasicTabbedPaneUI#upKey -javax.swing.plaf.basic.BasicToolBarUI#downKey -javax.swing.plaf.basic.BasicToolBarUI#leftKey -javax.swing.plaf.basic.BasicToolBarUI#rightKey -javax.swing.plaf.basic.BasicToolBarUI#upKey -javax.swing.plaf.metal.MetalComboBoxUI#editablePropertyChanged(java.beans.PropertyChangeEvent) -javax.swing.plaf.metal.MetalComboBoxUI#removeListeners() -javax.swing.plaf.metal.MetalComboBoxUI$MetalComboPopup -javax.swing.table.TableColumn#disableResizedPosting() -javax.swing.table.TableColumn#enableResizedPosting() -javax.swing.table.TableColumn#resizedPostingDisableCount -javax.swing.text.DefaultTextUI -javax.swing.text.LabelView#getFontMetrics() -javax.swing.text.TableView#createTableCell(javax.swing.text.Element) -javax.swing.text.TableView$TableCell -javax.swing.text.View#modelToView(int,java.awt.Shape) -javax.swing.text.View#viewToModel(float,float,java.awt.Shape) -javax.swing.text.html.FormView#RESET -javax.swing.text.html.FormView#SUBMIT -javax.swing.text.html.HTMLEditorKit$InsertHTMLTextAction#insertAtBoundry(javax.swing.JEditorPane,javax.swing.text.html.HTMLDocument,int,javax.swing.text.Element,java.lang.String,javax.swing.text.html.HTML$Tag,javax.swing.text.html.HTML$Tag) -org.omg.CORBA.Any#extract_Principal() -org.omg.CORBA.Any#insert_Principal(org.omg.CORBA.Principal) -org.omg.CORBA.DynAny -org.omg.CORBA.DynArray -org.omg.CORBA.DynEnum -org.omg.CORBA.DynFixed -org.omg.CORBA.DynSequence -org.omg.CORBA.DynStruct -org.omg.CORBA.DynUnion -org.omg.CORBA.DynValue -org.omg.CORBA.DynamicImplementation -org.omg.CORBA.ORB#create_basic_dyn_any(org.omg.CORBA.TypeCode) -org.omg.CORBA.ORB#create_dyn_any(org.omg.CORBA.Any) -org.omg.CORBA.ORB#create_dyn_array(org.omg.CORBA.TypeCode) -org.omg.CORBA.ORB#create_dyn_enum(org.omg.CORBA.TypeCode) -org.omg.CORBA.ORB#create_dyn_sequence(org.omg.CORBA.TypeCode) -org.omg.CORBA.ORB#create_dyn_struct(org.omg.CORBA.TypeCode) -org.omg.CORBA.ORB#create_dyn_union(org.omg.CORBA.TypeCode) -org.omg.CORBA.ORB#create_recursive_sequence_tc(int,int) -org.omg.CORBA.ORB#get_current() -org.omg.CORBA.Principal -org.omg.CORBA.PrincipalHolder -org.omg.CORBA.ServerRequest#except(org.omg.CORBA.Any) -org.omg.CORBA.ServerRequest#op_name() -org.omg.CORBA.ServerRequest#params(org.omg.CORBA.NVList) -org.omg.CORBA.ServerRequest#result(org.omg.CORBA.Any) -org.omg.CORBA.TCKind#(int) -org.omg.CORBA.portable.InputStream#read_Principal() -org.omg.CORBA.portable.OutputStream#write_Principal(org.omg.CORBA.Principal) -org.xml.sax.AttributeList -org.xml.sax.DocumentHandler -org.xml.sax.HandlerBase -org.xml.sax.Parser -org.xml.sax.helpers.AttributeListImpl -org.xml.sax.helpers.ParserFactory diff --git a/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.5.txt b/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.5.txt deleted file mode 100644 index c6349135..00000000 --- a/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.5.txt +++ /dev/null @@ -1,106 +0,0 @@ -# (C) Copyright Uwe Schindler (Generics Policeman) and others. -# Parts of this work are licensed to the Apache Software Foundation (ASF) -# under one or more contributor license agreements. -# -# 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. - -# These methods and classes should not be used by server classes (unsafe, no charset, no locale,...): - -@defaultMessage Uses default charset -java.lang.String#(byte[]) -java.lang.String#(byte[],int) -java.lang.String#(byte[],int,int) -java.lang.String#(byte[],int,int,int) -java.lang.String#getBytes() -java.lang.String#getBytes(int,int,byte[],int) -java.io.FileReader -java.io.FileWriter -java.io.ByteArrayOutputStream#toString() -java.io.InputStreamReader#(java.io.InputStream) -java.io.OutputStreamWriter#(java.io.OutputStream) -java.io.PrintStream#(java.io.File) -java.io.PrintStream#(java.io.OutputStream) -java.io.PrintStream#(java.io.OutputStream,boolean) -java.io.PrintStream#(java.lang.String) -java.io.PrintWriter#(java.io.File) -java.io.PrintWriter#(java.io.OutputStream) -java.io.PrintWriter#(java.io.OutputStream,boolean) -java.io.PrintWriter#(java.lang.String) -java.util.Scanner#(java.io.InputStream) -java.util.Scanner#(java.io.File) -java.util.Scanner#(java.nio.channels.ReadableByteChannel) -java.net.URLDecoder#decode(java.lang.String) -java.net.URLEncoder#encode(java.lang.String) - -@defaultMessage Uses default locale -java.lang.String#toLowerCase() -java.lang.String#toUpperCase() -java.lang.String#format(java.lang.String,java.lang.Object[]) -java.io.PrintStream#format(java.lang.String,java.lang.Object[]) -java.io.PrintStream#printf(java.lang.String,java.lang.Object[]) -java.io.PrintWriter#format(java.lang.String,java.lang.Object[]) -java.io.PrintWriter#printf(java.lang.String,java.lang.Object[]) -java.nio.charset.Charset#displayName() -java.text.BreakIterator#getCharacterInstance() -java.text.BreakIterator#getLineInstance() -java.text.BreakIterator#getSentenceInstance() -java.text.BreakIterator#getWordInstance() -java.text.Collator#getInstance() -java.text.DateFormat#getTimeInstance() -java.text.DateFormat#getTimeInstance(int) -java.text.DateFormat#getDateInstance() -java.text.DateFormat#getDateInstance(int) -java.text.DateFormat#getDateTimeInstance() -java.text.DateFormat#getDateTimeInstance(int,int) -java.text.DateFormat#getInstance() -java.text.DateFormatSymbols#() -java.text.DecimalFormat#() -java.text.DecimalFormat#(java.lang.String) -java.text.DecimalFormatSymbols#() -java.text.MessageFormat#(java.lang.String) -java.text.MessageFormat#format(java.lang.String,java.lang.Object[]) -java.text.NumberFormat#getInstance() -java.text.NumberFormat#getNumberInstance() -java.text.NumberFormat#getIntegerInstance() -java.text.NumberFormat#getCurrencyInstance() -java.text.NumberFormat#getPercentInstance() -java.text.SimpleDateFormat#() -java.text.SimpleDateFormat#(java.lang.String) -java.util.Formatter#() -java.util.Formatter#(java.lang.Appendable) -java.util.Formatter#(java.io.File) -java.util.Formatter#(java.io.File,java.lang.String) -java.util.Formatter#(java.io.OutputStream) -java.util.Formatter#(java.io.OutputStream,java.lang.String) -java.util.Formatter#(java.io.PrintStream) -java.util.Formatter#(java.lang.String) -java.util.Formatter#(java.lang.String,java.lang.String) -java.util.Locale#getDisplayCountry() -java.util.Locale#getDisplayLanguage() -java.util.Locale#getDisplayName() -java.util.Locale#getDisplayVariant() -java.util.TimeZone#getDisplayName() -java.util.TimeZone#getDisplayName(boolean,int) - -@defaultMessage Uses default locale or time zone -java.util.Calendar#() -java.util.Calendar#getInstance() -java.util.Calendar#getInstance(java.util.Locale) -java.util.Calendar#getInstance(java.util.TimeZone) -java.util.Currency#getSymbol() -java.util.GregorianCalendar#() -java.util.GregorianCalendar#(int,int,int) -java.util.GregorianCalendar#(int,int,int,int,int) -java.util.GregorianCalendar#(int,int,int,int,int,int) -java.util.GregorianCalendar#(java.util.Locale) -java.util.GregorianCalendar#(java.util.TimeZone) diff --git a/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.6.txt b/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.6.txt index 3fb02e80..e511867c 100644 --- a/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.6.txt +++ b/src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-1.6.txt @@ -16,8 +16,93 @@ # These methods and classes should not be used by server classes (unsafe, no charset, no locale,...): -@includeBundled jdk-unsafe-1.5 +@defaultMessage Uses default charset +java.lang.String#(byte[]) +java.lang.String#(byte[],int) +java.lang.String#(byte[],int,int) +java.lang.String#(byte[],int,int,int) +java.lang.String#getBytes() +java.lang.String#getBytes(int,int,byte[],int) +java.io.FileReader +java.io.FileWriter +java.io.ByteArrayOutputStream#toString() +java.io.InputStreamReader#(java.io.InputStream) +java.io.OutputStreamWriter#(java.io.OutputStream) +java.io.PrintStream#(java.io.File) +java.io.PrintStream#(java.io.OutputStream) +java.io.PrintStream#(java.io.OutputStream,boolean) +java.io.PrintStream#(java.lang.String) +java.io.PrintWriter#(java.io.File) +java.io.PrintWriter#(java.io.OutputStream) +java.io.PrintWriter#(java.io.OutputStream,boolean) +java.io.PrintWriter#(java.lang.String) +java.util.Scanner#(java.io.InputStream) +java.util.Scanner#(java.io.File) +java.util.Scanner#(java.nio.channels.ReadableByteChannel) +java.net.URLDecoder#decode(java.lang.String) +java.net.URLEncoder#encode(java.lang.String) @defaultMessage Uses default locale +java.lang.String#toLowerCase() +java.lang.String#toUpperCase() +java.lang.String#format(java.lang.String,java.lang.Object[]) +java.io.PrintStream#format(java.lang.String,java.lang.Object[]) +java.io.PrintStream#printf(java.lang.String,java.lang.Object[]) +java.io.PrintWriter#format(java.lang.String,java.lang.Object[]) +java.io.PrintWriter#printf(java.lang.String,java.lang.Object[]) +java.nio.charset.Charset#displayName() +java.text.BreakIterator#getCharacterInstance() +java.text.BreakIterator#getLineInstance() +java.text.BreakIterator#getSentenceInstance() +java.text.BreakIterator#getWordInstance() +java.text.Collator#getInstance() +java.text.DateFormat#getTimeInstance() +java.text.DateFormat#getTimeInstance(int) +java.text.DateFormat#getDateInstance() +java.text.DateFormat#getDateInstance(int) +java.text.DateFormat#getDateTimeInstance() +java.text.DateFormat#getDateTimeInstance(int,int) +java.text.DateFormat#getInstance() +java.text.DateFormatSymbols#() java.text.DateFormatSymbols#getInstance() +java.text.DecimalFormat#() +java.text.DecimalFormat#(java.lang.String) +java.text.DecimalFormatSymbols#() java.text.DecimalFormatSymbols#getInstance() +java.text.MessageFormat#(java.lang.String) +java.text.MessageFormat#format(java.lang.String,java.lang.Object[]) +java.text.NumberFormat#getInstance() +java.text.NumberFormat#getNumberInstance() +java.text.NumberFormat#getIntegerInstance() +java.text.NumberFormat#getCurrencyInstance() +java.text.NumberFormat#getPercentInstance() +java.text.SimpleDateFormat#() +java.text.SimpleDateFormat#(java.lang.String) +java.util.Formatter#() +java.util.Formatter#(java.lang.Appendable) +java.util.Formatter#(java.io.File) +java.util.Formatter#(java.io.File,java.lang.String) +java.util.Formatter#(java.io.OutputStream) +java.util.Formatter#(java.io.OutputStream,java.lang.String) +java.util.Formatter#(java.io.PrintStream) +java.util.Formatter#(java.lang.String) +java.util.Formatter#(java.lang.String,java.lang.String) +java.util.Locale#getDisplayCountry() +java.util.Locale#getDisplayLanguage() +java.util.Locale#getDisplayName() +java.util.Locale#getDisplayVariant() +java.util.TimeZone#getDisplayName() +java.util.TimeZone#getDisplayName(boolean,int) + +@defaultMessage Uses default locale or time zone +java.util.Calendar#() +java.util.Calendar#getInstance() +java.util.Calendar#getInstance(java.util.Locale) +java.util.Calendar#getInstance(java.util.TimeZone) +java.util.Currency#getSymbol() +java.util.GregorianCalendar#() +java.util.GregorianCalendar#(int,int,int) +java.util.GregorianCalendar#(int,int,int,int,int) +java.util.GregorianCalendar#(int,int,int,int,int,int) +java.util.GregorianCalendar#(java.util.Locale) +java.util.GregorianCalendar#(java.util.TimeZone) From cbfc65a639640074bf1530751fa69948dc33c7cc Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Wed, 9 Sep 2015 23:08:32 +0200 Subject: [PATCH 2/3] Use Sonatype's JARJAR plugin - this looks more trusted (we need to include ASM into classpath, but made for ASM5) --- build.xml | 2 +- ivy.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.xml b/build.xml index 835689ff..20bf422a 100644 --- a/build.xml +++ b/build.xml @@ -192,7 +192,7 @@ - + diff --git a/ivy.xml b/ivy.xml index 15887c7a..84086de9 100644 --- a/ivy.xml +++ b/ivy.xml @@ -34,8 +34,8 @@ - - + + - + From ccc5c5f4ad48f5dd4a49c27b01ac408ca05ae216 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Wed, 9 Sep 2015 23:29:46 +0200 Subject: [PATCH 3/3] Move some test files to Java6 file naming --- build.xml | 4 ++-- .../antunit/Java5DeprecatedAnnotation.class | Bin 369 -> 0 bytes ...ences.class => Java6ClassReferences.class} | Bin 1020 -> 1020 bytes ...erences.java => Java6ClassReferences.java} | 2 +- .../antunit/Java6DeprecatedAnnotation.class | Bin 0 -> 369 bytes ...on.java => Java6DeprecatedAnnotation.java} | 4 ++-- src/test/antunit/OracleInternalRuntime.class | Bin 433 -> 433 bytes src/test/antunit/TestAnnotations.xml | 6 +++--- src/test/antunit/TestClassReferences.xml | 2 +- src/test/antunit/TestCli.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 src/test/antunit/Java5DeprecatedAnnotation.class rename src/test/antunit/{Java5ClassReferences.class => Java6ClassReferences.class} (80%) rename src/test/antunit/{Java5ClassReferences.java => Java6ClassReferences.java} (97%) create mode 100644 src/test/antunit/Java6DeprecatedAnnotation.class rename src/test/antunit/{Java5DeprecatedAnnotation.java => Java6DeprecatedAnnotation.java} (91%) diff --git a/build.xml b/build.xml index 20bf422a..6177bcd0 100644 --- a/build.xml +++ b/build.xml @@ -535,8 +535,8 @@ - - + diff --git a/src/test/antunit/Java5DeprecatedAnnotation.class b/src/test/antunit/Java5DeprecatedAnnotation.class deleted file mode 100644 index dac76348bd2a8e468a408e648e93d32700d27f56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmZ`#O-sW-6r7jDMq_Mi6>1U0qk6D-@MNj@fd>hCs8l>|lBI5myJg+@zdRKb`~m(b z@hu8HbsszPW?<&9w3$SqLY~3$2Y4P8oehNESYek*RGV zZt2Ow1ccbI>P(r#ZsMcQyj7F*Xr0b~(I*6g?!Y(!T)KdE+2|U)p30(E0`0gi}ob diff --git a/src/test/antunit/Java5ClassReferences.class b/src/test/antunit/Java6ClassReferences.class similarity index 80% rename from src/test/antunit/Java5ClassReferences.class rename to src/test/antunit/Java6ClassReferences.class index 9a254cfdb46556ac777f98879aaaf9e7a2b24f27..78f747f64576f67071f1af03904d932d6f8509a3 100644 GIT binary patch delta 36 rcmeyv{)e68)W2Q(7#J9gHgaSzGMY^;Wb_7-dl~Z>%{J>WU0?(N`J4<1 delta 36 rcmeyv{)e68)W2Q(7#J7~H*#b!GMY{O*iW>U0?(N`CtqM diff --git a/src/test/antunit/Java5ClassReferences.java b/src/test/antunit/Java6ClassReferences.java similarity index 97% rename from src/test/antunit/Java5ClassReferences.java rename to src/test/antunit/Java6ClassReferences.java index f5d6354a..84d45f56 100644 --- a/src/test/antunit/Java5ClassReferences.java +++ b/src/test/antunit/Java6ClassReferences.java @@ -19,7 +19,7 @@ import java.util.*; -class Java5ClassReferences { +class Java6ClassReferences { static Integer[][] test() { Integer.class.getName(); System.out.println(Integer[].class); diff --git a/src/test/antunit/Java6DeprecatedAnnotation.class b/src/test/antunit/Java6DeprecatedAnnotation.class new file mode 100644 index 0000000000000000000000000000000000000000..3c95f6244beff03f35303d1695223455e66b2872 GIT binary patch literal 369 zcmZ`#O-sW-6r7jDMq_Mi6>1U0qk6F5!HcEh2OcEop;Ga7{tX>Jb*{ygJr`K|3Wg(m_FSIsJIA!!1AzAn=My9rf zyivY$Z)xm!%7rN!hzVW4_bZ_%{gJauPcCa!mC_P=OY?;GB6XinW#O=oh!5Z&@o+Vt yVU^W6Gcj)*%|V|Cp5_Q2-`NPT#@Iy2*yZpJQuL6pO8){_=Z%B>eQA?1K diff --git a/src/test/antunit/TestAnnotations.xml b/src/test/antunit/TestAnnotations.xml index 4958eccd..c58d8adf 100644 --- a/src/test/antunit/TestAnnotations.xml +++ b/src/test/antunit/TestAnnotations.xml @@ -34,7 +34,7 @@ - + java.lang.Deprecated @ Deprecated annotation @@ -44,7 +44,7 @@ - + java.lang.StringBuilder @@ -53,7 +53,7 @@ - + java.lang.StringBuilder diff --git a/src/test/antunit/TestClassReferences.xml b/src/test/antunit/TestClassReferences.xml index 985e76a1..eedbdf77 100644 --- a/src/test/antunit/TestClassReferences.xml +++ b/src/test/antunit/TestClassReferences.xml @@ -19,7 +19,7 @@ - + java.lang.Integer @ Forbidden class reference! java.util.List @ Forbidden class reference! java.util.AbstractCollection @ Forbidden class reference! diff --git a/src/test/antunit/TestCli.xml b/src/test/antunit/TestCli.xml index 26fb241f..c1c2c887 100644 --- a/src/test/antunit/TestCli.xml +++ b/src/test/antunit/TestCli.xml @@ -44,9 +44,9 @@ - + - +