Remove log4j 1 dependency

Bug: 578953 Change-Id: If96e128ff2bd9eede2749e81bf06785560461e1c
eclipse-emf-compare · Mar 22, 2022 · 7af9f8e · 7af9f8e
1 parent 70d1945
commit 7af9f8e
Show file tree

Hide file tree

Showing 35 changed files with 237 additions and 1,005 deletions.
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
@@ -366,7 +366,7 @@
   <profiles>
     <!-- Target platforms are located in org.eclipse.emf.compare-parent/targetPlatforms. -->
     <profile>
-      <id>2021-09</id>
+      <id>2022-03</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
@@ -381,7 +381,7 @@
                   <groupId>org.eclipse.emf.compare</groupId>
                   <artifactId>emf.compare-parent</artifactId>
                   <version>${parent-version}</version>
-                  <classifier>targetPlatforms/2021-09-sdk</classifier>
+                  <classifier>targetPlatforms/2022-03-sdk</classifier>
                 </artifact>
               </target>
             </configuration>
@@ -390,118 +390,7 @@
       </build>
     </profile>
     <profile>
-      <id>2021-06</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <target>
-                <artifact>
-                  <groupId>org.eclipse.emf.compare</groupId>
-                  <artifactId>emf.compare-parent</artifactId>
-                  <version>${parent-version}</version>
-                  <classifier>targetPlatforms/2021-06-sdk</classifier>
-                </artifact>
-              </target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-	<profile>
-      <id>2019-12</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <target>
-                <artifact>
-                  <groupId>org.eclipse.emf.compare</groupId>
-                  <artifactId>emf.compare-parent</artifactId>
-                  <version>${parent-version}</version>
-                  <classifier>targetPlatforms/2019-12-sdk</classifier>
-                </artifact>
-              </target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>2019-06</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <target>
-                <artifact>
-                  <groupId>org.eclipse.emf.compare</groupId>
-                  <artifactId>emf.compare-parent</artifactId>
-                  <version>${parent-version}</version>
-                  <classifier>targetPlatforms/2019-06-sdk</classifier>
-                </artifact>
-              </target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>oxygen</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <target>
-                <artifact>
-                  <groupId>org.eclipse.emf.compare</groupId>
-                  <artifactId>emf.compare-parent</artifactId>
-                  <version>${parent-version}</version>
-                  <classifier>targetPlatforms/oxygen-sdk</classifier>
-                </artifact>
-              </target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>neon</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <target>
-                <artifact>
-                  <groupId>org.eclipse.emf.compare</groupId>
-                  <artifactId>emf.compare-parent</artifactId>
-                  <version>${parent-version}</version>
-                  <classifier>targetPlatforms/neon-sdk</classifier>
-                </artifact>
-              </target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>mars</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
+      <id>2021-09</id>
       <build>
         <plugins>
           <plugin>
@@ -513,7 +402,7 @@
                   <groupId>org.eclipse.emf.compare</groupId>
                   <artifactId>emf.compare-parent</artifactId>
                   <version>${parent-version}</version>
-                  <classifier>targetPlatforms/mars-sdk</classifier>
+                  <classifier>targetPlatforms/2021-09-sdk</classifier>
                 </artifact>
               </target>
             </configuration>
@@ -522,10 +411,7 @@
       </build>
     </profile>
     <profile>
-      <id>luna</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
+      <id>2021-06</id>
       <build>
         <plugins>
           <plugin>
@@ -537,7 +423,7 @@
                   <groupId>org.eclipse.emf.compare</groupId>
                   <artifactId>emf.compare-parent</artifactId>
                   <version>${parent-version}</version>
-                  <classifier>targetPlatforms/luna-sdk</classifier>
+                  <classifier>targetPlatforms/2021-06-sdk</classifier>
                 </artifact>
               </target>
             </configuration>
@@ -562,49 +448,7 @@
       </modules>
     </profile>
     <profile>
-      <id>2021-09-extras</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <target>
-                <artifact>
-                  <groupId>org.eclipse.emf.compare</groupId>
-                  <artifactId>emf.compare-parent</artifactId>
-                  <version>${parent-version}</version>
-                  <classifier>targetPlatforms/extras/2021-09-extras-sdk</classifier>
-                </artifact>
-              </target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-	<profile>
-      <id>2021-06-extras</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <target>
-                <artifact>
-                  <groupId>org.eclipse.emf.compare</groupId>
-                  <artifactId>emf.compare-parent</artifactId>
-                  <version>${parent-version}</version>
-                  <classifier>targetPlatforms/extras/2021-06-extras-sdk</classifier>
-                </artifact>
-              </target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>2019-12-extras</id>
+      <id>2022-03-extras</id>
       <build>
         <plugins>
           <plugin>
@@ -616,7 +460,7 @@
                   <groupId>org.eclipse.emf.compare</groupId>
                   <artifactId>emf.compare-parent</artifactId>
                   <version>${parent-version}</version>
-                  <classifier>targetPlatforms/extras/2019-12-extras-sdk</classifier>
+                  <classifier>targetPlatforms/extras/2022-03-extras-sdk</classifier>
                 </artifact>
               </target>
             </configuration>
@@ -625,7 +469,7 @@
       </build>
     </profile>
     <profile>
-      <id>2019-06-extras</id>
+      <id>2021-09-extras</id>
       <build>
         <plugins>
           <plugin>
@@ -637,16 +481,16 @@
                   <groupId>org.eclipse.emf.compare</groupId>
                   <artifactId>emf.compare-parent</artifactId>
                   <version>${parent-version}</version>
-                  <classifier>targetPlatforms/extras/2019-06-extras-sdk</classifier>
+                  <classifier>targetPlatforms/extras/2021-09-extras-sdk</classifier>
                 </artifact>
               </target>
             </configuration>
           </plugin>
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>oxygen-extras</id>
+	<profile>
+      <id>2021-06-extras</id>
       <build>
         <plugins>
           <plugin>
@@ -658,7 +502,7 @@
                   <groupId>org.eclipse.emf.compare</groupId>
                   <artifactId>emf.compare-parent</artifactId>
                   <version>${parent-version}</version>
-                  <classifier>targetPlatforms/extras/oxygen-extras-sdk</classifier>
+                  <classifier>targetPlatforms/extras/2021-06-extras-sdk</classifier>
                 </artifact>
               </target>
             </configuration>

diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2022-03-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/2022-03-sdk.target
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="EMF Compare based on 2021-09 SDK" sequenceNumber="1647879513">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.assertj" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+      <repository location="http://obeo.github.io/fr.obeo.performance/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/2022-03"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2022-03-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/2022-03-sdk.tpd
@@ -0,0 +1,17 @@
+target "EMF Compare based on 2021-09 SDK"
+
+include "fragments/licence.tpd"
+include "fragments/orbit.tpd"
+include "fragments/perf.tpd"
+
+with source, requirements
+
+location "http://download.eclipse.org/releases/2022-03" {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.emf.sdk.feature.group lazy
+	org.eclipse.emf.transaction.sdk.feature.group lazy
+	org.eclipse.uml2.feature.group lazy
+	org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+	org.eclipse.gmf.runtime.diagram.ui lazy
+	org.eclipse.egit.feature.group lazy
+}
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/2022-03-extras-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2022-03-extras-sdk.target
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="EMF Compare with extras based on 2021-09" sequenceNumber="1647947834">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.assertj" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+      <repository location="http://obeo.github.io/fr.obeo.performance/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/2022-03"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sirius" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/sirius/updates/releases/7.0.0/2021-06/"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/2022-03-extras-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2022-03-extras-sdk.tpd
@@ -0,0 +1,15 @@
+target "EMF Compare with extras based on 2021-09"
+
+include "../2022-03-sdk.tpd"
+
+with source, requirements
+
+// Sirius
+
+location "https://download.eclipse.org/sirius/updates/releases/7.0.0/2021-06/" {
+	org.eclipse.sirius lazy
+	org.eclipse.sirius.diagram lazy
+	org.eclipse.sirius.runtime.feature.group lazy
+	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
+	org.eclipse.sirius.runtime.aql.feature.group lazy
+}
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
@@ -6,7 +6,6 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2021082522280
 	com.google.guava [27.0.0,30.2.0)
 	com.google.gson [2.2.4,3.0.0)
 	org.junit [4,5)
-	org.apache.log4j [1.2.0,1.3.0)
 	/* Egit/Jgit */
 	javaewah
 	org.apache.commons.compress