Skip to content

Commit a20ea60

Browse files
authored
Fixes usage of GEMOC updatesite with recent Eclipse package (#250)
replace included plugins by dependency plugins contributes to #248 Signed-off-by: Didier Vojtisek <[email protected]>
1 parent 5491816 commit a20ea60

File tree

2 files changed

+9
-75
lines changed
  • gemoc_studio
    • plugins/org.eclipse.gemoc.gemoc_studio.headless/META-INF
    • releng/org.eclipse.gemoc.gemoc_studio.headless.feature

2 files changed

+9
-75
lines changed

gemoc_studio/plugins/org.eclipse.gemoc.gemoc_studio.headless/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.equinox.app,
2121
org.eclipse.osgi,
2222
org.eclipse.gemoc.commons.eclipse.messagingsystem.api,
2323
org.eclipse.gemoc.xdsmlframework.api,
24-
org.eclipse.sirius.common;bundle-version="6.0.1"
24+
org.eclipse.sirius.common
2525
Bundle-ClassPath: libs/commons-cli.jar,
2626
.
2727
Export-Package: org.eclipse.gemoc.gemoc_studio.headless.application

gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.headless.feature/feature.xml

Lines changed: 8 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ http://www.eclipse.org/legal/epl-v10.html
7373
<import plugin="org.apache.felix.gogo.shell"/>
7474
<import plugin="org.eclipse.gemoc.executionframework.engine.ui"/>
7575
<import plugin="org.eclipse.gemoc.executionframework.debugger"/>
76-
<import plugin="org.eclipse.equinox.common"/>
7776
<import plugin="org.eclipse.osgi"/>
77+
<import plugin="org.eclipse.osgi.compatibility.state"/>
7878
<import plugin="org.eclipse.xtext.xbase"/>
79-
<import plugin="org.eclipse.equinox.common"/>
8079
<import plugin="org.eclipse.xtend.lib"/>
8180
<import plugin="ch.qos.logback.classic" version="1.0.7" match="greaterOrEqual"/>
8281
<import plugin="org.eclipse.gemoc.dsl.model" version="1.0.0" match="greaterOrEqual"/>
@@ -90,12 +89,18 @@ http://www.eclipse.org/legal/epl-v10.html
9089
<import plugin="org.eclipse.compare"/>
9190
<import plugin="org.eclipse.xtext.builder"/>
9291
<import plugin="org.eclipse.equinox.registry"/>
93-
<import plugin="org.eclipse.equinox.common"/>
9492
<import plugin="org.eclipse.gemoc.executionframework.reflectivetrace.model"/>
9593
<import plugin="org.eclipse.emf.transaction"/>
9694
<import plugin="org.eclipse.gemoc.trace.gemoc.api"/>
9795
<import plugin="org.eclipse.gemoc.trace.commons.model"/>
9896
<import plugin="org.eclipse.gemoc.executionframework.event.model"/>
97+
<import plugin="javax.annotation"/>
98+
<import plugin="org.apache.felix.gogo.command"/>
99+
<import plugin="org.eclipse.equinox.app"/>
100+
<import plugin="org.eclipse.equinox.console"/>
101+
<import plugin="org.eclipse.equinox.p2.console"/>
102+
<import plugin="org.eclipse.equinox.p2.directorywatcher"/>
103+
<import plugin="org.eclipse.equinox.p2.reconciler.dropins"/>
99104
</requires>
100105

101106
<plugin
@@ -105,63 +110,13 @@ http://www.eclipse.org/legal/epl-v10.html
105110
version="0.0.0"
106111
unpack="false"/>
107112

108-
<plugin
109-
id="org.eclipse.equinox.p2.console"
110-
download-size="0"
111-
install-size="0"
112-
version="0.0.0"
113-
unpack="false"/>
114-
115-
<plugin
116-
id="org.eclipse.equinox.p2.reconciler.dropins"
117-
download-size="0"
118-
install-size="0"
119-
version="0.0.0"
120-
unpack="false"/>
121-
122113
<plugin
123114
id="fr.inria.diverse.melange"
124115
download-size="0"
125116
install-size="0"
126117
version="0.0.0"
127118
unpack="false"/>
128119

129-
<plugin
130-
id="org.apache.felix.gogo.command"
131-
download-size="0"
132-
install-size="0"
133-
version="0.0.0"
134-
unpack="false"/>
135-
136-
<plugin
137-
id="org.eclipse.equinox.console"
138-
download-size="0"
139-
install-size="0"
140-
version="0.0.0"
141-
unpack="false"/>
142-
143-
<plugin
144-
id="javax.annotation"
145-
download-size="0"
146-
install-size="0"
147-
version="0.0.0"
148-
unpack="false"/>
149-
150-
<plugin
151-
id="org.eclipse.equinox.p2.directorywatcher"
152-
download-size="0"
153-
install-size="0"
154-
version="0.0.0"
155-
unpack="false"/>
156-
157-
<plugin
158-
id="org.eclipse.osgi.compatibility.state"
159-
download-size="0"
160-
install-size="0"
161-
version="0.0.0"
162-
fragment="true"
163-
unpack="false"/>
164-
165120
<plugin
166121
id="org.eclipse.gemoc.dsl"
167122
download-size="0"
@@ -183,27 +138,6 @@ http://www.eclipse.org/legal/epl-v10.html
183138
version="0.0.0"
184139
unpack="false"/>
185140

186-
<plugin
187-
id="org.eclipse.equinox.app"
188-
download-size="0"
189-
install-size="0"
190-
version="0.0.0"
191-
unpack="false"/>
192-
193-
<plugin
194-
id="org.eclipse.equinox.common"
195-
download-size="0"
196-
install-size="0"
197-
version="0.0.0"
198-
unpack="false"/>
199-
200-
<plugin
201-
id="org.eclipse.osgi"
202-
download-size="0"
203-
install-size="0"
204-
version="0.0.0"
205-
unpack="false"/>
206-
207141
<plugin
208142
id="org.eclipse.gemoc.executionframework.engine"
209143
download-size="0"

0 commit comments

Comments
 (0)