Use checked in ./mvnw

salesforce · Jan 29, 2024 · 356c687 · 356c687
1 parent 695baaa
commit 356c687
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -15,10 +15,6 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - name: Set up Maven
-        uses: stCarolas/[email protected]
-        with:
-          maven-version: 3.9.4
       - uses: actions/checkout@v3
       - uses: graalvm/setup-graalvm@v1
         with:
@@ -27,4 +23,4 @@ jobs:
           cache: 'maven'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Maven
-        run: mvn -batch-mode clean install -Ppre --file pom.xml
+        run: ./mvnw -batch-mode clean install -Ppre --file pom.xml
diff --git a/model/src/main/java/com/salesforce/apollo/model/ProcessDomain.java b/model/src/main/java/com/salesforce/apollo/model/ProcessDomain.java
@@ -117,13 +117,13 @@ public void stop() {
 
     protected ViewLifecycleListener listener() {
         return (context, id, cardinality, join, leaving) -> {
-            choam.setDiadem(id);
             for (var d : join) {
                 params.context().activate(context.apply(d));
             }
             for (var d : leaving) {
                 params.context().remove(d);
             }
+            choam.setDiadem(id);
 
             log.info("View change: {} for: {} joining: {} leaving: {} on: {}", id, params.context().getId(),
                      join.size(), leaving.size(), params.member().getId());