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.

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

update mfp version #3409

Merged
merged 1 commit into from
Feb 6, 2018
Merged

update mfp version #3409

merged 1 commit into from
Feb 6, 2018

Conversation

jwkaltz
Copy link
Member

@jwkaltz jwkaltz commented Jan 30, 2018

update mfp version; needs an update to Makefile, too, because mfp starting 3.11 no longer contains a print-apps directory.

Note that mfp 3.11 and older require a Java 8 runtime on the system. A Debian 8 backport for Java 8 is available, and installed on c2c's test and demo servers.

Copy link
Member

@sbrunner sbrunner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want the version 3.12 in the version 2.3 ...

@jwkaltz
Copy link
Member Author

jwkaltz commented Jan 30, 2018

@sbrunner you mean, we don't want the version 3.12 in gmf 2.2? If so, why not?

@sbrunner
Copy link
Member

We don't do some upgrade in stable branch and this one is a huge upgrade because it needs a new Java version, that needs a new Debian version!!!

@jwkaltz
Copy link
Member Author

jwkaltz commented Jan 31, 2018

Changed as discussed.
Note: mfp 3.12 works on Debian 8, so no update of Debian needed. Just need to activate the backport of Java 8 (this has already been done on our test and demo servers, and tested).

Copy link
Member

@sbrunner sbrunner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me we should keep 3.10 as default

zip -d $(PRINT_TMP)/$(PRINT_WAR) print-apps/
# Versions mfp up to 3.10 have a print-apps directory; later versions do not,
# so ignore any errors resulting from zip
zip -d $(PRINT_TMP)/$(PRINT_WAR) print-apps/ | true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

double pipe ...

@@ -1 +1 @@
https://repo1.maven.org/maven2/org/mapfish/print/print-servlet/3.10.6/print-servlet-3.10.6.war
https://repo1.maven.org/maven2/org/mapfish/print/print-servlet/3.12.1/print-servlet-3.12.1.war
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should steel be 3.10.x

@@ -1,4 +1,4 @@
FROM camptocamp/mapfish_print:3.10.6
FROM camptocamp/mapfish_print:3.12.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK.
But another question: should I move this file from scaffolds/update to scaffolds/create as well
(like we are doing for the CONST_print_url file)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file isn't used in standard project then we still keep as it is...

@@ -1 +1 @@
https://repo1.maven.org/maven2/org/mapfish/print/print-servlet/3.10.6/print-servlet-3.10.6.war
https://repo1.maven.org/maven2/org/mapfish/print/print-servlet/3.10.7/print-servlet-3.10.7.war
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we add a changelog entry to say that we should get this file from the CONST_crate_template?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I now added one - does it make sense like that?

@sbrunner
Copy link
Member

sbrunner commented Feb 6, 2018

Squash your commits before merge :-)

=============

1. If you wish to update the version of mapfish-print being used, get the
corresponding file:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To update Mapfish print you should get ...

@sbrunner
Copy link
Member

sbrunner commented Feb 6, 2018

Thanks, don't forget to squash your commits before merge :-)

…, and remove support for mfp 2 in build process
@jwkaltz jwkaltz merged commit 42e0e6a into 2.2 Feb 6, 2018
@jwkaltz jwkaltz deleted the 2_2_update_mfp branch February 6, 2018 15:36
@sbrunner sbrunner added this to the 2.2 milestone Apr 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants