Merge remote-tracking branch 'origin/edt-2024-1' into 1443-data-compo…

…sition-conditional-appearance-use
1C-Company · Apr 27, 2024 · 5c2c2ce · 5c2c2ce
2 parents bb57d98 + 7f08e86
commit 5c2c2ce
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 188 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,10 +28,16 @@ jobs:
     - uses: actions/checkout@v2
       if: ${{ !inputs.analyze }}
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+#  - name: Set up JDK 17
+#     uses: actions/setup-java@v1
+#     with:
+#       java-version: 17
+#       java-package: jdk+fx
+
+    - 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
 
     - name: Free disk space

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -14,7 +14,7 @@ jobs:
     name: Build
     # This build will run on master,release/* push, local PR and PR from forks without label Analyze
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name  || !contains(github.event.pull_request.labels.*.name, 'Analyze')
-    uses: 1C-company/v8-code-style/.github/workflows/build.yml@master
+    uses: 1C-company/v8-code-style/.github/workflows/build.yml@edt-2024-1
     with:
       analyze: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name }}
     secrets:

diff --git 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
 
     - name: Cache maven repo

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -34,7 +34,7 @@
     <!-- Override this property in each project -->
     <markdown.page.generator.html.file.path>${project.basedir}</markdown.page.generator.html.file.path>
 
-    <spotbugs.maven.plugin.version>3.1.12.2</spotbugs.maven.plugin.version>
+    <spotbugs.maven.plugin.version>4.8.3.1</spotbugs.maven.plugin.version>
     <maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
     <checkstyle.version>8.29</checkstyle.version>
     <checkstyle.header.file>java.header</checkstyle.header.file>
@@ -314,7 +314,7 @@
               <signer.ssl.keyStorePassword>${keystorePassword}</signer.ssl.keyStorePassword>
             </systemPropertyVariables>
           </configuration>
-      </plugin>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -396,7 +396,7 @@
               <dependency>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs</artifactId>
-                <version>4.0.0-beta2</version>
+                <version>4.8.3</version>
               </dependency>
             </dependencies>
           </plugin>

diff --git a/pom.xml b/pom.xml
@@ -61,6 +61,11 @@
                     <id>org.apache.felix.scr</id>
                     <versionRange>0.0.0</versionRange>
                   </requirement>
+                  <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.apache.aries.spifly.dynamic.bundle</id>
+                    <versionRange>1.3.7</versionRange>
+                  </requirement>
                 </extraRequirements>
               </dependency-resolution>
             </configuration>

diff --git a/targets/default/default.target b/targets/default/default.target
@@ -14,99 +14,14 @@
 <!-- EDT -->
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2024.1/"/>
-<unit id="com._1c.g5.aef.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.commons.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.edt.license.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.gumtree.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.ides.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.ides.monitoring.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.jface.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.license.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.lwt.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.properties.ui.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.bp.scheme.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.diagram.framework.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.erd.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.eventhandlers.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.extension.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.geographicalschema.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.handly.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.markermatcher.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.platform.services.mobile.feature.feature.group" version="0.0.0"/>
 <unit id="com._1c.g5.v8.dt.platform.support_v8.3.19.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.product.docs.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.product.feature.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.profiling.feature.feature.group" version="0.0.0"/>
+</location>
+
+<!-- EDT -->
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2024.1/"/>
 <unit id="com._1c.g5.v8.dt.rcp" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.testing.feature.group" version="0.0.0"/>
 <unit id="com._1c.g5.v8.dt.thirdparty.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.wst.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.xtext.runtime.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.v8.dt.xtext.ui.feature.group" version="0.0.0"/>
-<unit id="com._1c.g5.wiring.feature.feature.group" version="0.0.0"/>
-<!--unit id="com.company1c.link.agent.core.feature.feature.group" version="0.0.0"/>
-<unit id="com.company1c.link.agent.dependencies.feature.feature.group" version="0.0.0"/>
-<unit id="com.company1c.link.ide.edt.feature.feature.group" version="0.0.0"/-->
-<unit id="com.e1c.g5.v8.dt.gsw.feature.feature.group" version="0.0.0"/>
-<unit id="com.e1c.g5.v8.dt.mw.feature.feature.group" version="0.0.0"/>
-<unit id="com.make.chromium.cef.feature.feature.group" version="0.0.0"/>
-<unit id="de.itemis.xtext.antlr.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.editor.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.query.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.query.ocl.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
-<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.apache.felix.scr" 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"/>
-<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-<!--unit id="org.eclipse.help.feature.group" version="0.0.0"/-->
-<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jgit.lfs.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jgit.pgm.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.nebula.widgets.datechooser.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.nebula.widgets.formattedtext.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ocl.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.userstorage.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xsd.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
-<!--unit id="org.apache.xalan" version="0.0.0"/-->
-<unit id="org.apache.batik.script" version="0.0.0"/>
-<unit id="org.apache.batik.codec" version="0.0.0"/>
-<unit id="org.apache.batik.ext" version="0.0.0"/>
-<unit id="org.apache.batik.transcoder" version="0.0.0"/>
-<unit id="org.apache.lucene.grouping" version="0.0.0"/>
-<unit id="org.apache.lucene.queries" version="0.0.0"/>
 </location>
 
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -121,102 +36,18 @@
 <unit id="net.bytebuddy.byte-buddy" version="0.0.0"/>
 <unit id="net.bytebuddy.byte-buddy-agent" version="0.0.0"/>
 <unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
-<unit id="javax.servlet.jsp" version="0.0.0"/>
-
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
 </location>
 
 <!-- Eclipse -->
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
-<unit id="org.eclipse.search.core" version="0.0.0"/>
+<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2023-12/"/>
 
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-
-<unit id="com.google.guava" version="32.1.3.jre"/>
-<unit id="com.google.guava.failureaccess" version="1.0.2"/>
-<unit id="com.google.inject.assistedinject" version="7.0.0"/>
-<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"/>
-<!--osgi.extender=osgi.serviceloader.processor-->
-<unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
-<!--Bouncycastle-->
-<unit id="bcprov" version="0.0.0"/>
-<unit id="bcpg" version="0.0.0"/>
-<unit id="bcpkix" version="0.0.0"/>
-<unit id="bcutil" version="0.0.0"/>
-
 <unit id="org.eclipse.orbit.xml-apis-ext" version="0.0.0"/>
-
-<unit id="org.apache.commons.jxpath" version="0.0.0"/>
-<unit id="org.apache.commons.commons-io" version="0.0.0"/>
-
-<unit id="jakarta.annotation-api" version="2.1.1"/>
-
-<unit id="org.sat4j.core" version="2.3.6.v20201214"/>
-<unit id="org.sat4j.pb" version="2.3.6.v20201214"/>
-
-<unit id="org.eclipse.jetty.server" version="12.0.3"/>
-<unit id="org.eclipse.jetty.server" version="10.0.18"/>
-
-<unit id="org.eclipse.jetty.http" version="10.0.18"/>
-<unit id="org.eclipse.jetty.io" version="10.0.18"/>
-<unit id="org.eclipse.jetty.util" version="10.0.18"/>
-<unit id="org.eclipse.jetty.servlet" version="10.0.18"/>
-<unit id="org.eclipse.jetty.security" version="10.0.18"/>
-
-<unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/>
-
-<unit id="org.eclipse.jetty.ee8.server" version="12.0.3"/>
-<unit id="org.eclipse.jetty.ee8.servlet" version="12.0.3"/>
-<unit id="org.eclipse.jetty.ee8.security" version="12.0.3"/>
-
-<unit id="org.eclipse.jetty.security" version="12.0.3"/>
-<unit id="org.eclipse.jetty.session" version="12.0.3"/>
-
-<unit id="org.apache.xerces" version="0.0.0"/>
-<unit id="org.apache.xml.serializer" version="0.0.0"/>
-<unit id="org.apache.xml.resolver" version="0.0.0"/>
-
 <unit id="org.eclipse.ecf.filetransfer.httpclientjava.feature.feature.group" version="0.0.0"/>
-
-<unit id="com.sun.el.javax.el" version="0.0.0"/>
-
-<unit id="org.mortbay.jasper.apache-jsp" version="9.0.52"/>
-
-
-<unit id="org.objectweb.asm.commons" version="9.6.0"/>
-<unit id="org.objectweb.asm.commons" version="9.6.0"/>
-<unit id="org.objectweb.asm.tree" version="9.6.0"/>
-<unit id="org.objectweb.asm.util" version="9.6.0"/>
-<unit id="org.objectweb.asm.tree.analysis" version="9.6.0"/>
-
-<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2023-12/"/>
-</location>
-
-<!-- WST -->
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.wst.common.fproj.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.common_core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.server_core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="0.0.0"/>
-<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2023-12/"/>
-</location>
-
-
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
-<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
-<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2020-06/"/>
 </location>
 
 </locations>

diff --git a/targets/develop/develop.target b/targets/develop/develop.target
@@ -96,6 +96,7 @@
 <unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.jgit.lfs.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.jgit.pgm.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.nebula.widgets.datechooser.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.nebula.widgets.formattedtext.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -67,7 +67,7 @@
   </profiles>
 
   <properties>
-    <tycho-surefire-plugin.vmargs>-Xms80m -Xmx2g -Dosgi.module.lock.timeout=24 --add-modules=ALL-SYSTEM</tycho-surefire-plugin.vmargs>
+    <tycho-surefire-plugin.vmargs>-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</tycho-surefire-plugin.vmargs>
     <debug.vmargs></debug.vmargs>
   </properties>
 
@@ -101,7 +101,7 @@
           <resolver>p2</resolver>
         </configuration>
       </plugin>
-      <plugin>
+      <!--plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
         <executions>
@@ -126,7 +126,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -156,7 +156,7 @@
           <configuration>
             <useUIHarness>true</useUIHarness>
             <useUIThread>true</useUIThread>
-            <argLine>${ui.test.vmargs} ${tycho-surefire-plugin.vmargs} ${debug.vmargs} ${tycho.testArgLine}</argLine>
+            <argLine>${ui.test.vmargs} ${tycho-surefire-plugin.vmargs} ${debug.vmargs}</argLine>
             <work>${project.build.directory}/work</work>
             <testRuntime>p2Installed</testRuntime>
           </configuration>