#19208 closed task (fixed)
JCS: update package to org.apache.commons.jcs3
Reported by: | simon04 | Owned by: | simon04 |
---|---|---|---|
Priority: | normal | Milestone: | 20.05 |
Component: | Core | Version: | |
Keywords: | jcs cache package | Cc: | Don-vip, floscher |
Description (last modified by )
For the upcoming release of JCS 3, the artifact ID as well as the Java packages have been renamed s/jcs/jcs3/
, see the following upstream commits:
https://github.com/apache/commons-jcs/commit/3c518b8d03435701f3211be5b38df373d9424e0b
https://github.com/apache/commons-jcs/commit/356da531c5ccfd7cb32eea1be67c61ef17ef80cc
- <artifactId>commons-jcs-core</artifactId> + <artifactId>commons-jcs3-core</artifactId> - package org.apache.commons.jcs; + package org.apache.commons.jcs3;
Also, various plugins need to be updated:
- conflation, done via https://github.com/JOSM/conflation/commit/edc8aa466d2b6e8e9acb3d40f693d9e98bb0d3bd and https://github.com/JOSM/conflation/releases/tag/v0.6.5 and PluginsSource?action=diff&version=528
- imagery_cachexport, done via [o35437]
- Mapillary, done via https://github.com/JOSM/Mapillary/releases/tag/v1.5.23
- mbtiles, done via https://github.com/iandees/josm-mbtiles/pull/20 and https://github.com/iandees/josm-mbtiles/releases/tag/v2.6.0
- MicrosoftStreetside, fixed via [o35466]
- wikipedia, done via https://github.com/JOSM/wikipedia/commit/92b065444270d59a33ef6164a818483bcb0e4b69 and https://gitlab.com/JOSM/plugin/wikipedia/-/tags/v1.1.4
- OpenStreetCam, #19283, fixed via https://github.com/openstreetcam/josm-plugin/pull/42
josm/plugins$ rg -l org.apache.commons.jcs | sort conflation/src/org/openstreetmap/josm/plugins/conflation/config/parser/InstanceConstructor.java imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/AbstractImageryCacheExportAction.java imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryTileExportDialog.java imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/TMSImageryCacheExportAction.java imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/WMSImageryCacheExportAction.java imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/WMTSImageryCacheExportAction.java Mapillary/src/main/java/org/openstreetmap/josm/plugins/mapillary/cache/Caches.java Mapillary/src/main/java/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java mbtiles/src/org/openstreetmap/josm/plugins/mbtiles/CacheExportPanel.java MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cache/Caches.java MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideData.java wikipedia/src/main/java/org/wikipedia/api/ApiQueryClient.java wikipedia/src/main/java/org/wikipedia/Caches.java
Attachments (1)
Change History (25)
comment:1 by , 5 years ago
Owner: | changed from | to
---|---|
Status: | new → assigned |
comment:2 by , 5 years ago
Description: | modified (diff) |
---|
comment:3 by , 5 years ago
Description: | modified (diff) |
---|
comment:4 by , 5 years ago
comment:5 by , 5 years ago
Description: | modified (diff) |
---|
comment:6 by , 5 years ago
Description: | modified (diff) |
---|
follow-up: 15 comment:7 by , 5 years ago
Cc: | added |
---|
Mapillary, mbtiles, MicrosoftStreetside, wikipedia are built using Gradle. Those plugins have to wait for a new JOSM snapshot become available at https://josm.openstreetmap.de/download/.
@floscher, we cannot use the josm-custom.jar generated by Jenkins, can we? https://josm.openstreetmap.de/jenkins/job/JOSM/6393/jdk=JDK8/
comment:11 by , 5 years ago
I just released a fix for Mapillary in v1.5.23
( https://github.com/JOSM/Mapillary/releases/tag/v1.5.23 ).
comment:12 by , 5 years ago
Description: | modified (diff) |
---|
comment:13 by , 5 years ago
Description: | modified (diff) |
---|
comment:14 by , 5 years ago
Description: | modified (diff) |
---|
comment:15 by , 5 years ago
Replying to simon04:
Mapillary, mbtiles, MicrosoftStreetside, wikipedia are built using Gradle. Those plugins have to wait for a new JOSM snapshot become available at https://josm.openstreetmap.de/download/.
@floscher, we cannot use the josm-custom.jar generated by Jenkins, can we? https://josm.openstreetmap.de/jenkins/job/JOSM/6393/jdk=JDK8/
This should be possible, would the latest stable build be enough?: https://josm.openstreetmap.de/jenkins/job/JOSM/lastStableBuild/jdk=JDK8/artifact/dist/josm-custom.jar
Getting a specific snapshot would be harder, since Jenkins uses its own IDs in the URLs instead of the SVN revision number.
What should we call the version? We already have latest
and tested
as special version "numbers". Maybe edge
, jenkins
or ci
?
comment:16 by , 5 years ago
The use-case would be to make an incompatible change in JOSM core now, and shortly afterwards fix the affected plugins. Thus, having the latest Jenkins build would fix it for the moment. Later one would probably replace the version with one from https://josm.openstreetmap.de/download/. So, having an option to fetch the latest Jenkins build would be helpful.
comment:17 by , 5 years ago
Description: | modified (diff) |
---|
follow-up: 21 comment:20 by , 5 years ago
Description: | modified (diff) |
---|---|
Resolution: | → fixed |
Status: | assigned → closed |
@floscher, thanks for the pointer. So we're updating our SVN.
MicrosoftStreetsidePlugin is updated via [o35466]. However I cannot compile due to a JavaFX problem (there are various tickets open).
comment:21 by , 5 years ago
Replying to simon04:
@floscher, thanks for the pointer. So we're updating our SVN.
MicrosoftStreetsidePlugin is updated via [o35466]. However I cannot compile due to a JavaFX problem (there are various tickets open).
I've built it, but I keep running into various errors during gradle build
. Right now, I need to look into why I cannot access MockUp
. I probably just have to add jmockit
as an explicit test dependency.
Does anyone mind if I push the changes to get StreetSide compiling to svn
when I finish debugging it?
by , 5 years ago
Attachment: | 19208.streetside_build.patch added |
---|
Get StreetSide compiling again. Adds spotless (not run) that enforces the formatting rules stated in CONTRIBUTING.md, various items are commented out to get the build working, gradle dependency updates (note: gradle 4.7 -> 6.4). ant clean dist
and ./gradlew clean build
both work now (Java 11 and older -- Java 14 has some issues). Some tests fail. ant test
does not work.
comment:23 by , 5 years ago
Description: | modified (diff) |
---|
In 16398/josm: