[SAFRAN-1134] Fix log4j error at startup

ObeoNetwork · Feb 27, 2024 · 1d015f9 · 1d015f9
1 parent 3579ada
commit 1d015f9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.target b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="IS Designer Product Target Definition" sequenceNumber="1699525786">
+<target name="IS Designer Product Target Definition" sequenceNumber="1708954858">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.core.runtime.feature.feature.group" version="0.0.0"/>
@@ -137,7 +137,6 @@
       <unit id="org.junit" version="0.0.0"/>
       <unit id="org.objectweb.asm" version="0.0.0"/>
       <unit id="org.objectweb.asm.tree" version="0.0.0"/>
-      <unit id="org.slf4j.api" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.rcp" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.rcp.ui" version="0.0.0"/>
       <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
@@ -156,6 +155,12 @@
       <unit id="fr.obeo.dsl.designer.gen.html.feature.feature.group" version="0.0.0"/>
       <repository id="Obeo-Designer-Community" location="http://update.obeo.fr/release/designer/11.7/community/latest/repository/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="slf4j.api" version="0.0.0"/>
+      <unit id="slf4j.nop" version="0.0.0"/>
+      <unit id="org.slf4j.api" version="0.0.0"/>
+      <repository id="Eclipse-2023-03" location="https://download.eclipse.org/releases/2023-03/"/>
+    </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="fr.obeo.dsl.viewpoint.collab" version="0.0.0"/>
       <repository id="Obeo-Designer-Team" location="http://update.obeo.fr/release/designer/11.7/team/latest/repository/"/>

diff --git a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.tpd b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.tpd
@@ -140,7 +140,6 @@ location Obeo-Designer-Community "http://update.obeo.fr/release/designer/11.7/co
 	org.junit lazy
 	org.objectweb.asm lazy
 	org.objectweb.asm.tree lazy
-	org.slf4j.api lazy
 	org.eclipse.emf.compare.rcp lazy
 	org.eclipse.emf.compare.rcp.ui lazy
 	org.eclipse.sirius.runtime.acceleo.feature.group lazy
@@ -160,6 +159,11 @@ location Obeo-Designer-Community "http://update.obeo.fr/release/designer/11.7/co
 	fr.obeo.dsl.designer.gen.html.feature.feature.group lazy
 }
 
+location Eclipse-2023-03 "https://download.eclipse.org/releases/2023-03/" {
+    slf4j.api lazy
+    slf4j.nop lazy
+    org.slf4j.api lazy
+}
 location Obeo-Designer-Team "http://update.obeo.fr/release/designer/11.7/team/latest/repository/" {
 	fr.obeo.dsl.viewpoint.collab lazy
 }

diff --git a/is-designer/releng/org.obeonetwork.is.designer.product/isdesigner.product b/is-designer/releng/org.obeonetwork.is.designer.product/isdesigner.product
@@ -50,7 +50,6 @@ Visit http://www.obeo.fr
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
@@ -139,6 +138,9 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </license>
 
    <plugins>
+      <plugin id="slf4j.api"/>
+      <plugin id="slf4j.nop"/>
+      <plugin id="org.slf4j.api"/>
    </plugins>
 
    <features>
@@ -221,8 +223,8 @@ This Agreement is governed by the laws of the State of New York and the intellec
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
-      <property name="eclipse.buildId" value="Version ${unqualifiedVersion} ${buildQualifier}" />
       <property name="osgi.instance.area.default" value="@user.home/ISDesignerWorkspace" os="macosx" />
+      <property name="eclipse.buildId" value="Version ${unqualifiedVersion} ${buildQualifier}" />
    </configurations>
 
    <preferencesInfo>