Skip to content

Commit 492a203

Browse files
marmyshevmarmyshev
authored
Merge pull request #14 from 1C-Company/feature/11-edt-2021-1
Переход на EDT 2021.1
2 parents 5c1cf13 + 727e146 commit 492a203

File tree

7 files changed

+27
-44
lines changed

7 files changed

+27
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## 0.4.0
44

5+
* Переход на EDT 2021.1
56

67
## 0.3.0
78

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
| 0.1.1 для 1C:EDT 2020.4 | https://edt.1c.ru/releases/plugins/ssl-support/edt-2020.4.0/0.1.1/repo/ | https://edt.1c.ru/releases/plugins/ssl-support/edt-2020.4.0/0.1.1/repo.zip |
7070
| 0.2.0 для 1C:EDT 2020.5 | https://edt.1c.ru/releases/plugins/ssl-support/edt-2020.5.0/0.2.0/repo/ | https://edt.1c.ru/releases/plugins/ssl-support/edt-2020.5.0/0.2.0/repo.zip |
7171
| 0.3.0 для 1C:EDT 2020.6 | https://edt.1c.ru/releases/plugins/ssl-support/edt-2020.6/0.3.0/repo/ | https://edt.1c.ru/releases/plugins/ssl-support/edt-2020.6/0.3.0/repo.zip |
72+
| 0.4.0 для 1C:EDT 2021.1 | https://edt.1c.ru/releases/plugins/ssl-support/edt-2021.1/0.4.0/repo/ | https://edt.1c.ru/releases/plugins/ssl-support/edt-2021.1/0.4.0/repo.zip |
7273

7374
Для входа на сайт https://edt.1c.ru используйте логин и пароль сайта https://its.1c.ru/ .
7475

‎bom/pom.xml‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020 1C-Soft LLC
4-
This program and the accompanying materials are made available under
5-
the terms of the Eclipse Public License 2.0 which is available at
6-
https://www.eclipse.org/legal/epl-2.0/
7-
SPDX-License-Identifier: EPL-2.0
8-
Contributors:
9-
1C-Soft LLC - initial API and implementation
10-
Aleksandr Kapralov - checkstyle version fix
11-
-->
3+
4+
Copyright (C) 2021, 1C-Soft LLC and others.
5+
6+
This program and the accompanying materials are made
7+
available under the terms of the Eclipse Public License 2.0
8+
which is available at https://www.eclipse.org/legal/epl-2.0/
9+
10+
SPDX-License-Identifier: EPL-2.0
11+
12+
Contributors:
13+
1C-Soft LLC - initial API and implementation
14+
Aleksandr Kapralov - checkstyle version fix
15+
-->
1216
<project
1317
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
1418
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -26,8 +30,8 @@
2630
</prerequisites>
2731

2832
<properties>
29-
<tycho.version>1.7.0</tycho.version>
30-
<tycho.extras.version>1.7.0</tycho.extras.version>
33+
<tycho.version>2.2.0</tycho.version>
34+
<tycho.extras.version>2.2.0</tycho.extras.version>
3135

3236
<spotbugs.maven.plugin.version>3.1.12.2</spotbugs.maven.plugin.version>
3337
<maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
@@ -174,17 +178,6 @@
174178
<skipArchive>{p2repo.archive.skip}</skipArchive>
175179
</configuration>
176180
</plugin>
177-
<plugin>
178-
<groupId>org.eclipse.tycho.extras</groupId>
179-
<artifactId>tycho-source-feature-plugin</artifactId>
180-
<version>${tycho.extras.version}</version>
181-
<configuration>
182-
<includeBinaryFeature>false</includeBinaryFeature>
183-
<archive>
184-
<addMavenDescriptor>false</addMavenDescriptor>
185-
</archive>
186-
</configuration>
187-
</plugin>
188181
<plugin>
189182
<groupId>org.eclipse.tycho.extras</groupId>
190183
<artifactId>tycho-eclipserun-plugin</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Automatic-Module-Name: com.e1c.ssl.bsl.ui
1414
Bundle-ActivationPolicy: lazy
1515
Bundle-Localization: plugin
1616
Import-Package: com._1c.g5.modeling.xtext.scoping;version="[4.1.0,5.0.0)",
17-
com._1c.g5.v8.dt.bsl.documentation.comment;version="[1.0.0,2.0.0)",
17+
com._1c.g5.v8.dt.bsl.documentation.comment;version="[2.0.0,3.0.0)",
1818
com._1c.g5.v8.dt.bsl.model;version="[4.0.0,5.0.0)",
1919
com._1c.g5.v8.dt.bsl.resource;version="[12.0.0,13.0.0)",
2020
com._1c.g5.v8.dt.bsl.ui.contentassist.stringliteral;version="[5.0.0,6.0.0)",

‎features/com.e1c.ssl.feature/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (C) 2020, 1C-Soft LLC and others.
3+
Copyright (C) 2021, 1C-Soft LLC and others.
44
55
This program and the accompanying materials are made
66
available under the terms of the Eclipse Public License 2.0
@@ -29,13 +29,13 @@
2929
<build>
3030
<plugins>
3131
<plugin>
32-
<groupId>org.eclipse.tycho.extras</groupId>
33-
<artifactId>tycho-source-feature-plugin</artifactId>
32+
<groupId>org.eclipse.tycho</groupId>
33+
<artifactId>tycho-source-plugin</artifactId>
3434
<executions>
3535
<execution>
3636
<phase>package</phase>
3737
<goals>
38-
<goal>source-feature</goal>
38+
<goal>feature-source</goal>
3939
</goals>
4040
</execution>
4141
</executions>

‎targets/default/default.target‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Contributors:
99
1C-Soft LLC - initial API and implementation
1010
-->
11-
<?pde version="3.8"?><target name="1C:EDT Sapphire Platform" sequenceNumber="1">
11+
<?pde version="3.8"?><target name="1C:EDT Ruby Platform" sequenceNumber="1">
1212
<locations>
1313
<!-- EDT -->
1414
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -33,17 +33,7 @@
3333
<unit id="com._1c.g5.v8.dt.handly.feature.feature.group" version="0.0.0"/>
3434
<unit id="com._1c.g5.v8.dt.markermatcher.feature.feature.group" version="0.0.0"/>
3535
<unit id="com._1c.g5.v8.dt.platform.services.mobile.feature.feature.group" version="0.0.0"/>
36-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.8.feature.feature.group" version="0.0.0"/>
37-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.9.feature.feature.group" version="0.0.0"/>
38-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.10.feature.feature.group" version="0.0.0"/>
39-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.11.feature.feature.group" version="0.0.0"/>
40-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.12.feature.feature.group" version="0.0.0"/>
41-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.13.feature.feature.group" version="0.0.0"/>
42-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.14.feature.feature.group" version="0.0.0"/>
43-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.15.feature.feature.group" version="0.0.0"/>
44-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.16.feature.feature.group" version="0.0.0"/>
45-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.17.feature.feature.group" version="0.0.0"/>
46-
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.18.feature.feature.group" version="0.0.0"/>
36+
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.19.feature.feature.group" version="0.0.0"/>
4737
<unit id="com._1c.g5.v8.dt.product.docs.feature.feature.group" version="0.0.0"/>
4838
<unit id="com._1c.g5.v8.dt.product.feature.feature.group" version="0.0.0"/>
4939
<unit id="com._1c.g5.v8.dt.profiling.feature.feature.group" version="0.0.0"/>
@@ -110,9 +100,7 @@
110100
<unit id="org.eclipse.xsd.edit.feature.group" version="0.0.0"/>
111101
<unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
112102
<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
113-
<unit id="org.eclipse.test.performance" version="0.0.0"/>
114-
<unit id="org.apache.derby" version="0.0.0"/>
115-
<repository id="dt_repository" location="https://edt.1c.ru/releases/sapphire/2020.6/"/>
103+
<repository id="dt_repository" location="https://edt.1c.ru/releases/ruby/2021.1/"/>
116104
</location>
117105

118106
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -123,7 +111,7 @@
123111
<!-- Eclipse -->
124112
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
125113
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
126-
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2020-06/"/>
114+
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2020-12/"/>
127115
</location>
128116

129117
</locations>

‎tests/com.e1c.ssl.bsl.itests/workspace/CommonFunctions/DT-INF/PROJECT.PMF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Manifest-Version: 1.0
2-
Runtime-Version: 8.3.9
2+
Runtime-Version: 8.3.19
33
Store-Version: 1.0.0

0 commit comments

Comments
 (0)