Repository: oozie
Updated Branches:
  refs/heads/branch-4.1 f9b5d9a1c -> 5786cdefc


OOZIE-1961 Remove requireJavaVersion from enforcer rules (lars_francke via rkanter)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5786cdef
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5786cdef
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5786cdef

Branch: refs/heads/branch-4.1
Commit: 5786cdefc4e45ed05f586f994cfde9a366624c10
Parents: f9b5d9a
Author: Robert Kanter <rkanter@cloudera.com>
Authored: Thu Aug 7 11:20:05 2014 -0700
Committer: Robert Kanter <rkanter@cloudera.com>
Committed: Thu Aug 7 11:20:05 2014 -0700

----------------------------------------------------------------------
 docs/src/site/twiki/ENG_Building.twiki | 11 ++---------
 pom.xml                                |  3 +--
 release-log.txt                        |  1 +
 3 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/5786cdef/docs/src/site/twiki/ENG_Building.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/ENG_Building.twiki b/docs/src/site/twiki/ENG_Building.twiki
index 2f2e054..49e2cb5 100644
--- a/docs/src/site/twiki/ENG_Building.twiki
+++ b/docs/src/site/twiki/ENG_Building.twiki
@@ -51,16 +51,9 @@ $ ssh localhost
 </verbatim>
 
 ---++ Building with different Java Versions
- 
-By default, the build configuration enforces that JDK 1.6.* is being used to compile and run the testcases.
 
-There are 2 build properties that can be used to change the JDK version requirements:
-
-   * *javaVersion* specifies the version of the JDK used to compile and run the testcases (default 1.6).
-   * *targetJavaVersion* specifies the version of the generated bytecode (default 1.6)
-   
-IMPORTANT: If setting =javaVersion= to =1.7=, still the generated bytecode is for JDK 1.6 unless =targetJavaVersion= 
-is also set to =1.7=.
+Oozie requires a minimum Java version of 1.6. Any newer version can be used but by default bytecode will be generated
+which is compatible with 1.6. This can be changed by specifying the build property *targetJavaVersion*.
 
 ---++ Building and Testing Oozie
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/5786cdef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1df70ca..0b01fee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
     </organization>
 
     <properties>
-        <javaVersion>1.6</javaVersion>
         <targetJavaVersion>1.6</targetJavaVersion>
 
         <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
@@ -966,7 +965,7 @@
                             <version>[3.0.0,)</version>
                         </requireMavenVersion>
                         <requireJavaVersion>
-                            <version>[${javaVersion}.0,${javaVersion}.1000}]</version>
+                            <version>1.6</version>
                         </requireJavaVersion>
                     </rules>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/oozie/blob/5786cdef/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 2a1eb0f..63dbae6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (4.1 - unreleased)
 
+OOZIE-1961 Remove requireJavaVersion from enforcer rules (lars_francke via rkanter)
 OOZIE-1883 hostnameFilter has invalid url-pattern (dvillegas via rkanter)
 OOZIE-1925 upgrade tomcat to 6.0.41 (rkanter via shwethags)
 OOZIE-1811 Current test failures in trunk (mona)