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

dep(jruby): use jar-dependencies to manage most java dependencies #2432

Merged
merged 2 commits into from
Jan 20, 2022

Conversation

flavorjones
Copy link
Member

What problem is this PR intended to solve?

Addresses part of #1253

These deps are managed using jar-dependencies:

  • isorelax
  • jing
  • serializer
  • xalan
  • xercesImpl
  • xml-apis

Note that the following versions were changed:

  • jing: com.thaiopensource:jing:20091111 → nu.validator:jing:20200702VNU
  • xercesImpl: xerces:xercesImpl:2.12.0 → xerces:xercesImpl:2.12.1

Note that the following new dependences were introduced:

  • Saxon-HE 9.6.0-4 (via nu.validator:jing:20200702VNU)

Finally, note that we still use a local jar for nekohtml and nekodtd, which is not the ideal end
state.

Tagging @headius and @mkristian for feedback on this PR since this is all pretty new to me.

Have you included adequate test coverage?

Existing tests that include packaging and testing a java platform gem should be sufficient.

Does this change affect the behavior of either the C or the Java implementations?

No.

Addresses part of #1253

These deps are managed using jar-dependencies:

- isorelax
- jing
- serializer
- xalan
- xercesImpl
- xml-apis

Note that the following versions were changed:

- jing: com.thaiopensource:jing:20091111 → nu.validator:jing:20200702VNU
- xercesImpl: xerces:xercesImpl:2.12.0 → xerces:xercesImpl:2.12.1

Note that the following new dependences were introduced:

- Saxon-HE 9.6.0-4 (via nu.validator:jing:20200702VNU)

Finally, note that we still use a local jar for nekohtml and nekodtd, which is not the ideal end
state.
@flavorjones flavorjones added this to the v1.14.0 milestone Jan 19, 2022
@flavorjones flavorjones force-pushed the 1253-jar-dependencies branch from 4ea9ccd to 7d4f47f Compare January 19, 2022 22:45
@flavorjones
Copy link
Member Author

This seems to work, so I'm going to merge it. I'm curious if anyone has an opinion about vendoring-or-not-vendoring the jar files, please comment or ping me directly with your thoughts.

@QroV

This comment was marked as off-topic.

flavorjones added a commit that referenced this pull request May 12, 2022
…dep-version-info

feat: better jruby dependency listings in VersionInfo

---

**What problem is this PR intended to solve?**

After moving to maven-managed dependencies, the output from `nokogiri -v` looked like:

```
# Nokogiri (1.14.0.dev)
    ---
    warnings: []
    nokogiri:
      version: 1.14.0.dev
    ruby:
      version: 2.6.8
      platform: java
      gem_platform: universal-java-11
      description: jruby 9.3.2.0 (2.6.8) 2021-12-01 0b8223f905 OpenJDK 64-Bit Server VM
        11.0.15+10-Ubuntu-0ubuntu0.20.04.1 on 11.0.15+10-Ubuntu-0ubuntu0.20.04.1 [linux-x86_64]
      engine: jruby
      jruby: 9.3.2.0
    other_libraries:
      isorelax: isorelax:isorelax:20030108
      Saxon-HE: net.sf.saxon:Saxon-HE:9.6.0-4
      neko-htmlunit: net.sourceforge.htmlunit:neko-htmlunit:2.61.0
      jing: nu.validator:jing:20200702VNU
      nekodtd: org.nokogiri:nekodtd:0.1.11.noko1
      serializer: xalan:serializer:2.7.2
      xalan: xalan:xalan:2.7.2
      xercesImpl: xerces:xercesImpl:2.12.2
      xml-apis: xml-apis:xml-apis:1.4.01
```

after this PR it looks like:

```
# Nokogiri (1.14.0.dev)
    ---
    warnings: []
    nokogiri:
      version: 1.14.0.dev
    ruby:
      version: 2.6.8
      platform: java
      gem_platform: universal-java-11
      description: jruby 9.3.2.0 (2.6.8) 2021-12-01 0b8223f905 OpenJDK 64-Bit Server VM
        11.0.15+10-Ubuntu-0ubuntu0.20.04.1 on 11.0.15+10-Ubuntu-0ubuntu0.20.04.1 [linux-x86_64]
      engine: jruby
      jruby: 9.3.2.0
    other_libraries:
      isorelax:isorelax: '20030108'
      net.sf.saxon:Saxon-HE: 9.6.0-4
      net.sourceforge.htmlunit:neko-htmlunit: 2.61.0
      nu.validator:jing: 20200702VNU
      org.nokogiri:nekodtd: 0.1.11.noko1
      xalan:serializer: 2.7.2
      xalan:xalan: 2.7.2
      xerces:xercesImpl: 2.12.2
      xml-apis:xml-apis: 1.4.01
```

(note the change to `other_libraries`).

See #2432 for the changeset that introduced the previous format.


**Have you included adequate test coverage?**

Existing coverage should suffice.


**Does this change affect the behavior of either the C or the Java implementations?**

Only the JRuby VERSION_INFO has changed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants