Skip to content

release: 2025.5.0: compatability updates, build agaist firefly release-2025.5.2 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robyww merged 1 commit into from
Jan 14, 2026
Merged

release: 2025.5.0: compatability updates, build agaist firefly release-2025.5.2 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// adjustable application runtime properties
//---------------------------------------------
BuildMajor = 2025
BuildMinor = 4
BuildRev = 2
BuildMinor = 5
BuildRev = 0
BuildNumber = 0
// NB: the BuildType is overridden in the environment-specific settings below.
BuildType = "Development"

firefly.tag.name = "release-2025.4.2"
firefly.tag.name = "release-2025.5.2"

mail.transport.protocol = "smtp"
mail.smtp.host = "mail.ncsa.illinois.edu"
Expand Down
1 change: 1 addition & 0 deletions src/suit/js/SUIT.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ let options = {
],
label: 'Rubin Featured MOC '
},
adhocMocIncludeAdditionSources: '',
},
// workspace: {showOptions: true},
searchActions : [
Expand Down
6 changes: 4 additions & 2 deletions src/suit/test/edu/caltech/ipac/firefly/server/query/LSSTDbServTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -87,7 +88,7 @@ public void testCatalogQueries() {

private static boolean getJsonData(String query) {
try {
String sql = "QUERY=" + URLEncoder.encode(query, "UTF-8");
String sql = URLEncoder.encode(query, "UTF-8");

String url = LSSTQuery.getDbservURL();
File file = File.createTempFile("lssttest", "json");
Expand All @@ -96,7 +97,8 @@ private static boolean getJsonData(String query) {
requestHeader.put("Accept", "application/json");

long cTime = System.currentTimeMillis();
FileInfo fileData = URLDownload.getDataToFileUsingPost(new URL(url), sql, null, requestHeader, file, null, 180);
var postParams= Collections.singletonMap("QUERY", sql);
FileInfo fileData = URLDownload.getDataToFileUsingPost(new URL(url), postParams, null, requestHeader, file, null, 180);
ConfigTest.LOG.info("SQL query took " + (System.currentTimeMillis() - cTime) + "ms");
ConfigTest.LOG.info(query);

Expand Down