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

Issue #5675 Update some osgi test dependencies #5676

Merged
merged 8 commits into from Dec 2, 2020

Conversation

janbartel
Copy link
Contributor

closes #5675

Update many of the 3rd party osgi test dependencies:

biz.aQute.bnd bndlib 5.2.0
org.ops4j.pax.tinybundles tinybundles 3.0.0
org.ops4j.pax.url pax-url-wrap 2.6.2
org.ops4j.pax.url pax-url-aether 2.6.2

Note: updating the version of org.ops4j.pax.exam:pax-exam-container-forked from 4.13.1 to 4.13.4 did not work and needs more investigation in a separate pull request.

Signed-off-by: Jan Bartel <janb@webtide.com>
@janbartel janbartel added this to In progress in Jetty 9.4.35 via automation Nov 16, 2020
@janbartel janbartel linked an issue Nov 16, 2020 that may be closed by this pull request
@janbartel janbartel requested a review from olamy November 16, 2020 15:14
@joakime
Copy link
Contributor

joakime commented Nov 16, 2020

Tip. You can use Maven to list updates ...

Example: Change to the jetty-osgi directory in your shell and run these ...

# To show list of dependencies that can be updated
$ mvn org.codehaus.mojo:versions-maven-plugin:2.8.1:display-dependency-updates

# To show list of plugins that can have updates
$ org.codehaus.mojo:versions-maven-plugin:2.8.1:display-plugin-updates

# To show list of maven properties that manage dependencies that can be updated
$ org.codehaus.mojo:versions-maven-plugin:2.8.1:display-property-updates

Copy link
Contributor

@joakime joakime left a comment

Choose a reason for hiding this comment

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

Concerns about osgi-services-version too

@@ -12,7 +12,7 @@
<packaging>pom</packaging>

<properties>
<osgi-version>3.6.0.v20100517</osgi-version>
<osgi-version>3.7.1</osgi-version>
<osgi-services-version>3.2.100.v20100503</osgi-services-version>
Copy link
Contributor

Choose a reason for hiding this comment

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

This osgi-services-version is still using ...

<dependency>
  <groupId>org.eclipse.osgi</groupId>
  <artifactId>org.eclipse.osgi.services</artifactId>
  <version>3.2.100.v20100503</version>
</dependency>

Which is the old, bad, maven coordinates. (which is a 10 year old artifact now with no updates on this coordinate space)
Link to old / bad coordinates: https://search.maven.org/artifact/org.eclipse.osgi/org.eclipse.osgi.services

The correct coordinates for osgi.services is ...

<dependency>
  <groupId>org.eclipse.platform</groupId>
  <artifactId>org.eclipse.osgi.services</artifactId>
  <version>3.9.0</version>
</dependency>

Which was updated 14-Sep-2020
Link to proper coordinates: https://search.maven.org/artifact/org.eclipse.platform/org.eclipse.osgi.services

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you're positive that those 2 different coordinates are for the osgi services, then I'll try updating the version of that. I did look for a newer version, but obviously only at the old coordinates.

Copy link
Contributor

@joakime joakime Nov 24, 2020

Choose a reason for hiding this comment

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

The version from the bad coordinates is also dependent on the older osgi version ...

    <dependency>
      <groupId>org.eclipse.osgi</groupId>
      <artifactId>org.eclipse.osgi</artifactId>
      <version>3.6.0.v20100517</version>
    </dependency>

Copy link
Contributor

@joakime joakime Nov 24, 2020

Choose a reason for hiding this comment

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

The listed packages for both ...

Old Coordinate Space

$ jar -tvf org.eclipse.osgi.services-3.2.100.v20100503.jar | cut -c37- | grep -E ".class$" | sed -e "s/[A-Za-z0-9\$]*\.class//" | sort -u | grep -v "META-INF"
org/osgi/service/cm/
org/osgi/service/component/
org/osgi/service/device/
org/osgi/service/event/
org/osgi/service/http/
org/osgi/service/io/
org/osgi/service/log/
org/osgi/service/metatype/
org/osgi/service/provisioning/
org/osgi/service/upnp/
org/osgi/service/useradmin/
org/osgi/service/wireadmin/

New Coordinate Space

$ jar -tvf org.eclipse.osgi.services-3.9.0.jar | cut -c37- | grep -E ".class$" | sed -e "s/[A-Za-z0-9\$\-]*\.class//" | sort -u | grep -v "META-INF"
org/osgi/service/cm/
org/osgi/service/component/
org/osgi/service/component/annotations/
org/osgi/service/component/runtime/
org/osgi/service/component/runtime/dto/
org/osgi/service/device/
org/osgi/service/event/
org/osgi/service/http/
org/osgi/service/http/context/
org/osgi/service/http/runtime/
org/osgi/service/http/runtime/dto/
org/osgi/service/http/whiteboard/
org/osgi/service/log/
org/osgi/service/metatype/
org/osgi/service/provisioning/
org/osgi/service/upnp/
org/osgi/service/useradmin/
org/osgi/service/wireadmin/

Jetty 9.4.35 automation moved this from In progress to Review in progress Nov 24, 2020
Signed-off-by: Jan Bartel <janb@webtide.com>
@janbartel
Copy link
Contributor Author

@joakim please rereview

Signed-off-by: Jan Bartel <janb@webtide.com>
@janbartel janbartel added this to In progress in Jetty 9.4.36 via automation Nov 25, 2020
@janbartel janbartel removed this from Review in progress in Jetty 9.4.35 Nov 25, 2020
Copy link
Contributor

@joakime joakime left a comment

Choose a reason for hiding this comment

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

Code changes wise, I'm good with this PR.

Lets get a green CI build once, and then merge it.

Jetty 9.4.36 automation moved this from In progress to Reviewer approved Nov 30, 2020
@joakime joakime added the Test label Dec 2, 2020
@joakime
Copy link
Contributor

joakime commented Dec 2, 2020

@janbartel we have a green CI build. go ahead and merge this one.

@janbartel janbartel merged commit f0a2ab4 into jetty-9.4.x Dec 2, 2020
Jetty 9.4.36 automation moved this from Reviewer approved to Done Dec 2, 2020
@janbartel janbartel deleted the jetty-9.4.x-5675-update-osgi-test-deps branch December 2, 2020 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Update osgi test dependencies
2 participants