Skip to content

Commit

Permalink
See #23913: Fetch remote API keys for Bing imagery
Browse files Browse the repository at this point in the history 
Update JMapViewer and other dependencies

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19293 0c6e7542-c601-0410-84e7-c038aed88b3b
  • Loading branch information
taylor.smock committed Jan 27, 2025
1 parent 50f9586 commit b4688cb
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 33 deletions.
26 changes: 13 additions & 13 deletions ivy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</configurations>
<dependencies>
<!-- api->default -->
<dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
<dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.23"/>
<dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
<!-- parsson is an implementation for jakarta.json -->
<dependency conf="runtimeOnly->default" org="org.eclipse.parsson" name="parsson" rev="1.1.7"/>
Expand All @@ -36,7 +36,7 @@
<!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
<dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.10.21"/>
<!-- sources->sources -->
<dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
<dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.23"/>
<dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
<dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.7"/>
<dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.2.1"/>
Expand All @@ -57,18 +57,18 @@
<dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.49.a"/>
<dependency conf="junit5-system-exit->default" org="com.ginsberg" name="junit5-system-exit" rev="${versions.junit5-system-exit}"/>
<!-- test->default -->
<dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
<dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.9.2"/>
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.177"/>
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.11.3"/>
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.11.3"/>
<dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.11.3"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.11.3"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.11.3"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.11.3"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.11.3"/>
<dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.9.0"/>
<dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.10.0"/>
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.179"/>
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.11.4"/>
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.11.4"/>
<dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.11.4"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.11.4"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.11.4"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.11.4"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.11.4"/>
<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.16.2"/>
<dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.18.1"/>
<dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
<dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.2"/>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ivysettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
</resolvers>
<!-- Remove junit5-system-exit specific statements in build.xml when we drop Java 11 as a build platform -->
<property name="versions.junit5-system-exit" value="1.1.2" unlessset="isJava17"/>
<property name="versions.junit5-system-exit" value="2.0.0" ifset="isJava17"/>
<property name="versions.junit5-system-exit" value="2.0.2" ifset="isJava17"/>
</ivysettings>
18 changes: 9 additions & 9 deletions nodist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<sonar.host.url>https://josm.openstreetmap.de/sonar/</sonar.host.url>
<sonar.projectKey>JOSM</sonar.projectKey>
<jmockit.version>1.49.a</jmockit.version>
<pmd.version>7.6.0</pmd.version>
<pmd.version>7.9.0</pmd.version>
<jacoco.version>0.8.12</jacoco.version>
<checkstyle.version>10.18.2</checkstyle.version>
<spotbugs.version>4.8.6</spotbugs.version>
<checkstyle.version>10.21.2</checkstyle.version>
<spotbugs.version>4.9.0</spotbugs.version>
<!-- Note: 2.0.0 requires Java 17, and we'll need to upgrade to it for Java 25 LTS (see JEP 486)-->
<junit5-system-exit.version>1.1.2</junit5-system-exit.version>
</properties>
Expand Down Expand Up @@ -253,14 +253,14 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.11.3</version>
<version>5.11.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.openstreetmap.jmapviewer</groupId>
<artifactId>jmapviewer</artifactId>
<version>2.22</version>
<version>2.23</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -351,13 +351,13 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.9.2</version>
<version>3.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.177</version>
<version>4.8.179</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -369,7 +369,7 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.16.2</version>
<version>3.18.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -393,7 +393,7 @@
<jdk>[17</jdk>
</activation>
<properties>
<junit5-system-exit.version>2.0.0</junit5-system-exit.version>
<junit5-system-exit.version>2.0.2</junit5-system-exit.version>
</properties>
</profile>
</profiles>
Expand Down
3 changes: 2 additions & 1 deletion test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ public ImageryInfo getImageryInfo(int port) {
String.format("tms[20]:http://localhost:%d/%h/{z}/{x}/{y}.png", port, this.hashCode()),
"tms",
(String) null,
(String) null
(String) null,
this.label
);
}

Expand Down
18 changes: 9 additions & 9 deletions tools/ivy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<!-- javacc->default -->
<dependency org="net.java.dev.javacc" name="javacc" rev="7.0.13" conf="javacc->default"/>
<!-- checkstyle->default -->
<dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.18.2" conf="checkstyle->default"/>
<dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.21.2" conf="checkstyle->default"/>
<!-- proguard->default -->
<dependency org="com.guardsquare" name="proguard-ant" rev="7.6.0" conf="proguard->default"/>
<dependency org="com.guardsquare" name="proguard-ant" rev="7.6.1" conf="proguard->default"/>
<!-- pmd->default -->
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.6.0" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.6.0" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.6.0" conf="pmd->default"/>
<dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.10" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.9.0" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.9.0" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.9.0" conf="pmd->default"/>
<dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.12" conf="pmd->default"/>
<!-- spotbugs->default -->
<dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.6" conf="spotbugs->default"/>
<dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.6" conf="spotbugs->default"/>
<dependency org="com.github.spotbugs" name="spotbugs" rev="4.9.0" conf="spotbugs->default"/>
<dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.9.0" conf="spotbugs->default"/>
<!-- errorprone->default -->
<dependency org="com.google.errorprone" name="error_prone_core" rev="2.31.0" conf="errorprone->default"/>
<dependency org="com.google.errorprone" name="error_prone_core" rev="2.36.0" conf="errorprone->default"/>
<!-- animal->default -->
<dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.24" conf="animal->default"/>
</dependencies>
Expand Down

0 comments on commit b4688cb

Please sign in to comment.