Changeset 17539 in josm

Timestamp:

2021-02-24T21:46:54+01:00 (3 years ago)

Author:

Don-vip

Message:

see #19724, see #20522 - upgrade to equalsverifier 3.5.5 - enable Java 16/17 for mac build

Location:

trunk

Files:

• .github/workflows/ant.yml (modified) (3 diffs)
• ivy.xml (modified) (1 diff)

trunk/.github/workflows/ant.yml

@@ -69 +69 @@
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11, 15, 16-ea]
+        java: [8, 11, 15, 16-ea, 17-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
         headless: ["true", "false"]
@@ -124 +124 @@
       - name: Build with Ant
         # Calls ant with -Dreleasebuild=true if we're a 'tested' build
-        # Disables errorprone for Java 16
-        # See https://github.com/google/error-prone/issues/1872
         run: |
           if [ "${{ needs.createrelease.outputs.josm_prerelease }}" == "true" ]; then
@@ -132 +130 @@
             ANT="${{ env.ANT_HOME }}/bin/ant -Dreleasebuild=true"
           fi
-          if [[ "x${{ matrix.java }}x" =~ x1[6-9](-ea)?x ]]; then
-            $ANT -DnoErrorProne dist
-          else
-            $ANT dist
-          fi
+          $ANT dist
       - name: Upload jar
         # Only run on matrix.headless to avoid double jars. They should be the same jars.

trunk/ivy.xml

@@ -63 +63 @@
         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.7.1"/>
         <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
-        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.5.4"/>
+        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.5.5"/>
         <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.11"/>
         <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.0.3"/>