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

Migrate to javax.inject/annotation provided by Jakarta from Maven-Ctrl. #145

Merged
merged 1 commit into from May 9, 2023
Merged

Migrate to javax.inject/annotation provided by Jakarta from Maven-Ctrl. #145

merged 1 commit into from May 9, 2023

Conversation

HannesWell
Copy link
Member

@HannesWell
Copy link
Member Author

@akurtakov or @mickaelistria can you tell how I have to adjust this PR to make the verification build in eclipse-platform/eclipse.platform.releng.aggregator#1057 (which is modified to include this PR) can succeed?
At the moment it fails with

[INFO] --- tycho-compiler:4.0.0-SNAPSHOT:compile (default-compile) @ org.eclipse.platform.doc.isv ---
[INFO] 
[INFO] --- tycho-eclipserun:4.0.0-SNAPSHOT:eclipse-run (dont_skip_me) @ org.eclipse.platform.doc.isv ---
[INFO] {osgi.os=linux, osgi.ws=gtk, org.eclipse.update.install.features=true, osgi.arch=x86_64}
[ERROR] Cannot resolve project dependencies:
[ERROR]   You requested to install 'osgi.bundle; jakarta.annotation-api 0.0.0' but it could not be found

@akurtakov
Copy link
Member

I don't see jakarta.annotation-api in the target platform https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target thus adding it there is the first thing I would try.

@HannesWell
Copy link
Member Author

HannesWell commented May 5, 2023

I don't see jakarta.annotation-api in the target platform https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target thus adding it there is the first thing I would try.

In eclipse-platform/eclipse.platform.releng.aggregator#1057 I added that and for testing changed the .gitmodules file to use my forks master branch, which contains this PR. But still the build fails there with the mentioned error. :/

What I'm not sure about is, if the artifactId needs to be the Bundle-SymbolicName or something else?

@merks
Copy link
Contributor

merks commented May 5, 2023

Yes, it probably needs to be the bundle name not the artifact ID...

@laeubi
Copy link
Contributor

laeubi commented May 5, 2023

What I'm not sure about is, if the artifactId needs to be the Bundle-SymbolicName or something else?

Its always the bundle symbolic name ...

The BSN for https://mvnrepository.com/artifact/jakarta.annotation/jakarta.annotation-api/1.3.5 is:

Bundle-SymbolicName: jakarta.annotation-api

While the bundle name is:

Bundle-Name: Jakarta Annotations API

But the ISV build maybe needs and additional requirement configured to work ... Also keep in mind it might use the I-Builds repository, so you can't use that before it is merged to the target and the master build has deployed the stuff...

@HannesWell
Copy link
Member Author

But the ISV build maybe needs and additional requirement configured to work ... Also keep in mind it might use the I-Builds repository, so you can't use that before it is merged to the target and the master build has deployed the stuff...

Good point. I think that's the reason for this failure.
I assume that it isn't possible to run the ant-build directly using the maven-antrun-plugin?

Anyway, for now I split the replacement of the javax-bundle by jakarta bundles into an addition and removal part and will do the latter after the former is available in an I-build.

@HannesWell
Copy link
Member Author

Although the overall build in eclipse-platform/eclipse.platform.releng.aggregator#1059 failed, the changed co bundles were build successfully. So I think this is ready to go.

@HannesWell HannesWell merged commit 1f6826c into eclipse-platform:master May 9, 2023
1 check passed
@HannesWell HannesWell deleted the javaxAnnotations branch May 9, 2023 07:17
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.

None yet

4 participants