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 no longer required annotations.jar #132

Merged
merged 1 commit into from
Oct 6, 2022

Conversation

laeubi
Copy link
Member

@laeubi laeubi commented Oct 6, 2022

No description provided.

@laeubi laeubi requested a review from tjwatson October 6, 2022 14:00
Copy link
Contributor

@tjwatson tjwatson left a comment

Choose a reason for hiding this comment

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

Why not delete the other two instances of this JAR also?

org.eclipse.equinox.http.servlet/osgi/osgi.annotation.jar
org.eclipse.osgi.services/lib/osgi.annotation.jar

@laeubi laeubi force-pushed the remove_annotation_jar branch from f79deec to b91f96c Compare October 6, 2022 14:09
@laeubi
Copy link
Member Author

laeubi commented Oct 6, 2022

Why not delete the other two instances of this JAR also?

Done!

@laeubi laeubi force-pushed the remove_annotation_jar branch from 551f7ec to 3039b1e Compare October 6, 2022 14:55
@github-actions
Copy link

github-actions bot commented Oct 6, 2022

Unit Test Results

     24 files       24 suites   11m 32s ⏱️
2 138 tests 2 094 ✔️ 44 💤 0
2 182 runs  2 138 ✔️ 44 💤 0

Results for commit 3039b1e.

@laeubi laeubi requested a review from tjwatson October 6, 2022 15:17
Copy link
Contributor

@tjwatson tjwatson left a comment

Choose a reason for hiding this comment

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

LGTM

@laeubi laeubi merged commit e43deae into eclipse-equinox:master Oct 6, 2022
@iloveeclipse
Copy link
Member

Looks like this caused now releng errors: https://download.eclipse.org/eclipse/downloads/drops4/I20221006-1800/testresults/html/org.eclipse.releng.tests_ep426I-unit-win32-java11_win32.win32.x86_64_11.html

https://download.eclipse.org/eclipse/downloads/drops4/I20221006-1800/compilelogs/platform.doc.isv.javadoc.txt

../../../equinox/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/ExtendedHttpService.java:20: error: package org.osgi.annotation.versioning does not exist
import org.osgi.annotation.versioning.ProviderType;
                                     ^
../../../equinox/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/ExtendedHttpService.java:27: error: cannot find symbol
@ProviderType
 ^
  symbol: class ProviderType
2 errors

@laeubi
Copy link
Member Author

laeubi commented Oct 7, 2022

How can one test this? It seems https://github.com/eclipse-platform/eclipse.platform.common has no verification builds :-\

Essentially I think the isv builds need to always include the following (just for demonstration, not valid ISV build syntax most probably!):

<additionalDependencies>
	<additionalDependency>
		<groupId>org.osgi</groupId>
		<artifactId>org.osgi.annotation.bundle</artifactId>
		<version>2.0.0</version>
	</additionalDependency>
	<additionalDependency>
		<groupId>org.osgi</groupId>
		<artifactId>org.osgi.annotation.versioning</artifactId>
		<version>1.1.2</version>
	</additionalDependency>
	<additionalDependency>
		<groupId>org.osgi</groupId>
		<artifactId>org.osgi.service.component.annotations</artifactId>
		<version>1.5.0</version>
	</additionalDependency>
</additionalDependencies>

@akurtakov
Copy link
Member

The way I test it:

@akurtakov
Copy link
Member

I'm working on a fix

akurtakov added a commit to eclipse-platform/eclipse.platform.common that referenced this pull request Oct 7, 2022
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.

4 participants