You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2014/07/19 06:39:06 UTC
svn commit: r1611846 - in /zookeeper/trunk: ./
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/
src/java/test/bin/
Author: phunt
Date: Sat Jul 19 04:39:05 2014
New Revision: 1611846
URL: http://svn.apache.org/r1611846
Log:
ZOOKEEPER-927. there are currently 24 RAT warnings in the build -- address directly or via exclusions (Michi Mutsuzaki via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/build.xml
zookeeper/trunk/ivy.xml
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java
zookeeper/trunk/src/java/test/bin/test-patch.properties
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1611846&r1=1611845&r2=1611846&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Jul 19 04:39:05 2014
@@ -996,6 +996,9 @@ IMPROVEMENTS:
ZOOKEEPER-1968. Make Jetty dependencies optional in ivy.xml
(Bill Havanki via phunt)
+ ZOOKEEPER-927. there are currently 24 RAT warnings in the build --
+ address directly or via exclusions (Michi Mutsuzaki via phunt)
+
headers
Release 3.4.0 -
Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1611846&r1=1611845&r2=1611846&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Sat Jul 19 04:39:05 2014
@@ -142,10 +142,6 @@ xmlns:maven="antlib:org.apache.maven.art
<property name="test.cobertura.output.format" value="html" />
<property name="coveragereport.dir" value="${build.dir}/cobertura" />
- <!-- rats properties -->
- <property name="rats_url" value="http://arat.googlecode.com/files/rat-lib-all-0.5.1.jar" />
- <property name="rat.reporting.classname" value="rat.Report"/>
-
<!-- test patch properties -->
<property name="scratch.dir" value="${user.home}/tmp"/>
<property name="svn.cmd" value="svn"/>
@@ -1641,10 +1637,13 @@ xmlns:maven="antlib:org.apache.maven.art
<exclude name="**/compile"/>
<exclude name="**/depcomp"/>
<exclude name="**/install-sh"/>
+ <exclude name="**/log4j.properties"/>
<exclude name="**/ltmain.sh"/>
<exclude name="**/missing"/>
<exclude name="**/wrappers*.opt"/>
<exclude name="CHANGES.txt"/>
+ <exclude name="README_packaging.txt"/>
+ <exclude name="**/TODO"/>
<exclude name="**/VERSION"/>
<exclude name="**/ChangeLog"/>
<exclude name="**/OldChangeLog"/>
@@ -1653,14 +1652,32 @@ xmlns:maven="antlib:org.apache.maven.art
<exclude name="**/conf/*"/>
<exclude name="**/docs/"/>
<exclude name="**/lib/jdiff/"/>
+ <exclude name="contrib/ZooInspector/src/java/com/nitido/utils/toaster/Toaster.java"/>
+ <exclude name="src/c/*.la"/>
+ <exclude name="src/c/*.lo"/>
+ <exclude name="src/c/.libs/"/>
<exclude name="src/c/autom4te.cache/**"/>
<exclude name="src/c/config**"/>
+ <exclude name="src/c/include/winstdint.h"/>
<exclude name="src/c/src/hashtable/"/>
+ <exclude name="src/c/test-driver"/>
+ <exclude name="src/c/tests/quorum.cfg"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.bar.js"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.dot.js"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.line.js"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.pie.js"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.raphael.js"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/raphael.js"/>
+ <exclude name="src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/yui-min.js"/>
+ <exclude name="src/contrib/monitoring/JMX-RESOURCES"/>
+ <exclude name="src/contrib/zooinspector/src/java/com/nitido/utils/toaster/Toaster.java"/>
<exclude name="src/java/generated/.generated/"/>
<exclude name="src/java/test/checkstyle*.xml"/>
<exclude name="src/java/test/checkstyle*.xsl"/>
<exclude name="src/java/test/config/findbugs*.xml"/>
<exclude name="src/**/*.vcproj"/>
+ <exclude name="src/**/*.vcxproj*"/>
<exclude name="src/**/*.sln"/>
</fileset>
</rat:report>
Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1611846&r1=1611845&r2=1611846&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Sat Jul 19 04:39:05 2014
@@ -69,7 +69,7 @@
conf="jdiff->default"/>
<dependency org="org.apache.rat" name="apache-rat-tasks"
- rev="0.7" conf="releaseaudit->default"/>
+ rev="0.10" conf="releaseaudit->default"/>
<dependency org="commons-lang" name="commons-lang"
rev="2.6" conf="releaseaudit->default"/>
<dependency org="commons-collections" name="commons-collections"
Modified: zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java?rev=1611846&r1=1611845&r2=1611846&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java (original)
+++ zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java Sat Jul 19 04:39:05 2014
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
package org.apache.zookeeper.inspector.gui;
import java.io.File;
Modified: zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java?rev=1611846&r1=1611845&r2=1611846&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java (original)
+++ zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java Sat Jul 19 04:39:05 2014
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
package org.apache.zookeeper.inspector.gui;
import java.awt.event.ActionListener;
Modified: zookeeper/trunk/src/java/test/bin/test-patch.properties
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/bin/test-patch.properties?rev=1611846&r1=1611845&r2=1611846&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/bin/test-patch.properties (original)
+++ zookeeper/trunk/src/java/test/bin/test-patch.properties Sat Jul 19 04:39:05 2014
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-OK_RELEASEAUDIT_WARNINGS=26
+OK_RELEASEAUDIT_WARNINGS=0
OK_FINDBUGS_WARNINGS=0
OK_JAVADOC_WARNINGS=0