Hi.

I use oozie 3.2.0 incubating version.
We need to support for oozie coordinator to work in an UTC offset.
So I apply OOZIE-948v4.patch to oozie 3.2.0 incubating version. but fail.
How can I apply oozie-948v4.patch to oozie 3.2.0 incubating version.

https://issues.apache.org/jira/browse/OOZIE-948

========================
[root@host oozie-3.2.0-incubating]# patch -p0 < OOZIE-948v4.patch
patching file docs/src/site/twiki/AG_Install.twiki
Hunk #1 succeeded at 391 (offset -5 lines).
patching file docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
Hunk #1 succeeded at 120 (offset -5 lines).
patching file core/src/test/java/org/apache/oozie/test/XDataTestCase.java
Hunk #1 succeeded at 255 (offset -1 lines).
Hunk #3 succeeded at 511 (offset -1 lines).
Hunk #5 succeeded at 789 (offset -2 lines).
patching file
core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobGetActionIdsForDatesJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestBundleJobsGetForPurgeJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobGetActionForNominalTimeJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobGetActionsForDatesJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestBundleActionsDeleteForPurgeJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestBundleJobDeleteJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordActionGetForInfoJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordActionGetForInputCheckJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobGetActionsSubsetJPAExecutor.java
patching file
core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java
patching file
core/src/test/java/org/apache/oozie/service/TestPurgeService.java
patching file
core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
Hunk #6 FAILED at 255.
Hunk #7 FAILED at 287.
Hunk #8 FAILED at 325.
Hunk #9 succeeded at 370 (offset -43 lines).
Hunk #10 FAILED at 404.
Hunk #11 FAILED at 441.
Hunk #12 FAILED at 478.
Hunk #13 FAILED at 515.
Hunk #14 FAILED at 550.
Hunk #15 succeeded at 477 (offset -149 lines).
Hunk #16 succeeded at 932 (offset -230 lines).
8 out of 16 hunks FAILED -- saving rejects to file
core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java.rej
patching file
core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
Hunk #1 succeeded at 287 (offset -7 lines).
Hunk #3 succeeded at 369 (offset -7 lines).
Hunk #5 succeeded at 675 (offset -7 lines).
patching file
core/src/test/java/org/apache/oozie/coord/TestCoordELFunctions.java
patching file
core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
Hunk #1 succeeded at 157 (offset -1 lines).
patching file core/src/test/java/org/apache/oozie/util/TestParamChecker.java
patching file
core/src/test/java/org/apache/oozie/util/TestCoordActionsInDateRange.java
Hunk #3 succeeded at 110 (offset -12 lines).
patching file core/src/test/java/org/apache/oozie/util/TestDateUtils.java
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommandNonUTC.java
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordPurgeXCommand.java
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java
Hunk #9 FAILED at 286.
Hunk #10 FAILED at 307.
Hunk #11 succeeded at 293 (offset -26 lines).
Hunk #12 FAILED at 321.
Hunk #13 FAILED at 369.
Hunk #14 succeeded at 424 (offset -24 lines).
4 out of 14 hunks FAILED -- saving rejects to file
core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java.rej
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
Hunk #4 FAILED at 156.
Hunk #5 succeeded at 163 (offset -44 lines).
Hunk #7 succeeded at 265 (offset -44 lines).
Hunk #9 succeeded at 282 (offset -44 lines).
1 out of 9 hunks FAILED -- saving rejects to file
core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java.rej
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
Hunk #2 succeeded at 785 (offset -50 lines).
Hunk #4 succeeded at 882 (offset -50 lines).
Hunk #6 succeeded at 1000 (offset -50 lines).
patching file
core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java
patching file
core/src/test/java/org/apache/oozie/command/bundle/TestBundlePurgeXCommand.java
patching file
core/src/test/java/org/apache/oozie/command/bundle/TestBundleChangeXCommand.java
patching file
core/src/test/java/org/apache/oozie/command/wf/TestPurgeXCommand.java
Hunk #2 succeeded at 243 (offset -3 lines).
patching file
core/src/test/resources/coord-action-for-action-input-check.xml
patching file core/src/main/java/org/apache/oozie/SLAEventBean.java
Hunk #1 succeeded at 292 (offset -1 lines).
patching file
core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java
Hunk #1 succeeded at 108 (offset -2 lines).
patching file
core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
Hunk #1 succeeded at 250 (offset -7 lines).
patching file
core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
Hunk #4 succeeded at 580 (offset -77 lines).
Hunk #6 succeeded at 1038 (offset -77 lines).
patching file
core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
patching file
core/src/main/java/org/apache/oozie/command/bundle/BundleJobChangeXCommand.java
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 27.
Hunk #2 succeeded at 127 (offset -2 lines).
1 out of 3 hunks FAILED -- saving rejects to file
core/src/main/java/org/apache/oozie/command/bundle/BundleJobChangeXCommand.java.rej
patching file
core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
Hunk #2 succeeded at 413 (offset -5 lines).
patching file
core/src/main/java/org/apache/oozie/command/bundle/BundleRerunXCommand.java
patching file
core/src/main/java/org/apache/oozie/store/CoordinatorStore.java
patching file
core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionForNominalTimeJPAExecutor.java
patching file
core/src/main/java/org/apache/oozie/service/StatusTransitService.java
Hunk #1 succeeded at 140 (offset -15 lines).
Hunk #2 succeeded at 628 (offset -75 lines).
patching file core/src/main/java/org/apache/oozie/service/Services.java
patching file core/src/main/java/org/apache/oozie/ErrorCode.java
Hunk #1 succeeded at 171 (offset -4 lines).
patching file
core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
patching file core/src/main/java/org/apache/oozie/coord/CoordUtils.java
patching file
core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
Hunk #2 FAILED at 141.
Hunk #3 succeeded at 147 (offset -3 lines).
Hunk #5 succeeded at 218 (offset -3 lines).
1 out of 5 hunks FAILED -- saving rejects to file
core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java.rej
patching file
core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java
patching file
core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java
patching file core/src/main/java/org/apache/oozie/util/ParamChecker.java
patching file
core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
patching file
core/src/main/java/org/apache/oozie/util/CoordActionsInDateRange.java
patching file core/src/main/java/org/apache/oozie/util/DateUtils.java
Hunk #1 FAILED at 25.
Hunk #2 succeeded at 121 (offset -2 lines).
Hunk #4 succeeded at 270 (offset -2 lines).
1 out of 5 hunks FAILED -- saving rejects to file
core/src/main/java/org/apache/oozie/util/DateUtils.java.rej
patching file core/src/main/resources/oozie-default.xml
========================

Reply via email to