diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 298b3feae..ce9137b8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,12 +14,6 @@ jobs: with: path: Vitro - - name: Checkout vitro languages - uses: actions/checkout@v3 - with: - repository: vivo-project/Vitro-languages - path: Vitro-languages - - name: Maven Cache uses: actions/cache@v2 with: @@ -34,7 +28,5 @@ jobs: - name: Maven Build run: | - cd ./Vitro-languages - mvn clean install - cd ../Vitro + cd ./Vitro mvn clean install diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java index a964008cd..25a698442 100644 --- a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java @@ -6,8 +6,6 @@ import java.lang.reflect.Method; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -17,6 +15,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.stream.Collectors; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; @@ -272,6 +271,37 @@ public class FormUtils { return options; } + public static List