Skip to content

Commit 57b84ef

Browse files
authored
Merge pull request #94 from 1C-Company/edt-2022-1
edt-2022-1: Eclipse 2022.03 migration
2 parents c7ed804 + a207e84 commit 57b84ef

File tree

3 files changed

+36
-7
lines changed

3 files changed

+36
-7
lines changed

bundles/com.e1c.ssl.bsl.ui/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Bundle-Localization: plugin
1616
Import-Package: com._1c.g5.modeling.xtext.scoping;version="[4.1.0,5.0.0)",
1717
com._1c.g5.v8.dt.bsl.documentation.comment;version="[3.0.0,4.0.0)",
1818
com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
19-
com._1c.g5.v8.dt.bsl.resource;version="[13.0.0,14.0.0)",
19+
com._1c.g5.v8.dt.bsl.resource;version="[14.0.0,15.0.0)",
2020
com._1c.g5.v8.dt.bsl.ui.contentassist.stringliteral;version="[5.0.0,6.0.0)",
2121
com._1c.g5.v8.dt.bsl.validation.stringliterals;version="[5.0.0,6.0.0)",
2222
com._1c.g5.v8.dt.lcore.naming;version="[1.0.0,2.0.0)",
@@ -30,5 +30,5 @@ Import-Package: com._1c.g5.modeling.xtext.scoping;version="[4.1.0,5.0.0)",
3030
com._1c.g5.wiring;version="[2.0.0,3.0.0)",
3131
com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)",
3232
com.e1c.ssl.bsl;version="[0.6.0,0.7.0)",
33-
com.google.inject;version="[1.3.0,2.0.0)"
33+
com.google.inject;version="[5.0.1,6.0.0)"
3434
Export-Package: com.e1c.ssl.bsl.ui;version="0.6.0"

bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Automatic-Module-Name: com.e1c.ssl.bsl
1616
Bundle-Localization: plugin
1717
Bundle-ActivationPolicy: lazy
1818
Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
19-
com._1c.g5.v8.bm.integration;version="[9.0.0,10.0.0)",
19+
com._1c.g5.v8.bm.integration;version="[10.0.0,11.0.0)",
2020
com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
2121
com._1c.g5.v8.dt.bsl.model.util;version="[4.0.0,5.0.0)",
22-
com._1c.g5.v8.dt.bsl.resource;version="[13.0.0,14.0.0)",
22+
com._1c.g5.v8.dt.bsl.resource;version="[14.0.0,15.0.0)",
2323
com._1c.g5.v8.dt.bsl.typesystem;version="[9.0.0,10.0.0)",
2424
com._1c.g5.v8.dt.bsl.typesystem.util;version="[9.0.0,10.0.0)",
2525
com._1c.g5.v8.dt.core.platform;version="[10.0.0,11.0.0)",

targets/default/default.target

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<locations>
1313
<!-- EDT -->
1414
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
15+
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2022.1/"/>
1516
<unit id="com._1c.g5.aef.feature.feature.group" version="0.0.0"/>
1617
<unit id="com._1c.g5.commons.feature.group" version="0.0.0"/>
1718
<unit id="com._1c.g5.edt.license.feature.group" version="0.0.0"/>
@@ -74,7 +75,6 @@
7475
<unit id="org.eclipse.emf.validation.feature.group" version="0.0.0"/>
7576
<unit id="org.eclipse.emf.validation.ocl.feature.group" version="0.0.0"/>
7677
<unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
77-
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
7878
<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="0.0.0"/>
7979
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
8080
<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="0.0.0"/>
@@ -105,7 +105,6 @@
105105
<unit id="org.eclipse.xsd.edit.feature.group" version="0.0.0"/>
106106
<unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
107107
<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
108-
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2021.3/"/>
109108
</location>
110109

111110
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -116,7 +115,37 @@
116115
<!-- Eclipse -->
117116
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
118117
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
119-
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2020-12/"/>
118+
<unit id="org.eclipse.epp.mpc.core" version="0.0.0"/>
119+
<unit id="org.eclipse.epp.mpc.ui" version="0.0.0"/>
120+
<unit id="org.eclipse.epp.mpc.ui.css" version="0.0.0"/>
121+
<unit id="org.eclipse.epp.mpc.help.ui" version="0.0.0"/>
122+
<unit id="org.eclipse.equinox.ds" version="1.6.100.v20191001-1333"/>
123+
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2022-03/"/>
124+
</location>
125+
126+
<!-- ORBIT Guava 30.1.0-->
127+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
128+
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
129+
<unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/>
130+
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
131+
</location>
132+
133+
<!-- LIBS -->
134+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
135+
<unit id="org.mockito" version="0.0.0"/>
136+
<unit id="org.apache.xalan" version="2.7.2.v20201124-1837"/>
137+
<unit id="org.apache.xalan.source" version="2.7.2.v20201124-1837"/>
138+
<unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
139+
<unit id="org.apache.batik.script.source" version="1.14.0.v20210324-0332"/>
140+
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
141+
<unit id="org.apache.batik.codec.source" version="1.14.0.v20210324-0332"/>
142+
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
143+
<unit id="org.apache.batik.ext.source" version="1.14.0.v20210324-0332"/>
144+
<unit id="org.apache.batik.transcoder.source" version="1.14.0.v20210324-0332"/>
145+
<unit id="org.apache.batik.transcoder" version="1.14.0.v20210324-0332"/>
146+
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
147+
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
148+
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
120149
</location>
121150

122151
</locations>

0 commit comments

Comments
 (0)