Skip to content

Commit

Permalink
Bump tp to 2022-12
Browse files Browse the repository at this point in the history
Switch to up-to-date mockito and hamcrest, and solve incompatibilities
  • Loading branch information
Kellindil committed Dec 28, 2022
1 parent 1e6a25a commit 1a5d2f1
Show file tree
Hide file tree
Showing 26 changed files with 72 additions and 84 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Expand Up @@ -15,8 +15,8 @@ pipeline {

environment {
// Target platform to build against (must correspond to a profile in the parent pom.xml)
PLATFORM = '2022-09'
PLATFORM_EXTRAS = '2022-09-extras'
PLATFORM = '2022-12'
PLATFORM_EXTRAS = '2022-12-extras'
}

stages {
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.emf.compare-parent/pom.xml
Expand Up @@ -368,7 +368,7 @@
<profiles>
<!-- Target platforms are located in org.eclipse.emf.compare-parent/targetPlatforms. -->
<profile>
<id>2022-09</id>
<id>2022-12</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
Expand All @@ -383,7 +383,7 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
<classifier>targetPlatforms/2022-09-sdk</classifier>
<classifier>targetPlatforms/2022-12-sdk</classifier>
</artifact>
</target>
</configuration>
Expand All @@ -408,7 +408,7 @@
</modules>
</profile>
<profile>
<id>2022-09-extras</id>
<id>2022-12-extras</id>
<build>
<plugins>
<plugin>
Expand All @@ -420,7 +420,7 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
<classifier>targetPlatforms/extras/2022-09-extras-sdk</classifier>
<classifier>targetPlatforms/extras/2022-12-extras-sdk</classifier>
</artifact>
</target>
</configuration>
Expand Down
@@ -1,40 +1,38 @@
<?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 2022-09 SDK" sequenceNumber="1668607794">
<target name="EMF Compare based on 2022-12 SDK" sequenceNumber="1671465242">
<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="https://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="com.google.guava" version="30.1.0.v20221112-0806"/>
<unit id="com.google.gson" version="2.9.1.v20220915-1632"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="javaewah" version="1.1.13.v20211029-0839"/>
<unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
<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.mockito.mockito-core" version="4.8.1.v20221103-2317"/>
<unit id="net.bytebuddy.byte-buddy" version="1.12.18.v20221114-2102"/>
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
<unit id="org.assertj" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/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.egit.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"/>
<repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/egit/staging/v6.4.0.202211160543-m3"/>
<repository location="http://download.eclipse.org/releases/2022-12"/>
</location>
</locations>
</target>
@@ -1,20 +1,17 @@
target "EMF Compare based on 2022-09 SDK"
target "EMF Compare based on 2022-12 SDK"

include "fragments/licence.tpd"
include "fragments/orbit.tpd"
include "fragments/perf.tpd"

with source, requirements

location "http://download.eclipse.org/releases/2022-09" {
location "http://download.eclipse.org/releases/2022-12" {
org.eclipse.platform.feature.group lazy
org.eclipse.egit.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
}

location "https://download.eclipse.org/egit/staging/v6.4.0.202211160543-m3" {
org.eclipse.egit.feature.group lazy
}
@@ -1,48 +1,46 @@
<?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 2022-09" sequenceNumber="1668607798">
<target name="EMF Compare with extras based on 2022-12" sequenceNumber="1671465242">
<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="https://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="com.google.guava" version="30.1.0.v20221112-0806"/>
<unit id="com.google.gson" version="2.9.1.v20220915-1632"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="javaewah" version="1.1.13.v20211029-0839"/>
<unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
<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.mockito.mockito-core" version="4.8.1.v20221103-2317"/>
<unit id="net.bytebuddy.byte-buddy" version="1.12.18.v20221114-2102"/>
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
<unit id="org.assertj" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/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.egit.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"/>
<repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/egit/staging/v6.4.0.202211160543-m3"/>
<repository location="http://download.eclipse.org/releases/2022-12"/>
</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.5/2021-06/"/>
<repository location="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
</location>
</locations>
</target>
@@ -1,12 +1,12 @@
target "EMF Compare with extras based on 2022-09"
target "EMF Compare with extras based on 2022-12"

include "../2022-09-sdk.tpd"
include "../2022-12-sdk.tpd"

with source, requirements

// Sirius

location "https://download.eclipse.org/sirius/updates/releases/7.0.5/2021-06/" {
location "https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/" {
org.eclipse.sirius lazy
org.eclipse.sirius.diagram lazy
org.eclipse.sirius.runtime.feature.group lazy
Expand Down
Expand Up @@ -2,15 +2,16 @@ target "Orbit"

with source, requirements

location "http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/" {
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository" {
com.google.guava [27.0.0,30.2.0)
com.google.gson [2.2.4,3.0.0)
org.junit [4,5)
/* Egit/Jgit */
javaewah
org.apache.commons.compress
org.kohsuke.args4j
org.mockito [1.9.0,2.0.0)
org.hamcrest [1.1.0,2.0.0)
org.mockito.mockito-core [4.8.0,4.9.0)
net.bytebuddy.byte-buddy [1.12.18, 1.12.20)
org.hamcrest [2.2.0,2.3.0)
org.assertj lazy
}
Expand Up @@ -8,8 +8,6 @@ Automatic-Module-Name: org.eclipse.emf.compare.diagram.ide.ui.sirius.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Require-Bundle: org.junit,
org.mockito,
org.hamcrest,
org.eclipse.emf.compare.tests,
org.eclipse.emf.compare.diagram.ide.ui.sirius,
org.eclipse.emf.compare,
Expand Down
Expand Up @@ -9,8 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Require-Bundle: org.junit,
org.eclipse.compare,
org.mockito,
org.hamcrest,
org.eclipse.emf.compare,
org.eclipse.emf.compare.diagram.ide.ui,
org.eclipse.emf.compare.ide.ui,
Expand Down
Expand Up @@ -8,8 +8,6 @@ Automatic-Module-Name: org.eclipse.emf.compare.diagram.sirius.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Require-Bundle: org.junit,
org.mockito,
org.hamcrest,
org.eclipse.emf.compare.tests,
org.eclipse.emf.compare,
org.eclipse.emf.compare.diagram.sirius,
Expand Down
Expand Up @@ -6,7 +6,7 @@ Bundle-Version: 1.1.3.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.emf.compare.egit,
org.eclipse.egit.ui;bundle-version="5.0.0",
org.eclipse.egit.ui;bundle-version="6.4.0",
org.eclipse.core.runtime,
org.eclipse.compare,
org.eclipse.ui,
Expand Down
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.team.core;bundle-version="3.5.0",
org.eclipse.emf.ecore;bundle-version="2.5.0",
org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
org.mockito;bundle-version="1.8.0",
org.mockito.mockito-core;bundle-version="4.8.1",
org.hamcrest;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Expand Down
Expand Up @@ -14,8 +14,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down
Expand Up @@ -13,8 +13,8 @@

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down
Expand Up @@ -17,7 +17,7 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down
Expand Up @@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.emf.compare.rcp.ui.tests,
org.eclipse.emf.compare.rcp.ui,
org.mockito;bundle-version="[1.9.0,3.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
org.mockito.mockito-core;bundle-version="4.8.1",
org.hamcrest;bundle-version="[2.2.0,3.0.0)",
org.eclipse.core.filesystem,
org.eclipse.emf.compare.ide.ui.tests.framework;bundle-version="[1.0.0,2.0.0)"
Bundle-Activator: org.eclipse.emf.compare.ide.ui.tests.Activator
Expand Down
Expand Up @@ -11,8 +11,8 @@
package org.eclipse.emf.compare.ide.ui.tests.logical.resolver;

import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down
Expand Up @@ -11,12 +11,12 @@
*******************************************************************************/
package org.eclipse.emf.compare.ide.ui.tests.logical.resolver;

import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;

import com.google.common.base.Optional;
import com.google.common.collect.Sets;
Expand Down Expand Up @@ -62,7 +62,7 @@ public void testInstantiationWithoutException() {

@Test
public void testInstantiationDoesNotModifyGraph() {
verifyZeroInteractions(graph);
verifyNoInteractions(graph);
}

@Test
Expand Down
Expand Up @@ -12,7 +12,7 @@
package org.eclipse.emf.compare.ide.ui.tests.logical.resolver;

import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;

import org.eclipse.emf.compare.ide.ui.internal.logical.resolver.CrossReferenceResolutionScope;
import org.eclipse.emf.compare.ide.ui.internal.logical.resolver.LocalMonitoredProxyCreationListener;
Expand Down Expand Up @@ -40,7 +40,7 @@ public void testNonPlatformResource() {
sut = new LocalMonitoredProxyCreationListener(monitor, eventBus, localResolver, diagnostic);
sut.proxyCreated(source, eObject, feature, proxy, 3);

verifyZeroInteractions(eventBus, localResolver);
verifyNoInteractions(eventBus, localResolver);
}

@Test
Expand All @@ -49,7 +49,7 @@ public void testNonAbsolutePlatformResource() {
sut = new LocalMonitoredProxyCreationListener(monitor, eventBus, localResolver, diagnostic);
sut.proxyCreated(source, eObject, feature, proxy, 3);

verifyZeroInteractions(eventBus, localResolver);
verifyNoInteractions(eventBus, localResolver);
}

@Test
Expand All @@ -58,6 +58,6 @@ public void testWrongResolutionScope() {
sut = new LocalMonitoredProxyCreationListener(monitor, eventBus, localResolver, diagnostic);
sut.proxyCreated(source, eObject, feature, proxy, 3);

verifyZeroInteractions(eventBus, localResolver);
verifyNoInteractions(eventBus, localResolver);
}
}

0 comments on commit 1a5d2f1

Please sign in to comment.