Merge pull request #2535 from e-Evolution/release/3.9.2

#2532 Setup ADempiere 392 release https://github.com/adempiere/adempi…
adempiere · May 4, 2019 · 6260456 · 6260456
2 parents 84f7da0 + 54fcc29
commit 6260456
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/adempiere.iml b/adempiere.iml
@@ -1413,12 +1413,19 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="org.scalatest:scalatest_2.12:3.0.5" level="project" />
-    <orderEntry type="library" name="scala-sdk-2.12.8" level="project" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/JasperReportsTools/lib/org.krysalis.barcode4j_2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/tools/lib/commons-validator-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/tools/lib/zxing-2.3.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1427,7 +1434,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/JasperReportsTools/lib/zxing-2.3.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/tools/lib/xmlgraphics-commons-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1436,7 +1443,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/JasperReportsTools/lib/batik-all-1.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/tools/lib/xml-apis-ext-1.3.04.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1445,7 +1452,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/JasperReportsTools/lib/xmlgraphics-commons-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/tools/lib/xml-apis-1.3.04.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1454,7 +1461,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/JasperReportsTools/lib/xml-apis-ext-1.3.04.jar!/" />
+          <root url="jar://$MODULE_DIR$/tools/lib/org.krysalis.barcode4j_2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1463,11 +1470,13 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/JasperReportsTools/lib/xml-apis-1.3.04.jar!/" />
+          <root url="jar://$MODULE_DIR$/tools/lib/batik-all-1.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="org.scalatest:scalatest_2.12:3.0.5" level="project" />
+    <orderEntry type="library" name="scala-sdk-2.12.8" level="project" />
   </component>
 </module>
diff --git a/db/database/Startup/OracleXE/CreateUser.sql b/db/database/Startup/OracleXE/CreateUser.sql
@@ -13,6 +13,8 @@ SET ECHO ON
  *	Parameter: UserID UserPwd
  *	Run as system
  ************************************************************************/
+ALTER SESSION SET "_ORACLE_SCRIPT"=true
+/
 DROP USER &1 CASCADE
 /
 CREATE USER &1 IDENTIFIED BY &2

diff --git a/project/project/build.properties b/project/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.1.1