work off 2.4.x

Author: evanchooly

build.sh

@@ -3,4 +3,4 @@
 set -e
 
 cd git_repo
-mvn -e test-compile
+mvn -U -e test-compile

projects/morphia/build.sh

@@ -12,6 +12,6 @@ then
   git rm -rf src/main/java
   cp ../core-pom.xml pom.xml
 else
-  mvn -e test-compile #| grep "\[ERROR\].*\.java.*"
+  mvn -U -e test-compile #| grep "\[ERROR\].*\.java.*"
 fi
 

projects/morphia/core-pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>dev.morphia.morphia</groupId>
             <artifactId>morphia-core</artifactId>
-            <version>2.4.14</version>
+            <version>2.4.15-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.smallrye.config</groupId>

projects/morphia/git

@@ -1 +1 @@
-https://github.com/MorphiaOrg/morphia.git -b v2.4.14
+https://github.com/MorphiaOrg/morphia.git -b 2.4.x

test-local.sh

@@ -14,7 +14,7 @@ function checkout() {
   if [ -d git_repo ]
   then
     echo git exists
-    cd git_repo ; git reset --hard ; cd -
+    cd git_repo ; git reset --hard ; git pull --rebase && cd -
   else
     git clone $( cat git ) git_repo
   fi
@@ -25,7 +25,6 @@ function upgrade() {
   PROJECT_ROOT=$( pwd )/projects/${PROJECT}
   BUILD=$( pwd )/build.sh
   [ -e ${PROJECT_ROOT}/build.sh ] && BUILD=${PROJECT_ROOT}/build.sh
-  echo BUILD=$BUILD
 
   cd $PROJECT_ROOT
 
@@ -46,12 +45,16 @@ function upgrade() {
   title "Done upgrading $PROJECT"
 }
 
-if [ -d ~/dev/morphia.dev ]
-then
-  cd ~/dev/morphia.dev/morphia/rewrite
-  mvn clean install
-  cd -
-fi
+function morphia() {
+  if [ -d ~/dev/morphia.dev/morphia/rewrite/src/main ]
+  then
+    cd ~/dev/morphia.dev/morphia/rewrite
+    mvn clean install
+    cd -
+  fi
+}
+
+morphia
 
 if [ -z "$1" ]
 then