Repository: oozie Updated Branches: refs/heads/master 91c3d0c02 -> 4f4049347
http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/resources/test-custom-log4j.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/test-custom-log4j.properties b/core/src/test/resources/test-custom-log4j.properties index 747df01..8dd43a0 100644 --- a/core/src/test/resources/test-custom-log4j.properties +++ b/core/src/test/resources/test-custom-log4j.properties @@ -6,9 +6,9 @@ # 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. http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/resources/test-oozie-log4j.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/test-oozie-log4j.properties b/core/src/test/resources/test-oozie-log4j.properties index 3040d4f..0524fb9 100644 --- a/core/src/test/resources/test-oozie-log4j.properties +++ b/core/src/test/resources/test-oozie-log4j.properties @@ -6,9 +6,9 @@ # 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. http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 84880ca..9a434d3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3176 Oozie-core fails with checkstyle errors (alishap via andras.piros) OOZIE-2726 Flaky test due to daylight saving changes (sasishsaley, andras.piros via gezapeti) OOZIE-2645 Deprecate Instrumentation in favor of Metrics (andras.piros via gezapeti) OOZIE-3150 Remove references to not present dependencies within NOTICE.txt (gezapeti via andras.piros) http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/src/main/resources/checkstyle-header.txt ---------------------------------------------------------------------- diff --git a/src/main/resources/checkstyle-header.txt b/src/main/resources/checkstyle-header.txt deleted file mode 100644 index 4247452..0000000 --- a/src/main/resources/checkstyle-header.txt +++ /dev/null @@ -1,17 +0,0 @@ -/** - * 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. - */ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/src/main/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/checkstyle.xml b/src/main/resources/checkstyle.xml index 68b6cce..d2489d1 100644 --- a/src/main/resources/checkstyle.xml +++ b/src/main/resources/checkstyle.xml @@ -26,10 +26,6 @@ <property name="message" value="Line has trailing spaces."/> </module> - <module name="Header"> - <property name="headerFile" value="${checkstyle.header.file}"/> - </module> - <module name="TreeWalker"> <module name="LineLength">
