Skip to content

Commit

Permalink
work off 2.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
evanchooly committed Jan 23, 2025
1 parent adeef79 commit 3e5f5cb
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
set -e

cd git_repo
mvn -e test-compile
mvn -U -e test-compile
2 changes: 1 addition & 1 deletion projects/morphia/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion projects/morphia/core-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion projects/morphia/git
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/MorphiaOrg/morphia.git -b v2.4.14
https://github.com/MorphiaOrg/morphia.git -b 2.4.x
19 changes: 11 additions & 8 deletions test-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 3e5f5cb

Please sign in to comment.