Skip to content

Commit

Permalink
Merge branch '2022.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@YanSergey
YanSergey committed Feb 6, 2023
2 parents 099b668 + 7d7caa3 commit 2c6754e
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 73 deletions.
4 changes: 2 additions & 2 deletions bundles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ru.yanygin.dt.cfbuilder.plugin</groupId>
<artifactId>ru.yanygin.dt.cfbuilder.plugin</artifactId>
<version>1.3.4-SNAPSHOT</version>
<version>1.3.5-SNAPSHOT</version>
<name>1C:EDT CF builder</name>
<prerequisites>
<maven>3.6.0</maven>
Expand Down Expand Up @@ -45,7 +45,7 @@
<artifact>
<groupId>ru.yanygin.dt.cfbuilder.plugin.target</groupId>
<artifactId>default</artifactId>
<version>1.3.4-SNAPSHOT</version>
<version>1.3.5-SNAPSHOT</version>
</artifact>
</target>
<dependency-resolution>
Expand Down
2 changes: 1 addition & 1 deletion bundles/repositories/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>ru.yanygin.dt.cfbuilder.plugin</groupId>
<artifactId>ru.yanygin.dt.cfbuilder.plugin</artifactId>
<version>1.3.4-SNAPSHOT</version>
<version>1.3.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundles/ru.yanygin.dt.cfbuilder.plugin.ui.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="ru.yanygin.dt.cfbuilder.plugin.ui.feature"
label="%feature.name"
version="1.3.4.qualifier"
version="1.3.5.qualifier"
provider-name="%feature.vendor">

<description>
Expand Down
2 changes: 1 addition & 1 deletion bundles/ru.yanygin.dt.cfbuilder.plugin.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ru.yanygin.dt.cfbuilder.plugin</groupId>
<artifactId>ru.yanygin.dt.cfbuilder.plugin</artifactId>
<version>1.3.4-SNAPSHOT</version>
<version>1.3.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>ru.yanygin.dt.cfbuilder.plugin.ui.group</groupId>
Expand Down
36 changes: 18 additions & 18 deletions bundles/ru.yanygin.dt.cfbuilder.plugin.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: ru.yanygin.dt.cfbuilder.plugin.ui;singleton:=true
Bundle-Version: 1.3.4.qualifier
Bundle-Version: 1.3.5.qualifier
Bundle-Activator: ru.yanygin.dt.cfbuilder.plugin.ui.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.xtext.ui;bundle-version="[2.0.0,3.0.0)",
com._1c.g5.v8.dt.platform;bundle-version="[7.0.0,9.0.0)",
com._1c.g5.v8.dt.platform.services.core;bundle-version="[16.0.0,17.0.0)",
com._1c.g5.v8.dt.platform.services.model;bundle-version="[6.0.0,7.0.0)",
com._1c.g5.v8.dt.platform.services.ui;bundle-version="[12.0.0,13.0.0)",
com._1c.g5.v8.dt.export;bundle-version="[7.0.0,8.0.0)",
com._1c.g5.v8.dt.import;bundle-version="[7.2.200,8.0.0)",
com._1c.g5.v8.dt.import.xml;bundle-version="[11.0.0,12.0.0)",
com._1c.g5.v8.dt.metadata;bundle-version="[14.0.0,15.0.0)",
com._1c.g5.v8.dt.metadata.extension;bundle-version="[2.0.0,3.0.0)",
com._1c.g5.v8.dt.core;bundle-version="[19.0.0,20.0.0)",
com._1c.g5.wiring;bundle-version="[2.3.0,3.0.0)",
com._1c.g5.v8.dt.compare;bundle-version="[21.0.0,22.0.0)",
com._1c.g5.v8.dt.compare.ui;bundle-version="[19.0.0,20.0.0)",
com._1c.g5.v8.dt.common;bundle-version="[8.1.0,9.0.0)",
com._1c.g5.designer.ssh.client;bundle-version="[0.3.0,1.0.0)",
com._1c.g5.v8.dt.core.xtext;bundle-version="[2.0.1700,3.0.0)",
com._1c.g5.v8.dt.ui;bundle-version="[17.0.0,18.0.0)",
com._1c.g5.v8.dt.platform;bundle-version="9.0.0",
com._1c.g5.v8.dt.platform.services.core;bundle-version="16.0.0",
com._1c.g5.v8.dt.platform.services.model;bundle-version="6.0.0",
com._1c.g5.v8.dt.platform.services.ui;bundle-version="12.0.0",
com._1c.g5.v8.dt.export;bundle-version="7.0.0",
com._1c.g5.v8.dt.import;bundle-version="7.2.200",
com._1c.g5.v8.dt.import.xml;bundle-version="12.0.0",
com._1c.g5.v8.dt.metadata;bundle-version="14.0.0",
com._1c.g5.v8.dt.metadata.extension;bundle-version="2.0.0",
com._1c.g5.v8.dt.core;bundle-version="20.0.0",
com._1c.g5.wiring;bundle-version="2.3.0",
com._1c.g5.v8.dt.compare;bundle-version="22.0.0",
com._1c.g5.v8.dt.compare.ui;bundle-version="19.0.0",
com._1c.g5.v8.dt.common;bundle-version="8.1.0",
com._1c.g5.designer.ssh.client;bundle-version="0.3.0",
com._1c.g5.v8.dt.core.xtext;bundle-version="2.0.1700",
com._1c.g5.v8.dt.ui;bundle-version="17.0.0",
com._1c.g5.ides.monitoring;bundle-version="0.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: ru.yanygin.dt.cfbuilder.plugin.ui
Expand Down
2 changes: 1 addition & 1 deletion bundles/ru.yanygin.dt.cfbuilder.plugin.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ru.yanygin.dt.cfbuilder.plugin</groupId>
<artifactId>ru.yanygin.dt.cfbuilder.plugin</artifactId>
<version>1.3.4-SNAPSHOT</version>
<version>1.3.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>ru.yanygin.dt.cfbuilder.plugin.ui</artifactId>
Expand Down
97 changes: 49 additions & 48 deletions bundles/targets/default.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<target name="default">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://edt.1c.ru/downloads/releases/ruby/2022.1/"/>
<unit id="com._1c.g5.aef.feature.feature.group" version="1.15.0.v202209161208"/>
<repository location="https://edt.1c.ru/downloads/releases/ruby/2022.2/"/>
<unit id="com._1c.g5.aef.feature.feature.group" version="1.16.0.v202301261006"/>
<unit id="com._1c.g5.commons.feature.group" version="3.5.0.v202205241453"/>
<unit id="com._1c.g5.edt.license.feature.group" version="2.0.0.v1"/>
<unit id="com._1c.g5.gumtree.feature.feature.group" version="3.3.0.v202112241342"/>
Expand All @@ -13,56 +13,57 @@
<unit id="com._1c.g5.jface.feature.feature.group" version="2.1.500.v202205241239"/>
<unit id="com._1c.g5.license.feature.group" version="1.0.0.v20150216-1700"/>
<unit id="com._1c.g5.lwt.feature.feature.group" version="5.5.0.v202205241239"/>
<unit id="com._1c.g5.properties.ui.feature.feature.group" version="1.15.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.bp.scheme.feature.feature.group" version="1.19.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.cli.feature.feature.group" version="0.7.0.v202206270405"/>
<unit id="com._1c.g5.properties.ui.feature.feature.group" version="1.16.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.bp.scheme.feature.feature.group" version="1.20.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.cli.feature.feature.group" version="0.8.0.v202209141310"/>
<unit id="com._1c.g5.v8.dt.diagram.framework.feature.feature.group" version="4.1.0.v202203301136"/>
<unit id="com._1c.g5.v8.dt.erd.feature.feature.group" version="3.16.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.eventhandlers.feature.feature.group" version="1.19.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.extension.feature.group" version="1.15.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.feature.feature.group" version="1.26.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.geographicalschema.feature.feature.group" version="2.16.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.handly.feature.feature.group" version="1.5.0.30"/>
<unit id="com._1c.g5.v8.dt.erd.feature.feature.group" version="3.17.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.eventhandlers.feature.feature.group" version="1.20.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.extension.feature.group" version="1.16.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.feature.feature.group" version="1.27.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.geographicalschema.feature.feature.group" version="2.17.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.handly.feature.feature.group" version="1.5.0.24"/>
<unit id="com._1c.g5.v8.dt.markermatcher.feature.feature.group" version="1.1.0.v201912091233"/>
<unit id="com._1c.g5.v8.dt.platform.services.mobile.feature.feature.group" version="1.18.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.10.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.11.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.12.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.13.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.14.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.15.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.16.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.17.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.18.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.19.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.20.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.21.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.8.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.9.feature.feature.group" version="0.17.0.v202209150436"/>
<unit id="com._1c.g5.v8.dt.product.docs.feature.feature.group" version="1.26.0.v202209201105"/>
<unit id="com._1c.g5.v8.dt.product.feature.feature.group" version="1.26.2.30"/>
<unit id="com._1c.g5.v8.dt.profiling.feature.feature.group" version="3.17.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.rcp" version="1.26.2.30"/>
<unit id="com._1c.g5.v8.dt.ring.feature.feature.group" version="1.26.2.30"/>
<unit id="com._1c.g5.v8.dt.testing.feature.group" version="5.13.0.v202209161208"/>
<unit id="com._1c.g5.v8.dt.thirdparty.feature.group" version="1.26.2.30"/>
<unit id="com._1c.g5.v8.dt.wst.feature.group" version="4.6.0.30"/>
<unit id="com._1c.g5.v8.dt.xtext.runtime.feature.group" version="2.24.0.30"/>
<unit id="com._1c.g5.v8.dt.xtext.ui.feature.group" version="2.24.0.30"/>
<unit id="com._1c.g5.v8.dt.platform.services.mobile.feature.feature.group" version="1.19.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.10.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.11.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.12.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.13.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.14.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.15.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.16.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.17.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.18.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.19.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.20.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.21.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.22.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.8.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.9.feature.feature.group" version="0.18.0.v202301100816"/>
<unit id="com._1c.g5.v8.dt.product.docs.feature.feature.group" version="1.27.0.v202301251101"/>
<unit id="com._1c.g5.v8.dt.product.feature.feature.group" version="1.27.3.24"/>
<unit id="com._1c.g5.v8.dt.profiling.feature.feature.group" version="3.18.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.rcp" version="1.27.3.24"/>
<unit id="com._1c.g5.v8.dt.ring.feature.feature.group" version="1.27.3.24"/>
<unit id="com._1c.g5.v8.dt.testing.feature.group" version="5.14.0.v202301261006"/>
<unit id="com._1c.g5.v8.dt.thirdparty.feature.group" version="1.27.3.24"/>
<unit id="com._1c.g5.v8.dt.wst.feature.group" version="4.6.0.24"/>
<unit id="com._1c.g5.v8.dt.xtext.runtime.feature.group" version="2.24.0.24"/>
<unit id="com._1c.g5.v8.dt.xtext.ui.feature.group" version="2.24.0.24"/>
<unit id="com._1c.g5.wiring.feature.feature.group" version="2.3.0.v202203290322"/>
<unit id="com.company1c.link.agent.core.feature.feature.group" version="3.0.3"/>
<unit id="com.company1c.link.agent.dependencies.feature.feature.group" version="1.0.1"/>
<unit id="com.company1c.link.ide.edt.feature.feature.group" version="3.0.3"/>
<unit id="com.e1c.dt.check.feature.feature.group" version="0.2.0.116"/>
<unit id="com.e1c.g5.problemreporting.feature.feature.group" version="0.1.1.v202206171548"/>
<unit id="com.e1c.g5.v8.dt.bsl.formatter.feature.feature.group" version="1.2.0.v202209161208"/>
<unit id="com.e1c.g5.v8.dt.bsl.ui.templates.feature.feature.group" version="1.2.0.v202209161208"/>
<unit id="com.e1c.g5.v8.dt.formatter.feature.feature.group" version="1.2.0.v202209161208"/>
<unit id="com.e1c.g5.v8.dt.formatter.ui.feature.feature.group" version="1.2.0.v202209161208"/>
<unit id="com.e1c.g5.v8.dt.gsw.feature.feature.group" version="1.3.0.v202209161208"/>
<unit id="com.e1c.g5.v8.dt.mw.feature.feature.group" version="1.6.0.v202209161208"/>
<unit id="com.e1c.ssl.feature.feature.group" version="0.7.0.104"/>
<unit id="com.e1c.v8codestyle.feature.feature.group" version="0.3.0.158"/>
<unit id="com.e1c.dt.check.feature.feature.group" version="0.3.0.110"/>
<unit id="com.e1c.g5.problemreporting.feature.feature.group" version="0.1.1.v202210270348"/>
<unit id="com.e1c.g5.v8.dt.bsl.formatter.feature.feature.group" version="1.3.0.v202301261006"/>
<unit id="com.e1c.g5.v8.dt.bsl.ui.templates.feature.feature.group" version="1.3.0.v202301261006"/>
<unit id="com.e1c.g5.v8.dt.formatter.feature.feature.group" version="1.3.0.v202301261006"/>
<unit id="com.e1c.g5.v8.dt.formatter.ui.feature.feature.group" version="1.3.0.v202301261006"/>
<unit id="com.e1c.g5.v8.dt.gsw.feature.feature.group" version="1.4.0.v202301261006"/>
<unit id="com.e1c.g5.v8.dt.mw.feature.feature.group" version="1.7.0.v202301261006"/>
<unit id="com.e1c.ssl.feature.feature.group" version="0.7.0.105"/>
<unit id="com.e1c.v8codestyle.feature.feature.group" version="0.4.0.134"/>
<unit id="com.make.chromium.cef.feature.feature.group" version="0.4.0.201908130254"/>
<unit id="de.itemis.xtext.antlr.feature.feature.group" version="2.1.1.v201405091103"/>
<unit id="openjfx.swt.feature.feature.group" version="11.0.0.201901231300"/>
Expand Down Expand Up @@ -161,11 +162,11 @@
<unit id="org.eclipse.platform.source.feature.group" version="4.23.0.v20220216-2015"/>
<unit id="org.eclipse.rcp.feature.group" version="4.23.0.v20220216-1800"/>
<unit id="org.eclipse.rcp.source.feature.group" version="4.23.0.v20220216-1800"/>
<unit id="org.eclipse.sources.feature.group" version="4.11.0.30"/>
<unit id="org.eclipse.sources.feature.group" version="4.11.0.24"/>
<unit id="org.eclipse.swt.chromium.feature.feature.group" version="0.10.2.201908130308"/>
<unit id="org.eclipse.userstorage.feature.group" version="1.2.0.v20210517-0327"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.900.v202106020138"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.1300.v202201160314"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.1300.v202208260501"/>
<unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.300.v201901310132"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.14.0.v20210924-1719"/>
<unit id="org.eclipse.xsd.feature.group" version="2.20.0.v20211216-0527"/>
Expand Down
2 changes: 1 addition & 1 deletion bundles/targets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ru.yanygin.dt.cfbuilder.plugin</groupId>
<artifactId>ru.yanygin.dt.cfbuilder.plugin</artifactId>
<version>1.3.4-SNAPSHOT</version>
<version>1.3.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down

0 comments on commit 2c6754e

Please sign in to comment.