Changeset 19685 in josm


Ignore:
Timestamp:
2026-11-10T19:46:41+01:00 (less than one hour ago)
Author:
gaben
Message:

see #17858 - drop pre-Java 17 build conditions and Maven profiles

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/.github/workflows/ant.yml

    r19680 r19685  
    151151
    152152      - name: Build and package for macOS
    153         if: ${{ runner.os == 'macos' && matrix.java != '11' && always() }}
     153        if: ${{ runner.os == 'macos' && always() }}
    154154        env:
    155155          CERT_MACOS_P12: ${{ secrets.CERT_MACOS_P12 }}
    … …  
    177177
    178178      - name: Setup Windows PATH
    179         if: ${{ runner.os == 'windows' && matrix.java != '11' && always() }}
     179        if: ${{ runner.os == 'windows' && always() }}
    180180        run: |
    181181          echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH
    … …  
    184184
    185185      - name: Build and package for Windows
    186         if: ${{ runner.os == 'windows' && matrix.java != '11' && always() }}
     186        if: ${{ runner.os == 'windows' && always() }}
    187187        env:
    188188          SIGN_CERT: ${{ secrets.SIGN_CERT }}
    … …  
    198198
    199199      - name: Upload macOS app
    200         if: ${{ runner.os == 'macos' && matrix.java != '11' && always() && needs.createrelease.outputs.upload_url }}
     200        if: ${{ runner.os == 'macos' && always() && needs.createrelease.outputs.upload_url }}
    201201        env:
    202202          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    … …  
    214214
    215215      - name: Upload macOS app (x64)
    216         if: ${{ runner.os == 'macos' && matrix.java != '11' && always() && runner.arch == 'ARM64' && needs.createrelease.outputs.upload_url }}
     216        if: ${{ runner.os == 'macos' && always() && runner.arch == 'ARM64' && needs.createrelease.outputs.upload_url }}
    217217        env:
    218218          ASSET_NAME: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}-x64.zip
    … …  
    231231
    232232      - name: Upload macOS app (aarch64)
    233         if: ${{ runner.os == 'macos' && matrix.java != '11' && always() && runner.arch == 'ARM64' && needs.createrelease.outputs.upload_url }}
     233        if: ${{ runner.os == 'macos' && always() && runner.arch == 'ARM64' && needs.createrelease.outputs.upload_url }}
    234234        env:
    235235          ASSET_NAME: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}-aarch64.zip
    … …  
    248248
    249249      - name: Upload Windows Installer executable
    250         if: ${{ runner.os == 'windows' && matrix.java != '11' && always() && needs.createrelease.outputs.upload_url }}
     250        if: ${{ runner.os == 'windows' && always() && needs.createrelease.outputs.upload_url }}
    251251        env:
    252252          ASSET_NAME: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.exe
    … …  
    265265
    266266      - name: Upload Windows Installer package
    267         if: ${{ runner.os == 'windows' && matrix.java != '11' && always() && needs.createrelease.outputs.upload_url }}
     267        if: ${{ runner.os == 'windows' && always() && needs.createrelease.outputs.upload_url }}
    268268        env:
    269269          ASSET_NAME: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.msi

  • trunk/nodist/pom.xml

    r19683 r19685  
    1717        <sonar.host.url>https://josm.openstreetmap.de/sonar/</sonar.host.url>
    1818        <sonar.projectKey>JOSM</sonar.projectKey>
    19         <jmockit.version>1.49.a</jmockit.version>
     19        <jmockit.version>1.50</jmockit.version>
    2020        <pmd.version>7.28.0</pmd.version>
    2121        <jacoco.version>0.8.13</jacoco.version>
    22         <checkstyle.version>10.26.1</checkstyle.version>
     22        <checkstyle.version>12.3.1</checkstyle.version>
    2323        <spotbugs.version>4.9.8</spotbugs.version>
    24         <!-- Note: 2.0.0 requires Java 17, and we'll need to upgrade to it for Java 25 LTS (see JEP 486)-->
    25         <junit5-system-exit.version>1.1.2</junit5-system-exit.version>
    26         <equalsverifier.version>3.19.4</equalsverifier.version>
     24        <junit5-system-exit.version>2.0.2</junit5-system-exit.version>
     25        <equalsverifier.version>4.3.1</equalsverifier.version>
    2726    </properties>
    2827    <modules>
    … …  
    395394    <profiles>
    396395        <profile>
    397             <id>java-17</id>
    398             <activation>
    399                 <jdk>[17</jdk>
    400             </activation>
    401             <properties>
    402                 <junit5-system-exit.version>2.0.2</junit5-system-exit.version>
    403                 <jmockit.version>1.50</jmockit.version>
    404                 <checkstyle.version>12.3.1</checkstyle.version>
    405                 <equalsverifier.version>4.3.1</equalsverifier.version>
    406             </properties>
    407         </profile>
    408         <profile>
    409             <!-- should be used together with java-17 profile -->
    410396            <id>java-21</id>
    411397            <activation>

  • trunk/pom.xml

    r19683 r19685  
    571571                 after java-agents below already cached the JDK's default locale provider list. -->
    572572            -Djava.locale.providers=SPI,CLDR
     573            -javaagent:${com.ginsberg:junit5-system-exit:jar}
    573574            -javaagent:${org.jmockit:jmockit:jar}
    574575            --add-opens java.base/java.io=ALL-UNNAMED
    … …  
    868869    </plugins>
    869870  </build>
    870   <profiles>
    871     <profile>
    872       <id>java-17</id>
    873       <activation>
    874         <jdk>[17</jdk>
    875       </activation>
    876       <build>
    877         <plugins>
    878           <plugin>
    879           <artifactId>maven-surefire-plugin</artifactId>
    880             <configuration>
    881               <!-- We might need @{argLine} in the future if another plugin has issues -->
    882               <argLine>
    883                 @{argLine}
    884                 -Djava.locale.providers=SPI,CLDR
    885                 -javaagent:${com.ginsberg:junit5-system-exit:jar}
    886                 -javaagent:${org.jmockit:jmockit:jar}
    887                 --add-opens java.base/java.io=ALL-UNNAMED
    888                 --add-opens java.base/java.lang=ALL-UNNAMED
    889                 --add-opens java.base/java.nio=ALL-UNNAMED
    890                 --add-opens java.base/java.text=ALL-UNNAMED
    891                 --add-opens java.base/java.util=ALL-UNNAMED
    892                 --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
    893                 --add-opens java.desktop/java.awt=ALL-UNNAMED
    894                 --add-opens java.prefs/java.util.prefs=ALL-UNNAMED
    895               </argLine>
    896             </configuration>
    897           </plugin>
    898         </plugins>
    899       </build>
    900     </profile>
    901   </profiles>
    902871</project>
Note: See TracChangeset for help on using the changeset viewer.