Modify

Opened 4 weeks ago

Closed 2 weeks ago

Last modified 45 hours ago

#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 simon04)

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:

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)

19208.streetside_build.patch (6.7 KB) - added by taylor.smock 13 days ago.
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.

Download all attachments as: .zip

Change History (24)

comment:1 Changed 4 weeks ago by simon04

Owner: changed from team to simon04
Status: newassigned

comment:2 Changed 4 weeks ago by simon04

Description: modified (diff)

comment:3 Changed 4 weeks ago by simon04

Description: modified (diff)

comment:4 Changed 4 weeks ago by simon04

In 16398/josm:

see #19208 - JCS: update package to org.apache.commons.jcs3

comment:5 Changed 4 weeks ago by simon04

Description: modified (diff)

comment:6 Changed 4 weeks ago by simon04

Description: modified (diff)

comment:7 Changed 4 weeks ago by simon04

Cc: don-vip floscher 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:8 Changed 4 weeks ago by simon04

In 16399/josm:

see #19208 - ant dist-optimized: fix for jcs3

comment:9 Changed 4 weeks ago by simon04

In 16400/josm:

see #19208 - Update .classpath, nbproject for jcs3

comment:10 Changed 4 weeks ago by simon04

In 16401/josm:

see #19208, see #18644 - JCS: remove workaround for useless JCS warnings (fixed upstream)

comment:11 Changed 4 weeks ago by taylor.smock

I just released a fix for Mapillary in v1.5.23 ( https://github.com/JOSM/Mapillary/releases/tag/v1.5.23 ).

comment:12 Changed 4 weeks ago by simon04

Description: modified (diff)

comment:13 Changed 4 weeks ago by simon04

Description: modified (diff)

comment:14 Changed 3 weeks ago by simon04

Description: modified (diff)

comment:15 in reply to:  7 Changed 3 weeks ago by floscher

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 Changed 3 weeks ago by simon04

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 Changed 3 weeks ago by simon04

Description: modified (diff)

comment:20 Changed 2 weeks ago by simon04

Description: modified (diff)
Resolution: fixed
Status: assignedclosed

@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 in reply to:  20 Changed 2 weeks ago by taylor.smock

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?

Changed 13 days ago by taylor.smock

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:22 Changed 12 days ago by skyper

See #19283, for the affected openstreetcam plugin.

comment:23 Changed 45 hours ago by simon04

Description: modified (diff)

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain simon04.
as The resolution will be set.
The resolution will be deleted.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.