Skip to content

Forward-port bug fixes from CD02 REL branch - #5470

Merged
stianst merged 3 commits into
keycloak:masterfrom
ASzc:CD02_REL
Aug 20, 2018
Merged

stianst merged 3 commits into
keycloak:masterfrom
ASzc:CD02_REL

Conversation

@ASzc

@ASzc ASzc commented Aug 16, 2018

Copy link
Copy Markdown
Contributor

These were left out of master in the confusion with CD02, so we're hitting them again.

ASzc added 3 commits August 16, 2018 09:35
…ty profile

In commit d70859e keycloak-pax-web-jetty94 was added.

org.keycloak:keycloak-jetty94-adapter:jar is a dependency of this module, and
isn't produced outside of the community profile. So, the jetty94 module here
must be consistent with that.
…uct.rhsso.version

When `product.filename.version` is hardcoded to 7.2, it obviously doesn't
update when `product.rhsso.version` changes. By using
build-helper-maven-plugin, it's now derived automatically, and we shouldn't see
this issue pop up again for e.g. 7.4.
@stianst
stianst requested a review from martin-kanis August 17, 2018 08:27
@stianst

stianst commented Aug 17, 2018

Copy link
Copy Markdown
Contributor

If we are doing CD03 from Sprint #10 these commits should be cherry-picked to REL branch as well

@ASzc

ASzc commented Aug 17, 2018

Copy link
Copy Markdown
Contributor Author

@stianst created a PR for REL: #5473

@stianst
stianst merged commit b6d545b into keycloak:master Aug 20, 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.

3 participants