Author: tucu
Date: Tue Nov 15 22:47:53 2011
New Revision: 1202452
URL: http://svn.apache.org/viewvc?rev=1202452&view=rev
Log:
OOZIE-602 Update the Hadoop version to be an Apache Hadoop version.
Modified:
incubator/oozie/trunk/core/pom.xml
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
incubator/oozie/trunk/examples/pom.xml
incubator/oozie/trunk/minitest/pom.xml
incubator/oozie/trunk/pom.xml
incubator/oozie/trunk/release-log.txt
incubator/oozie/trunk/sharelib/pom.xml
incubator/oozie/trunk/webapp/pom.xml
Modified: incubator/oozie/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/pom.xml?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
--- incubator/oozie/trunk/core/pom.xml (original)
+++ incubator/oozie/trunk/core/pom.xml Tue Nov 15 22:47:53 2011
@@ -7,9 +7,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.
@@ -86,13 +86,13 @@
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<scope>test</scope>
</dependency>
@@ -126,13 +126,13 @@
<artifactId>commons-el</artifactId>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>commons-dbcp</groupId>
@@ -449,7 +449,7 @@
<include>**/XTestCase$1.class</include>
<include>**/XFsTestCase.class</include>
<include>**/MiniOozieTestCase.class</include>
-
<include>**/XTestCase$Predicate.class</include>
+
<include>**/XTestCase$Predicate.class</include>
</includes>
</configuration>
</execution>
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
Tue Nov 15 22:47:53 2011
@@ -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.
@@ -41,6 +41,7 @@ import org.apache.hadoop.fs.permission.F
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MiniMRCluster;
+import org.apache.hadoop.security.authorize.ProxyUsers;
import org.apache.oozie.BundleActionBean;
import org.apache.oozie.BundleJobBean;
import org.apache.oozie.CoordinatorActionBean;
@@ -687,6 +688,7 @@ public abstract class XTestCase extends
JobConf jobConf = mrCluster.createJobConf();
System.setProperty(OOZIE_TEST_JOB_TRACKER,
jobConf.get("mapred.job.tracker"));
System.setProperty(OOZIE_TEST_NAME_NODE,
jobConf.get("fs.default.name"));
+ ProxyUsers.refreshSuperUserGroupsConfiguration(conf);
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
Modified: incubator/oozie/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/examples/pom.xml?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
--- incubator/oozie/trunk/examples/pom.xml (original)
+++ incubator/oozie/trunk/examples/pom.xml Tue Nov 15 22:47:53 2011
@@ -7,9 +7,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.
@@ -43,6 +43,12 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.yahoo.oozie</groupId>
<artifactId>oozie-core</artifactId>
<scope>provided</scope>
@@ -69,14 +75,14 @@
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<scope>test</scope>
</dependency>
Modified: incubator/oozie/trunk/minitest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/minitest/pom.xml?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
--- incubator/oozie/trunk/minitest/pom.xml (original)
+++ incubator/oozie/trunk/minitest/pom.xml Tue Nov 15 22:47:53 2011
@@ -59,13 +59,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>0.20.104.2</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>0.20.104.2</version>
<scope>test</scope>
Modified: incubator/oozie/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/pom.xml?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
--- incubator/oozie/trunk/pom.xml (original)
+++ incubator/oozie/trunk/pom.xml Tue Nov 15 22:47:53 2011
@@ -7,9 +7,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.
@@ -64,6 +64,8 @@
<oozie.test.db>hsqldb</oozie.test.db>
<oozie.test.default.config.file>${basedir}/src/test/resources/${oozie.test.db}-oozie-site.xml</oozie.test.default.config.file>
<oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file>
+
+ <hadoop.version>0.20.204.0</hadoop.version>
</properties>
<modules>
@@ -231,18 +233,24 @@
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>2.1.0</version>
</dependency>
-
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
-
+
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>0.20.104.2</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -253,9 +261,9 @@
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
- <version>0.20.104.2</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -278,9 +286,9 @@
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-streaming</artifactId>
- <version>0.20.104.2</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -297,7 +305,7 @@
<exclusions>
<exclusion>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
<!-- this exclusion to be removed by GH-0226 -->
@@ -409,7 +417,7 @@
<artifactId>commons-pool</artifactId>
<version>1.5.4</version>
</dependency>
-
+
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -533,12 +541,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Tue Nov 15 22:47:53 2011
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-602 Update the Hadoop version to be an Apache Hadoop version.
OOZIE-557 Simplify/normalize testing configuration when using different
databases.
OOZIE-590 Log Retrieval from multiple .gz archive files
OOZIE-587 Out of memory issues due to current query design
Modified: incubator/oozie/trunk/sharelib/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/sharelib/pom.xml?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
--- incubator/oozie/trunk/sharelib/pom.xml (original)
+++ incubator/oozie/trunk/sharelib/pom.xml Tue Nov 15 22:47:53 2011
@@ -7,9 +7,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.
@@ -43,13 +43,13 @@
<dependencies>
<dependency>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-streaming</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
</exclusions>
@@ -62,7 +62,7 @@
<exclusions>
<exclusion>
<!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
</exclusions>
Modified: incubator/oozie/trunk/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/webapp/pom.xml?rev=1202452&r1=1202451&r2=1202452&view=diff
==============================================================================
--- incubator/oozie/trunk/webapp/pom.xml (original)
+++ incubator/oozie/trunk/webapp/pom.xml Tue Nov 15 22:47:53 2011
@@ -7,9 +7,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.
@@ -146,7 +146,7 @@
</activation>
<dependencies>
<dependency>
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>compile</scope>
<exclusions>
