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

Add javax.inject/annotation provided by Jakarta from Maven-Central and include all sources in Eclipse SDK repo #1057

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,18 @@
<version>1.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>1.3.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>1.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
Expand Down Expand Up @@ -246,12 +258,6 @@
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Jetty and servlet API" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>1.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand Down Expand Up @@ -399,7 +405,7 @@
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="OSGi" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
<version>1.1.2</version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,7 @@
<!-- Will be removed soon, once integrated in an appropriate feature -->
<bundle id="org.eclipse.unittest.ui"/>
<bundle id="org.eclipse.unittest.ui.source"/>
<!-- Will be removed as soon as it is pulled in transitivly, when javax-bundles are removed. -->
<bundle id="jakarta.inject.jakarta.inject-api"/>
<bundle id="jakarta.annotation-api"/>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<configuration>
<includeAllDependencies>true</includeAllDependencies>
<includeAllDependencies>true</includeAllDependencies>
<includeAllSources>true</includeAllSources>
</configuration>
</plugin>
<plugin>
Expand Down