G5V8DT-22401: Обновление таргет-платформы

1C-Company · Apr 11, 2024 · 4a9621f · 4a9621f
1 parent 061e610
commit 4a9621f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -41,9 +41,9 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.release>17</maven.compiler.release>
 
     <maven.build.timestamp.format>'v'yyyyMMdd-HHmm</maven.build.timestamp.format>
     <qualifier>${maven.build.timestamp}</qualifier>
@@ -98,7 +98,7 @@
           <version>${tycho.version}</version>
           <configuration>
             <resolver>p2</resolver>
-            <executionEnvironment>JavaSE-11</executionEnvironment>
+            <executionEnvironment>JavaSE-17</executionEnvironment>
             <includePackedArtifacts>false</includePackedArtifacts>
             <target>
               <artifact>

diff --git a/targets/default/default.target b/targets/default/default.target
@@ -74,6 +74,8 @@
 <unit id="org.eclipse.emf.validation.ocl.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
 <unit id="org.apache.felix.scr" version="0.0.0"/>
+<!--osgi.extender=osgi.serviceloader.processor-->
+<unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="0.0.0"/>
@@ -130,6 +132,7 @@
 <unit id="com.google.inject" version="7.0.0"/>
 <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
 <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
+<unit id="com.ibm.icu" version="0.0.0"/>
 <repository id="eclipse_repository" location="https://download.eclipse.org/releases/2023-12/"/>
 </location>
 

diff --git a/targets/develop/develop.target b/targets/develop/develop.target
@@ -80,7 +80,9 @@
 <unit id="org.eclipse.emf.validation.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.validation.ocl.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.ds" version="0.0.0"/>
+<unit id="org.apache.felix.scr" version="0.0.0"/>
+<!--osgi.extender=osgi.serviceloader.processor-->
+<unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="0.0.0"/>
@@ -154,6 +156,7 @@
 <unit id="com.google.inject" version="7.0.0"/>
 <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
 <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
+<unit id="com.ibm.icu" version="0.0.0"/>
 <repository id="eclipse_repository" location="https://download.eclipse.org/releases/2023-12/"/>
 </location>