Merge branch 'develop'

* develop: (22 commits) fix casting fix strange compiler error Javadoc spelling error fix white space and indentation update libraries Fix NPE by applying the replacement only if a non-blank SQL string was returned. don’t forget to finish output streams, fixes wocommunity#843 Declare a specific version of the hamcrest dependency in the pom.xml (issue wocommunity#841) Fix issue when running tests with Ant (issue wocommunity#841) Add collectors for NSCollection types Avoid Maven build failures because of Javadoc generation errors [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release wonder-7.0 Add Travis-CI build status badge to GitHub front page Configure Travis deployment only if branches master Run verify Maven goal when building on Travis Include WebObjects lib on wotraskd and JavaMonitor Add configuration to run tests again Configure Travis-CI to build and deploy artifacts to WOCommunity Maven Repository Disable the ERModernMoviesTest module temporarily from the Maven build ...
elemgee · Dec 20, 2017 · 44941da · 44941da
2 parents 56a8982 + 9dcc07e
commit 44941da
Show file tree

Hide file tree

Showing 178 changed files with 713 additions and 282 deletions.
diff --git a/.maven_settings.xml b/.maven_settings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/POM/4.0.0"	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>wocommunity</id>
+          <url>http://maven.wocommunity.org/content/groups/public/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>wocommunity-plugins</id>
+          <url>http://maven.wocommunity.org/content/groups/public/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+  </profile>
+</profiles>
+<activeProfiles>
+  <activeProfile>default</activeProfile>
+</activeProfiles>
+<servers>
+  <server>
+    <id>wocommunity.deployment</id>
+    <username>${env.CI_DEPLOY_USERNAME}</username>
+    <password>${env.CI_DEPLOY_PASSWORD}</password>
+  </server>
+</servers>
+</settings>
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -0,0 +1,2 @@
+-Xmx2048m
+-Xms512m
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1 @@
+-T1C
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,21 @@ env:
   # set NEXT_ROOT, so apps will start
   - NEXT_ROOT=/home/travis/build
 
-script: "mvn verify"
+cache:
+  directories:
+  - $HOME/.m2
+
+install: "mvn install -s .maven_settings.xml -DskipTests=true -Dmaven.javadoc.skip=true -B"
 
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+
+script: "mvn verify -s .maven_settings.xml -Dmaven.javadoc.skip=true -B"
+
+deploy:
+  - provider: script
+    script: "mvn deploy -s .maven_settings.xml -DskipTests=true -B"
+    on:
+      branch: master
+      tags: false
diff --git a/Applications/BugTracker/pom.xml b/Applications/BugTracker/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.applications</groupId>
 		<artifactId>applications</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>wonder.applications</groupId>

diff --git a/Applications/ERMailer/pom.xml b/Applications/ERMailer/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>wonder.applications</groupId>
         <artifactId>applications</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>wonder.applications</groupId>

diff --git a/Applications/JavaMonitor/pom.xml b/Applications/JavaMonitor/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.applications</groupId>
 		<artifactId>applications</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -11,6 +11,10 @@
 	<name>JavaMonitor Application</name>
 	<packaging>woapplication</packaging>
 
+	<properties>
+		<skip.apple.frameworks>false</skip.apple.frameworks>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>wonder.core</groupId>

diff --git a/Applications/Uber/pom.xml b/Applications/Uber/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.applications</groupId>
 		<artifactId>applications</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>wonder.applications</groupId>

diff --git a/Applications/pom.xml b/Applications/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder</groupId>
 		<artifactId>wonder</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<groupId>wonder.applications</groupId>
 	<artifactId>applications</artifactId>

diff --git a/Applications/wotaskd/pom.xml b/Applications/wotaskd/pom.xml
@@ -2,13 +2,16 @@
 	<parent>
 		<groupId>wonder.applications</groupId>
 		<artifactId>applications</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>wonder.applications</groupId>
 	<artifactId>wotaskd</artifactId>
 	<name>wotaskd</name>
 	<packaging>woapplication</packaging>
+	<properties>
+		<skip.apple.frameworks>false</skip.apple.frameworks>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>wonder.core</groupId>

diff --git a/Build/build/build.xml b/Build/build/build.xml
diff --git a/Build/build/generic.xml b/Build/build/generic.xml
@@ -277,7 +277,7 @@ There are many ways to use this script:
 
         <path id="wo.exec.test.path">
             <pathelement location="${build.root}/ERJars.${fRJ}/junit.jar" />
-            <pathelement location="${build.root}/ERJars.${fRJ}/commons-lang3-3.5.jar" />
+            <pathelement location="${build.root}/ERJars.${fRJ}/commons-lang3-3.7.jar" />
             <pathelement location="${build.root}/DerbyPlugIn.${fRJ}/derby.jar" />
             <pathelement location="${build.root}/DerbyPlugIn.${fRJ}/DerbyPlugIn.jar" />
             <pathelement location="${build.root}/DerbyPlugIn.${fRJ}/derbytools.jar" />
@@ -326,7 +326,7 @@ There are many ways to use this script:
         <property file="${user.home}${file.separator}Library${file.separator}wobuild.properties"/>
 
         <path id="wo.exec.test.path">
-            <pathelement location="${build.root}/ERJars.${fRJ}/commons-lang3-3.5.jar" />
+            <pathelement location="${build.root}/ERJars.${fRJ}/commons-lang3-3.7.jar" />
             <pathelement location="${build.root}/ERExtensions.${fRJ}/ERExtensions.jar" />
             <pathelement location="${build.root}/JavaMemoryAdaptor.${fRJ}/JavaMemoryAdaptor.jar" />
             <pathelement location="${wo.system.frameworks}/JavaEOAccess.${fRJ}/javaeoaccess.jar" />

diff --git a/Examples/Ajax/AjaxExample/pom.xml b/Examples/Ajax/AjaxExample/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>ajax</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>wonder.ajax</groupId>

diff --git a/Examples/Ajax/AjaxExample2/pom.xml b/Examples/Ajax/AjaxExample2/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>ajax</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>wonder.ajax</groupId>

diff --git a/Examples/Ajax/pom.xml b/Examples/Ajax/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>examples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>ajax</artifactId>
 	<packaging>pom</packaging>

diff --git a/Examples/D2W/D2WComponentTour/pom.xml b/Examples/D2W/D2WComponentTour/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>d2w</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>wonder.d2w</groupId>

diff --git a/Examples/D2W/ERModernMoviesDemo/pom.xml b/Examples/D2W/ERModernMoviesDemo/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>d2w</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/D2W/ERMovies/pom.xml b/Examples/D2W/ERMovies/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>d2w</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>wonder.d2w</groupId>

diff --git a/Examples/D2W/pom.xml b/Examples/D2W/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>examples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>d2w</artifactId>

diff --git a/Examples/ERJaxWS/WebService_Created/pom.xml b/Examples/ERJaxWS/WebService_Created/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>erjaxws</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/ERJaxWS/WebService_Imported/pom.xml b/Examples/ERJaxWS/WebService_Imported/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>erjaxws</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/ERJaxWS/WebService_Stateful/pom.xml b/Examples/ERJaxWS/WebService_Stateful/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>erjaxws</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/ERJaxWS/pom.xml b/Examples/ERJaxWS/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>examples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>erjaxws</artifactId>

diff --git a/Examples/ERXPartials/ERXPartialBaseModel/pom.xml b/Examples/ERXPartials/ERXPartialBaseModel/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>erxpartials</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/ERXPartials/ERXPartialsExampleApp/pom.xml b/Examples/ERXPartials/ERXPartialsExampleApp/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>erxpartials</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/pom.xml b/Examples/ERXPartials/ERXPartialsExampleModel/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>erxpartials</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/ERXPartials/pom.xml b/Examples/ERXPartials/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>examples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>erxpartials</artifactId>

diff --git a/Examples/Misc/ERComponentTour/pom.xml b/Examples/Misc/ERComponentTour/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>miscexamples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>wonder.misc</groupId>

diff --git a/Examples/Misc/ERIndexingExample/pom.xml b/Examples/Misc/ERIndexingExample/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>miscexamples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>wonder.misc</groupId>

diff --git a/Examples/Misc/ERRestRouteExample/pom.xml b/Examples/Misc/ERRestRouteExample/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>miscexamples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>wonder.misc</groupId>

diff --git a/Examples/Misc/ERSeleniumExample/pom.xml b/Examples/Misc/ERSeleniumExample/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>miscexamples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<groupId>wonder.misc</groupId>
 	<artifactId>ERSeleniumExample</artifactId>

diff --git a/Examples/Misc/Movies/.classpath b/Examples/Misc/Movies/.classpath
@@ -20,5 +20,11 @@
 	<classpathentry kind="con" path="WOFramework/ERMoviesLogic"/>
 	<classpathentry kind="con" path="WOFramework/ERRest"/>
 	<classpathentry kind="con" path="WOFramework/H2PlugIn"/>
+	<classpathentry kind="con" path="WOFramework/ERCoreBusinessLogic"/>
+	<classpathentry kind="con" path="WOFramework/ERDirectToWeb"/>
+	<classpathentry kind="con" path="WOFramework/ERJavaMail"/>
+	<classpathentry kind="con" path="WOFramework/JavaDirectToWeb"/>
+	<classpathentry kind="con" path="WOFramework/JavaEOProject"/>
+	<classpathentry kind="con" path="WOFramework/JavaDTWGeneration"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Examples/Misc/TickTockMan/pom.xml b/Examples/Misc/TickTockMan/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>miscexamples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/Examples/Misc/pom.xml b/Examples/Misc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>examples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>miscexamples</artifactId>

diff --git a/Examples/Reporting/pom.xml b/Examples/Reporting/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder.examples</groupId>
 		<artifactId>examples</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>reporting</artifactId>
 	<packaging>pom</packaging>

diff --git a/Examples/pom.xml b/Examples/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>wonder</groupId>
 		<artifactId>wonder</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<groupId>wonder.examples</groupId>
 	<artifactId>examples</artifactId>

diff --git a/Frameworks/Ajax/Ajax/pom.xml b/Frameworks/Ajax/Ajax/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>wonder.frameworks</groupId>
 		<artifactId>ajax</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.1-SNAPSHOT</version>
 	</parent>
 	<groupId>wonder.ajax</groupId>
 	<artifactId>Ajax</artifactId>