Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.

Commit 4197223

Browse files
author
Denes Bodo
committed
Merge remote-tracking branch 'origin/master' into github_actions_sandbox
2 parents 285008f + ffb3465 commit 4197223

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

docs/src/site/markdown/ENG_Building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ specified in the `test.properties` file (which is loaded by the `XTestCase` clas
123123

124124
**hadoop.version** `(*)`: indicates the Hadoop version you wish to build Oozie against specifically. It will
125125
substitute this value in the Oozie POM properties and pull the corresponding Hadoop artifacts from Maven.
126-
The default version is 2.6.0 and that is the minimum supported Hadoop version.
126+
The default version is 2.8.5 and that is the minimum supported Hadoop version.
127127

128128
**generateSite** (*): generates Oozie documentation, default is undefined (no documentation is generated)
129129

docs/src/site/markdown/ENG_Custom_Authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
resources file (ex. web.xml) needs to include a filter class derived from `AuthenticationFilter`.
2828

2929
For more information have a look at the appropriate
30-
[Hadoop documentation](https://hadoop.apache.org/docs/r2.7.2/hadoop-auth/index.html).
30+
[Hadoop documentation](https://hadoop.apache.org/docs/r2.8.5/hadoop-auth/index.html).
3131

3232
## Provide Custom Authentication to Oozie Client
3333

pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</oozie.test.default.config.file>
8181
<oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file>
8282

83-
<hadoop.version>2.6.0</hadoop.version>
83+
<hadoop.version>2.8.5</hadoop.version>
8484
<hadoop.majorversion>2</hadoop.majorversion>
8585
<hadooplib.version>hadoop-${hadoop.majorversion}-${project.version}</hadooplib.version>
8686
<hbase.version>1.2.3</hbase.version>
@@ -161,6 +161,9 @@
161161
<id>apache.snapshots.repo</id>
162162
<url>https://repository.apache.org/content/groups/snapshots</url>
163163
<name>Apache Snapshots Repository</name>
164+
<releases>
165+
<enabled>false</enabled>
166+
</releases>
164167
<snapshots>
165168
<enabled>true</enabled>
166169
</snapshots>
@@ -561,6 +564,10 @@
561564
<groupId>joda-time</groupId>
562565
<artifactId>joda-time</artifactId>
563566
</exclusion>
567+
<exclusion>
568+
<groupId>org.pentaho</groupId>
569+
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
570+
</exclusion>
564571
</exclusions>
565572
</dependency>
566573

@@ -606,6 +613,10 @@
606613
<groupId>javax.jms</groupId>
607614
<artifactId>jms</artifactId>
608615
</exclusion>
616+
<exclusion>
617+
<groupId>org.pentaho</groupId>
618+
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
619+
</exclusion>
609620
</exclusions>
610621
</dependency>
611622

release-log.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
-- Oozie 5.3.0 release (trunk - unreleased)
22

3+
OOZIE-3726 Disable releases for apache.snapshots repo (adoroszlai via dionusos)
4+
OOZIE-3728 Upgrade Hadoop to 2.8.5 (asasvari, dionusos via dionusos)
35
OOZIE-3717 When fork actions parallel submit, becasue ForkedActionStartXCommand and ActionStartXCommand has the same name, so ForkedActionStartXCommand would be lost, and cause deadlock (chenhd via dionusos)
46
OOZIE-3715 Fix fork out more than one transitions submit , one transition submit fail can't execute KillXCommand (chenhd via dionusos)
57
OOZIE-3716 Invocation of Main class completed Message is skipped when LauncherSecurityManager calls system exit (khr9603 via dionusos)

0 commit comments

Comments
 (0)