diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 4d1c1ea..f4ac59f 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -10,10 +10,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 11
- uses: actions/setup-java@v1
+ - name: Set up Maven 3.9.6
+ uses: s4u/setup-maven-action@v1.12.0
with:
- java-version: 11
+ java-version: 17
java-package: jdk+fx
server-id: dt_repository
server-username: MAVEN_USERNAME
@@ -50,7 +50,6 @@ jobs:
with:
name: jacoco
path: |
- ./**/target/jacoco.exec
./**/target/site/jacoco*/
- name: Upload test logs on failure
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93533c1..eced176 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v1
with:
- java-version: 11
+ java-version: 17
java-package: jdk+fx
server-id: dt_repository
server-username: MAVEN_USERNAME
diff --git a/bom/pom.xml b/bom/pom.xml
index 945fbf5..37f1300 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -21,21 +21,21 @@
BOM
- 3.6.0
+ 3.9.4
- 2.7.0
- 2.7.0
+ 4.0.5
+ 4.0.5
- 3.1.12.2
+ 4.8.3.1
8.5
UTF-8
UTF-8
- 11
- 11
- 11
+ 17
+ 17
+ 17
'v'yyyyMMdd-HHmm
${maven.build.timestamp}
@@ -43,7 +43,7 @@
http://download.eclipse.org/releases/2022-03/
false
- 0.8.6
+ 0.8.8
@@ -55,7 +55,7 @@
${tycho.version}
p2
- JavaSE-11
+ JavaSE-17
false
@@ -295,7 +295,7 @@
com.github.spotbugs
spotbugs
- 4.0.0-beta2
+ 4.8.3
diff --git a/bundles/org.example.ui/.classpath b/bundles/org.example.ui/.classpath
index 2ba149f..b81bfbd 100644
--- a/bundles/org.example.ui/.classpath
+++ b/bundles/org.example.ui/.classpath
@@ -3,6 +3,6 @@
-
+
diff --git a/bundles/org.example.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.example.ui/.settings/org.eclipse.jdt.core.prefs
index f4d933e..9154bef 100644
--- a/bundles/org.example.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.example.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/bundles/org.example.ui/META-INF/MANIFEST.MF b/bundles/org.example.ui/META-INF/MANIFEST.MF
index e42d80d..1fa3a16 100644
--- a/bundles/org.example.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.example.ui/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-SymbolicName: org.example.ui;singleton:=true
Bundle-Activator: org.example.ui.Activator
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Require-Bundle: com.google.inject;bundle-version="[5.0.1,6.0.0)",
- org.eclipse.ui;bundle-version="[3.201.0,4.0.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.201.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.18.500,4.0.0)",
org.eclipse.xtext.ui;bundle-version="[2.26.0,3.0.0)",
org.apache.log4j;bundle-version="[1.2.15,2.0.0)"
@@ -19,5 +18,5 @@ Import-Package: com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
org.antlr.stringtemplate;version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
org.osgi.framework;version="[1.8.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.example.ui
diff --git a/bundles/org.example.ui/plugin.launch b/bundles/org.example.ui/plugin.launch
index a0bf917..e6d86f1 100644
--- a/bundles/org.example.ui/plugin.launch
+++ b/bundles/org.example.ui/plugin.launch
@@ -15,10 +15,10 @@
-
+
-
+
diff --git a/bundles/org.example/.classpath b/bundles/org.example/.classpath
index c8590e5..1ed94f7 100644
--- a/bundles/org.example/.classpath
+++ b/bundles/org.example/.classpath
@@ -2,6 +2,6 @@
-
+
diff --git a/bundles/org.example/.settings/org.eclipse.jdt.core.prefs b/bundles/org.example/.settings/org.eclipse.jdt.core.prefs
index f4d933e..9154bef 100644
--- a/bundles/org.example/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.example/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/bundles/org.example/META-INF/MANIFEST.MF b/bundles/org.example/META-INF/MANIFEST.MF
index d625cae..1ae5d60 100644
--- a/bundles/org.example/META-INF/MANIFEST.MF
+++ b/bundles/org.example/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.example;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Require-Bundle: com._1c.g5.v8.dt.bsl;bundle-version="[25.0.0,26.0.0)",
+Require-Bundle: com._1c.g5.v8.dt.bsl;bundle-version="[26.0.0,27.0.0)",
com._1c.g5.v8.dt.bsl.model;bundle-version="[11.0.0,12.0.0)",
com._1c.g5.v8.dt.mcore;bundle-version="[8.0.0,9.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.26.0,3.0.0)",
org.eclipse.xtext;bundle-version="[2.26.0,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.example
Export-Package: org.example;version="1.0.0"
diff --git a/pom.xml b/pom.xml
index d8448fd..e509444 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,9 +57,14 @@
eclipse-plugin
- org.eclipse.equinox.ds
+ org.apache.felix.scr
0.0.0
+
+ eclipse-plugin
+ org.apache.aries.spifly.dynamic.bundle
+ 1.3.7
+
diff --git a/targets/default/default.target b/targets/default/default.target
index 728ed7d..ebe9b32 100644
--- a/targets/default/default.target
+++ b/targets/default/default.target
@@ -10,30 +10,10 @@
-->
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -51,97 +31,40 @@
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/org.example.itests/.classpath b/tests/org.example.itests/.classpath
index c8590e5..1ed94f7 100644
--- a/tests/org.example.itests/.classpath
+++ b/tests/org.example.itests/.classpath
@@ -2,6 +2,6 @@
-
+
diff --git a/tests/org.example.itests/.settings/org.eclipse.jdt.core.prefs b/tests/org.example.itests/.settings/org.eclipse.jdt.core.prefs
index f4d933e..9154bef 100644
--- a/tests/org.example.itests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.example.itests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/tests/org.example.itests/META-INF/MANIFEST.MF b/tests/org.example.itests/META-INF/MANIFEST.MF
index d861268..ef2ce58 100644
--- a/tests/org.example.itests/META-INF/MANIFEST.MF
+++ b/tests/org.example.itests/META-INF/MANIFEST.MF
@@ -8,16 +8,15 @@ Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Require-Bundle: org.example;bundle-version="[1.0.0,2.0.0)",
org.junit;bundle-version="[4.13.0,5.0.0)",
- com.google.guava;bundle-version="[19.0.0,29.0.0)",
org.eclipse.xtext;bundle-version="[2.26.0,3.0.0)",
org.eclipse.core.resources;bundle-version="[3.16.100,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.24.100,4.0.0)",
- com._1c.g5.v8.dt.bsl;bundle-version="[25.0.0,26.0.0)",
+ com._1c.g5.v8.dt.bsl;bundle-version="[26.0.0,27.0.0)",
com._1c.g5.v8.dt.bsl.core;bundle-version="[6.0.0,7.0.0)",
com._1c.g5.v8.dt.bsl.model;bundle-version="[11.0.0,12.0.0)",
- com._1c.g5.v8.dt.core;bundle-version="[22.0.0,23.0.0)",
+ com._1c.g5.v8.dt.core;bundle-version="[23.0.0,24.0.0)",
com._1c.g5.v8.dt.mcore;bundle-version="[8.0.0,9.0.0)",
com._1c.g5.v8.dt.testing;bundle-version="[3.2.200,4.0.0)",
com._1c.g5.ides.core;bundle-version="[6.0.200,7.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.example.itests
diff --git a/tests/pom.xml b/tests/pom.xml
index 81fdd82..7ccf70d 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -61,7 +61,7 @@
- -Xms80m -Xmx2g -Dosgi.module.lock.timeout=24 --add-modules=ALL-SYSTEM
+ -Xms80m -Xmx2g -Dosgi.module.lock.timeout=24 --add-modules=ALL-SYSTEM --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED
@@ -131,7 +131,7 @@
true
true
- ${ui.test.vmargs} ${tycho-surefire-plugin.vmargs} ${debug.vmargs} ${tycho.testArgLine}
+ ${ui.test.vmargs} ${tycho-surefire-plugin.vmargs} ${debug.vmargs}
${project.build.directory}/work
p2Installed