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

Remove nested jars fop, commons-cli, tidy, and commons-codec #1782

Merged
merged 1 commit into from
Jul 4, 2024

Conversation

merks
Copy link
Contributor

@merks merks commented Jul 4, 2024

  • Replace with proper dependencies from Orbit.
  • Update the target platform to specify those dependencies.
  • Garbage collect ant scripts and unused artifacts.

- Replace with proper dependencies from Orbit.
- Update the target platform to specify those dependencies.
- Garbage collect ant scripts and unused artifacts.
@speckyspooky
Copy link
Contributor

I like your change(s) :o)

Thanks for your strong invest(!) to clean up the deployment and all the dependencies.
For me it looks so heavy what you do here (and the other PRs) with all the details and so on.

@merks
Copy link
Contributor Author

merks commented Jul 4, 2024

It would be nice if failing Tycho tests printed the log. I ran it locally and this is why the launch failed:

  Unresolved requirement: Require-Bundle: org.eclipse.birt.chart.device.pdf
    -> Bundle-SymbolicName: org.eclipse.birt.chart.device.pdf; bundle-version="4.17.0.v202407041427"; singleton:="true"
       org.eclipse.birt.chart.device.pdf [513]
         Unresolved requirement: Import-Package: org.apache.fop.svg
           -> Export-Package: org.apache.fop.svg; bundle-symbolic-name="org.apache.xmlgraphics.fop-core"; bundle-version="2.9.0.v20240704-1200"; version="2.9.0"; uses:="org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.dom.util,org.apache.batik.extension.svg,org.apache.batik.gvt,org.apache.batik.gvt.text,org.apache.batik.transcoder,org.apache.batik.util,org.apache.commons.logging,org.apache.fop.apps,org.apache.fop.configuration,org.apache.fop.events,org.apache.fop.fonts,org.apache.fop.pdf,org.apache.fop.svg.font,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.loader.impl,org.apache.xmlgraphics.java2d,org.w3c.dom,org.xml.sax"
              org.apache.xmlgraphics.fop-core [65]
                Unresolved requirement: Import-Package: javax.media.jai; resolution:="optional"
                Unresolved requirement: Import-Package: org.apache.fontbox.cff; version="[2.0.0,3.0.0)"; resolution:="optional"
                Unresolved requirement: Import-Package: org.apache.tools.ant; resolution:="optional"
                Unresolved requirement: Import-Package: org.apache.tools.ant.types; resolution:="optional"
                Unresolved requirement: Import-Package: org.apache.tools.ant.util; resolution:="optional"
                Unresolved requirement: Import-Package: org.apache.fop.events.model; version="[2.9.0,3.0.0)"
                  -> Export-Package: org.apache.fop.events.model; bundle-symbolic-name="org.apache.xmlgraphics.fop-events"; bundle-version="2.9.0.v20240704-1200"; version="2.9.0"; uses:="javax.xml.transform,org.apache.xmlgraphics.util,org.xml.sax"
                     org.apache.xmlgraphics.fop-events [487]
                       Unresolved requirement: Import-Package: com.thoughtworks.qdox; version="[1.12.0,2.0.0)"; resolution:="optional"
                       Unresolved requirement: Import-Package: com.thoughtworks.qdox.model; version="[1.12.0,2.0.0)"; resolution:="optional"
                       Unresolved requirement: Import-Package: org.apache.tools.ant; resolution:="optional"
                       Unresolved requirement: Import-Package: org.apache.tools.ant.types; resolution:="optional"
                       Unresolved requirement: Import-Package: org.apache.tools.ant.types.selectors; resolution:="optional"
                       Unresolved requirement: Import-Package: org.apache.fop.util; version="[2.9.0,3.0.0)"
                         -> Export-Package: org.apache.fop.util; bundle-symbolic-name="org.apache.xmlgraphics.fop-core"; bundle-version="2.9.0.v20240704-1200"; version="2.9.0"; uses:="javax.xml.transform,javax.xml.transform.sax,org.apache.commons.io.output,org.apache.commons.logging,org.apache.fop.apps,org.apache.fop.apps.io,org.apache.fop.fo.expr,org.apache.fop.layoutmgr,org.apache.xmlgraphics.java2d.color,org.apache.xmlgraphics.util,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"
                       Unresolved requirement: Import-Package: org.apache.fop.util.text; version="[2.9.0,3.0.0)"

Indeed it looks like the bundles have circular package imports. I hope that making the org.apache.fop.events.model import in fop-core optional will break that cycle and avoid this problem. Heavy lifting indeed. 😱

@merks merks merged commit 1fed200 into eclipse-birt:master Jul 4, 2024
3 checks passed
@merks merks deleted the pr-remove-nested-3rd-party-jars branch July 4, 2024 16:51
@speckyspooky speckyspooky added the Dependencies Pull requests that update a dependency file label Jul 4, 2024
@speckyspooky speckyspooky added this to the 4.17 milestone Jul 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants