diff --git a/.github/workflows/scripts/get-xetabase-branch.sh b/.github/workflows/scripts/get-xetabase-branch.sh index 6e62a8ff6..be89ffbf2 100644 --- a/.github/workflows/scripts/get-xetabase-branch.sh +++ b/.github/workflows/scripts/get-xetabase-branch.sh @@ -22,7 +22,6 @@ get_xetabase_branch() { # Check if the branch name starts with "release-" and follows the patterns "release-a.x.x" or "release-a.b.x" if [[ "$input_branch" =~ ^release-([0-9]+)\.x\.x$ ]] || [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.x$ ]]; then - # Extract the MAJOR part of the branch name MAJOR=${BASH_REMATCH[1]} # Calculate the XETABASE_MAJOR by subtracting 3 from MAJOR diff --git a/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java b/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java index f33b7033c..377d610c5 100644 --- a/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java +++ b/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java @@ -441,15 +441,13 @@ public void testAggregate() { queryResult = mongoDBCollection.aggregate(dbObjectList, new QueryOptions(QueryOptions.LIMIT, 1).append(QueryOptions.SKIP, 0)); assertEquals("There must be 1 results", 1, queryResult.getResults().size()); - assertTrue(queryResult.getResults().contains(result.get(0))); + // As the order of result list change between executions, we must ensure the assertTrue doesn't depend on the order + assertTrue(result.contains(queryResult.getResults().get(0))); queryResult = mongoDBCollection.aggregate(dbObjectList, new QueryOptions(QueryOptions.LIMIT, 1).append(QueryOptions.SKIP, 1)); assertEquals("There must be 1 results", 1, queryResult.getResults().size()); - - System.out.println("result = " + result); - System.out.println("queryResult.getResults() = " + queryResult.getResults()); - - assertTrue(queryResult.getResults().contains(result.get(1))); + // As the order of result list change between executions, we must ensure the assertTrue doesn't depend on the order + assertTrue(result.contains(queryResult.getResults().get(0))); } @Test diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 84a6c880b..a660edcf9 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -31,7 +31,6 @@ com.fasterxml.jackson.core jackson-databind - test org.apache.commons @@ -64,11 +63,6 @@ slf4j-simple test - - com.fasterxml.jackson.core - jackson-databind - test - commons-io commons-io