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.

Sign up for GitHub

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

Adds Ares Spifly to target & update site #196

Merged
merged 2 commits into from
Feb 22, 2023
Merged

Adds Ares Spifly to target & update site #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5425c8a
Adds Ares Spifly to target & update site
tortmayr Feb 22, 2023
b28575f
Fix transitive dependency resolution
tortmayr Feb 22, 2023
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
3 changes: 3 additions & 0 deletions releng/org.eclipse.glsp.repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
<bundle id="javax.websocket">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.apache.aries.spifly.dynamic.bundle">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<category-def name="org.eclipse.glsp" label="Eclipse GLSP"/>
<category-def name="org.eclipse.glsp.examples" label="GLSP Examples">
<description>
Expand Down
7 changes: 7 additions & 0 deletions targetplatforms/maven-dependencies.tpd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,11 @@ maven slf4j scope=compile dependencyDepth=none missingManifest=generate {
}
}

maven spifly scope=compile,test dependencyDepth=infinite missingManifest=generate {
dependency {
groupId="org.apache.aries.spifly"
artifactId="org.apache.aries.spifly.dynamic.bundle"
version="1.3.6"
}
}

12 changes: 11 additions & 1 deletion targetplatforms/r2021-09_minimum-baseline.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="2021-09 - Minimum Baseline" sequenceNumber="1674471493">
<target name="2021-09 - Minimum Baseline" sequenceNumber="1677074394">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.27.0.v20210816-1137"/>
Expand Down Expand Up @@ -33,6 +33,16 @@
<unit id="javax.websocket" version="1.1.0.20180730"/>
<repository location="https://download.eclipse.org/gemini/updates/web/3.0.4"/>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="false" missingManifest="generate" type="Maven" label="spifly">
<dependencies>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.6</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="slf4j">
<dependencies>
<dependency>
Expand Down
12 changes: 11 additions & 1 deletion targetplatforms/r2022-12.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="2022-12 - Default" sequenceNumber="1674470297">
<target name="2022-12 - Default" sequenceNumber="1677074361">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.32.0.v20221121-1400"/>
Expand Down Expand Up @@ -33,6 +33,16 @@
<unit id="javax.websocket" version="1.1.0.20180730"/>
<repository location="https://download.eclipse.org/gemini/updates/web/3.0.4"/>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="false" missingManifest="generate" type="Maven" label="spifly">
<dependencies>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.6</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="slf4j">
<dependencies>
<dependency>
Expand Down