Skip to content
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

Jump to bottom

[pull] main from geoserver:main #30

Merged
merged 2 commits into from
Jun 16, 2024
Merged

[pull] main from geoserver:main #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de5731b
[GEOS-11432] Upgrade to ImageIO-EXT 1.4.12
aaime Jun 14, 2024
06f6bd9
[GEOS-11390] Replace TestWfsPost with Javascript Demo Page
david-blasby Jun 14, 2024
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
1 change: 1 addition & 0 deletions src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/WPSRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ String getRequestXML() {

@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(
JavaScriptContentHeaderItem.forScript(
DemoRequestsPage.demoRequestsJavascript, null));
Expand Down
2 changes: 1 addition & 1 deletion src/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<wicket.version>7.18.0</wicket.version>
<ant.version>1.10.11</ant.version>
<httpclient.version>4.5.14</httpclient.version>
<imageio-ext.version>1.4.11</imageio-ext.version>
<imageio-ext.version>1.4.12</imageio-ext.version>
<jaiext.version>1.1.25</jaiext.version>
<java.awt.headless>true</java.awt.headless>
<sun.java2d.d3d>true</sun.java2d.d3d>
Expand Down
1 change: 1 addition & 0 deletions src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequestsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public DemoRequestsPage(PageParameters parameters) {

@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptContentHeaderItem.forScript(demoRequestsJavascript, null));
}

Expand Down
1 change: 1 addition & 0 deletions src/web/wcs/src/main/java/org/geoserver/wcs/web/demo/WCSRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ String getRequestXML() {

@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(
JavaScriptContentHeaderItem.forScript(
DemoRequestsPage.demoRequestsJavascript, null));
Expand Down
Loading