Adds Ares Spifly to target & update site (#196)

Required for Jetty 10 Fixes eclipse-glsp/glsp#928
eclipse-glsp · Feb 22, 2023 · 1bbad98 · 1bbad98
1 parent e3410a2
commit 1bbad98
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/releng/org.eclipse.glsp.repository/category.xml b/releng/org.eclipse.glsp.repository/category.xml
@@ -45,6 +45,24 @@
    <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>
+   <bundle id="org.objectweb.asm">
+      <category name="org.eclipse.glsp.dependencies"/>
+   </bundle>
+   <bundle id="org.objectweb.asm.commons">
+      <category name="org.eclipse.glsp.dependencies"/>
+   </bundle>
+   <bundle id="org.objectweb.asm.tree">
+      <category name="org.eclipse.glsp.dependencies"/>
+   </bundle>
+   <bundle id="org.objectweb.asm.tree.analysis">
+      <category name="org.eclipse.glsp.dependencies"/>
+   </bundle>
+   <bundle id="org.objectweb.asm.util">
+      <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>

diff --git a/targetplatforms/maven-dependencies.tpd b/targetplatforms/maven-dependencies.tpd
@@ -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"
+	}
+}
 
diff --git a/targetplatforms/r2021-09_minimum-baseline.target b/targetplatforms/r2021-09_minimum-baseline.target
@@ -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"/>
@@ -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>

diff --git a/targetplatforms/r2022-12.target b/targetplatforms/r2022-12.target
@@ -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"/>
@@ -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>