You've already forked v8-code-style
							
							
				mirror of
				https://github.com/1C-Company/v8-code-style.git
				synced 2025-10-31 08:27:42 +02:00 
			
		
		
		
	edt-2024-1: Обновлена target-платформа
Используется минимизированная по количеству явных зависимостей версия
This commit is contained in:
		
							
								
								
									
										4
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -28,10 +28,10 @@ jobs: | ||||
|     - uses: actions/checkout@v2 | ||||
|       if: ${{ !inputs.analyze }} | ||||
|  | ||||
|     - 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: Free disk space | ||||
|   | ||||
							
								
								
									
										4
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -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 | ||||
|   | ||||
| @@ -314,7 +314,7 @@ | ||||
|               <signer.ssl.keyStorePassword>${keystorePassword}</signer.ssl.keyStorePassword> | ||||
|             </systemPropertyVariables> | ||||
|           </configuration> | ||||
|       </plugin> | ||||
|         </plugin> | ||||
|       </plugins> | ||||
|     </pluginManagement> | ||||
|  | ||||
|   | ||||
							
								
								
									
										5
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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"/> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user