Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

JBPM-6274 - Update batik to 1.9 for master branch #700

Merged
merged 1 commit into from Nov 28, 2017
Merged

JBPM-6274 - Update batik to 1.9 for master branch #700

merged 1 commit into from Nov 28, 2017

Conversation

tsurdilo
Copy link
Member

No description provided.

@mareknovotny
Copy link
Member

It seems that org.apache.xmlgraphics:batik-extension:jar is not managed in IP-BOM correctly, it contains instead batik-ext

We need to fix that first in IP BOM

[ERROR] 'dependencies.dependency.version' for org.apache.xmlgraphics:batik-extension:jar is missing. @ org.jbpm:jbpm-designer-backend:[unknown-version], /home/jenkins/workspace/jbpm-designer-pullrequests/jbpm-designer-backend/pom.xml, line 248, column 17

@mareknovotny
Copy link
Member

I may be wrong on first view, but is batik-ext needed for jbpm-designer?
I saw at some point they were both in pom.xml, but now it is only batik-extension,

@tsurdilo
Copy link
Member Author

@mareknovotny after checking it seems neither are actually needed. I removed them and also added needed exclude for banned jar (pr amended). Thanks!

@mareknovotny
Copy link
Member

@tsurdilo great! That is even better than I thought.

Now there are some enforcer warnings for duplicated classes in 4 dependencies

  • org.apache.xmlgraphics:batik-js:jar:1.7:compile vs. org.mozilla:rhino:jar:1.7R4:compile
  • avalon-framework:avalon-framework:jar:4.1.4:compile vs org.apache.avalon.framework:avalon-framework-impl:jar:4.3.1:compile
  • xml-apis:xml-apis:jar:1.4.01:compile vs. org.apache.xmlgraphics:batik-ext:jar:1.7:compile
  • org.apache.avalon.framework:avalon-framework-api:jar:4.3.1:compile vs. avalon-framework:avalon-framework:jar:4.1.4:compile

@tsurdilo
Copy link
Member Author

@mareknovotny i think i found one more issue -- for designer tests to compile we need to up the version of
version.org.apache.xmlgraphics.common to 2.0 (or higher) as that is when the class
org.apache.xmlgraphics.java2d.color.NamedColorSpace is included there
which is needed at runtime for the png generation for designer.

@mareknovotny
Copy link
Member

@tsurdilo ok, that seems like we need to declare it too for it to be transparent, right as org.apache.xmlgraphics.commons:xmlgraphics-commons is transitive deps

Right now there is kiegroup/droolsjbpm-build-bootstrap#604 which removes batik dependency management and keep them only in IP-BOM, so it seems to me that we need to move that xmlgraphics-commons with that change as splitting is troublesome for current layout of BOMs.

@mbiarnes, please can you remove the xmlgraphics-commons from your PR kiegroup/droolsjbpm-build-bootstrap#604 too and I will sent IP-BOM update with inclusion of xmlgraphics-commons?

@tsurdilo
Copy link
Member Author

we should ask jenkins to retest this pr once jboss-integration/jboss-integration-platform-bom#409 is committed

@tsurdilo
Copy link
Member Author

Jenkins retest please

@mareknovotny
Copy link
Member

Jenkins please retest

@tsurdilo
Copy link
Member Author

@mareknovotny i think now we need to wait for kiegroup/droolsjbpm-build-bootstrap#604 :) sorry i did not realize that was not merged

@tsurdilo
Copy link
Member Author

tsurdilo commented Nov 27, 2017

@mareknovotny tell me please if im wrong but without kiegroup/droolsjbpm-build-bootstrap#604 merged the changes to the ipbom regarding the xmlgraphics:commons lib update will never get picked up and designer will still use the 1.4 version specified in the build-bootstrap?

@tsurdilo
Copy link
Member Author

also depends on changes in kiegroup/droolsjbpm-build-bootstrap#604 specifically

https://github.com/kiegroup/droolsjbpm-build-bootstrap/pull/604/files#diff-600376dffeb79835ede4a0b285078036L94

so the 2.2 version is received from the ipbom

@mareknovotny
Copy link
Member

@tsurdilo yes, you are right, unfortunately i don't have merge permission so we need to ask someone who can do it

@tsurdilo
Copy link
Member Author

Jenkins retest please

@tsurdilo
Copy link
Member Author

@mareknovotny ok now we depending on kiegroup/droolsjbpm-build-bootstrap#624

@tsurdilo
Copy link
Member Author

Jenkins retest please

@tsurdilo
Copy link
Member Author

waiting on kiegroup/droolsjbpm-integration#1294

@tsurdilo
Copy link
Member Author

Jenkins retest please

@tsurdilo
Copy link
Member Author

tsurdilo commented Nov 28, 2017

@mareknovotny @psiroky I think we are good to go finally :) could please one of you guys approve? Thanks. Need this to go in so can add prs for 6.4.8 :)

@mareknovotny
Copy link
Member

@tsurdilo great news, I think it is good to go.

@tsurdilo tsurdilo merged commit 94ef9a8 into kiegroup:master Nov 28, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants