oozie-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbac...@apache.org
Subject oozie git commit: OOZIE-3026 fix openjpa enhancer stage during build for logging (dbdist13, andras.piros via pbacsko)
Date Thu, 31 Aug 2017 13:21:19 GMT
Repository: oozie
Updated Branches:
  refs/heads/master 7ebe9555b -> df0e3c24c


OOZIE-3026 fix openjpa enhancer stage during build for logging (dbdist13, andras.piros via
pbacsko)


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

Branch: refs/heads/master
Commit: df0e3c24ccda30dce9fc745c6b479d8e4436c0b8
Parents: 7ebe955
Author: Peter Bacsko <pbacsko@cloudera.com>
Authored: Thu Aug 31 15:20:55 2017 +0200
Committer: Peter Bacsko <pbacsko@cloudera.com>
Committed: Thu Aug 31 15:20:55 2017 +0200

----------------------------------------------------------------------
 core/src/main/conf/oozie-log4j.properties          | 10 ++++++++++
 core/src/main/resources/META-INF/persistence.xml   |  6 ++++++
 minitest/src/test/resources/oozie-log4j.properties | 10 ++++++++++
 pom.xml                                            |  2 +-
 release-log.txt                                    |  1 +
 5 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/df0e3c24/core/src/main/conf/oozie-log4j.properties
----------------------------------------------------------------------
diff --git a/core/src/main/conf/oozie-log4j.properties b/core/src/main/conf/oozie-log4j.properties
index c1a555d..0d314b3 100644
--- a/core/src/main/conf/oozie-log4j.properties
+++ b/core/src/main/conf/oozie-log4j.properties
@@ -102,6 +102,16 @@ log4j.appender.openjpa.File=${oozie.log.dir}/oozie-jpa.log
 log4j.appender.openjpa.Append=true
 log4j.appender.openjpa.layout=org.apache.log4j.PatternLayout
 log4j.appender.openjpa.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n
+log4j.category.openjpa.Tool=INFO
+log4j.category.openjpa.Runtime=INFO
+log4j.category.openjpa.Remote=WARN
+log4j.category.openjpa.DataCache=WARN
+log4j.category.openjpa.MetaData=WARN
+log4j.category.openjpa.Enhance=WARN
+log4j.category.openjpa.Query=WARN
+log4j.category.openjpa.jdbc.SQL=WARN
+log4j.category.openjpa.jdbc.JDBC=WARN
+log4j.category.openjpa.jdbc.Schema=WARN
 
 log4j.appender.jetty=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.jetty.DatePattern='.'yyyy-MM-dd

http://git-wip-us.apache.org/repos/asf/oozie/blob/df0e3c24/core/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/persistence.xml b/core/src/main/resources/META-INF/persistence.xml
index a74078a..924b2d6 100644
--- a/core/src/main/resources/META-INF/persistence.xml
+++ b/core/src/main/resources/META-INF/persistence.xml
@@ -76,6 +76,7 @@
             <property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
             <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
             <property name="openjpa.Log" value="log4j"/>
+            <property name="openjpa.Log" value="Tool=WARN"/>
         </properties>
     </persistence-unit>
 
@@ -137,6 +138,7 @@
             <property name="openjpa.jdbc.DBDictionary" value="BlobTypeName=MEDIUMBLOB"/>
             <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
             <property name="openjpa.Log" value="log4j"/>
+            <property name="openjpa.Log" value="Tool=WARN"/>
         </properties>
     </persistence-unit>
 
@@ -196,6 +198,7 @@
             <property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
             <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
             <property name="openjpa.Log" value="log4j"/>
+            <property name="openjpa.Log" value="Tool=WARN"/>
         </properties>
     </persistence-unit>
 
@@ -256,6 +259,7 @@
             <property name="openjpa.jdbc.DBDictionary" value="TimestampTypeName=TIMESTAMP"/>
             <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
             <property name="openjpa.Log" value="log4j"/>
+            <property name="openjpa.Log" value="Tool=WARN"/>
         </properties>
     </persistence-unit>
 
@@ -315,6 +319,7 @@
             <property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
             <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
             <property name="openjpa.Log" value="log4j"/>
+            <property name="openjpa.Log" value="Tool=WARN"/>
         </properties>
     </persistence-unit>
 
@@ -375,6 +380,7 @@
             <property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
             <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
             <property name="openjpa.Log" value="log4j"/>
+            <property name="openjpa.Log" value="Tool=WARN"/>
         </properties>
     </persistence-unit>
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/df0e3c24/minitest/src/test/resources/oozie-log4j.properties
----------------------------------------------------------------------
diff --git a/minitest/src/test/resources/oozie-log4j.properties b/minitest/src/test/resources/oozie-log4j.properties
index 2503851..8400500 100644
--- a/minitest/src/test/resources/oozie-log4j.properties
+++ b/minitest/src/test/resources/oozie-log4j.properties
@@ -31,6 +31,16 @@ log4j.logger.oozieaudit=OFF, none
 
 log4j.logger.openjpa=INFO, test
 log4j.logger.org.apache.openjpa=INFO, test
+log4j.category.openjpa.Tool=INFO
+log4j.category.openjpa.Runtime=INFO
+log4j.category.openjpa.Remote=WARN
+log4j.category.openjpa.DataCache=WARN
+log4j.category.openjpa.MetaData=WARN
+log4j.category.openjpa.Enhance=WARN
+log4j.category.openjpa.Query=INFO
+log4j.category.openjpa.jdbc.SQL=INFO
+log4j.category.openjpa.jdbc.JDBC=INFO
+log4j.category.openjpa.jdbc.Schema=WARN
 log4j.logger.org.apache.hadoop=INFO, test
 log4j.logger.org.mortbay=INFO, test
 log4j.logger.org.hsqldb=INFO, test

http://git-wip-us.apache.org/repos/asf/oozie/blob/df0e3c24/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 538702d..db18f30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
          <jetty.version>9.2.19.v20160908</jetty.version>
 
          <jline.version>0.9.94</jline.version>
-         <openjpa.version>2.4.1</openjpa.version>
+         <openjpa.version>2.4.2</openjpa.version>
          <xerces.version>2.10.0</xerces.version>
          <curator.version>2.5.0</curator.version>
          <jackson.version>1.9.13</jackson.version>

http://git-wip-us.apache.org/repos/asf/oozie/blob/df0e3c24/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 43a5766..b63f42d 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-3026 fix openjpa enhancer stage during build for logging (dbdist13, andras.piros via
pbacsko)
 OOZIE-2746 Several tests failure in TestV2ValidateServlet.java (Dongying Jiao via asasvari)
 OOZIE-3038 Make all Oozie JUnit tests pass on dist_test (andras.piros via gezapeti)
 OOZIE-2940 Possible NullPointerException in WorkflowActionBean (dionusos via gezapeti)


Mime
View raw message