Repository: oozie Updated Branches: refs/heads/master fa2a205be -> a26f45738
OOZIE-1968 Building modules independently (shwethags) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/a26f4573 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/a26f4573 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/a26f4573 Branch: refs/heads/master Commit: a26f457380429bcf5f471f97a370bd2b1dca38e0 Parents: fa2a205 Author: Shwetha GS <[email protected]> Authored: Tue Aug 19 11:54:01 2014 +0530 Committer: Shwetha GS <[email protected]> Committed: Tue Aug 19 11:54:01 2014 +0530 ---------------------------------------------------------------------- .gitignore | 2 ++ pom.xml | 1 + release-log.txt | 1 + src/main/resources/checkstyle-header.txt | 3 +-- src/main/resources/checkstyle.xml | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/a26f4573/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 3a58c50..a4285a0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ test-patch *.iml *.ipr *.iws +.idea # Structure101 *.hsp @@ -27,3 +28,4 @@ mkdistro-*.out distro/downloads SecurityAuth.audit build +webapp/overlays http://git-wip-us.apache.org/repos/asf/oozie/blob/a26f4573/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c5bca2b..835ec19 100644 --- a/pom.xml +++ b/pom.xml @@ -950,6 +950,7 @@ <consoleOutput>true</consoleOutput> <includeTestSourceDirectory>true</includeTestSourceDirectory> <configLocation>src/main/resources/checkstyle.xml</configLocation> + <headerLocation>src/main/resources/checkstyle-header.txt</headerLocation> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/oozie/blob/a26f4573/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5023220..2f1548e 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,4 +1,5 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-1968 Building modules independently (shwethags) OOZIE-1939 Incorrect job information is set while logging (seoeun25 via shwethags) OOZIE-1846 Convert CoordActionMaterializeCommand to an XCommand and remove Command (seoeun25 via shwethags) OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang) http://git-wip-us.apache.org/repos/asf/oozie/blob/a26f4573/src/main/resources/checkstyle-header.txt ---------------------------------------------------------------------- diff --git a/src/main/resources/checkstyle-header.txt b/src/main/resources/checkstyle-header.txt index d87a0ee..4247452 100644 --- a/src/main/resources/checkstyle-header.txt +++ b/src/main/resources/checkstyle-header.txt @@ -14,5 +14,4 @@ * 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/a26f4573/src/main/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/checkstyle.xml b/src/main/resources/checkstyle.xml index b75d737..90b3683 100644 --- a/src/main/resources/checkstyle.xml +++ b/src/main/resources/checkstyle.xml @@ -28,7 +28,7 @@ <module name="Header"> <property name="severity" value="warning"/> - <property name="headerFile" value="src/main/resources/checkstyle-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> <module name="TreeWalker">
