Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pipeline {

tools {
maven 'apache-maven-3.8.6'
jdk 'openjdk-jdk11-latest'
jdk 'openjdk-jdk17-latest'
}

environment {
Expand Down
60 changes: 36 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@
<package.type.test>eclipse-test-plugin</package.type.test>

<!-- Build Plugin Versions -->
<tycho.version>2.7.5</tycho.version>
<jacoco.version>0.8.8</jacoco.version>
<tycho.version>3.0.5</tycho.version>
<jacoco.version>0.8.13</jacoco.version>
<maven.compiler.version>3.10.1</maven.compiler.version>
<maven.clean.version>3.2.0</maven.clean.version>
<maven.checkstyle.version>3.2.0</maven.checkstyle.version>
<puppycrawl.checkstyle.version>8.44</puppycrawl.checkstyle.version>
<emfcloud.checkstyle.version>0.1.0-SNAPSHOT</emfcloud.checkstyle.version>
<maven.resources.version>3.2.0</maven.resources.version>
<maven.surefire.version>3.0.0-M6</maven.surefire.version>
<maven.failsafe.version>3.0.0-M6</maven.failsafe.version>
<maven.surefire.version>3.5.3</maven.surefire.version>
<maven.failsafe.version>3.5.3</maven.failsafe.version>
<maven.source.plugin>3.2.1</maven.source.plugin>
<maven.dependency.version>3.3.0</maven.dependency.version>
<maven.shade.version>3.3.0</maven.shade.version>
Expand All @@ -93,17 +93,17 @@
<jackson.databind.version>2.12.6.1</jackson.databind.version>
<eclipse.core.runtime.version>3.7.0</eclipse.core.runtime.version>
<eclipse.core.resources.version>3.7.100</eclipse.core.resources.version>
<emf.common.version>2.23.0</emf.common.version>
<emf.ecore.version>2.23.0</emf.ecore.version>
<emf.common.version>2.28.0</emf.common.version>
<emf.ecore.version>2.33.0</emf.ecore.version>
<emf.ecore.change.version>2.14.0</emf.ecore.change.version>
<emf.ecore.xmi.version>2.16.0</emf.ecore.xmi.version>
<emf.ecore.xmi.version>2.18.0</emf.ecore.xmi.version>
<emf.edit.version>2.16.0</emf.edit.version>
<emf.transaction.version>1.8.0.201405281451</emf.transaction.version>
<emf.validation.version>1.8.0.201405281429</emf.validation.version>
<emfjson.jackson.version>2.0.0</emfjson.jackson.version>
<emfjson.jackson.version>2.3.0-SNAPSHOT</emfjson.jackson.version>
<commons.io.version>2.8.0</commons.io.version>
<junit.version>4.13.2</junit.version>
<net.bytebuddy.version>1.12.16</net.bytebuddy.version>
<net.bytebuddy.version>1.15.11</net.bytebuddy.version>
<org.objenesis.version>3.3</org.objenesis.version>
<json-patch.version>1.13</json-patch.version>

Expand All @@ -118,7 +118,7 @@
<jetty.version>9.4.44.v20210927</jetty.version>
<jetty.websocket.version>9.4.44.v20210927</jetty.websocket.version>
<javalin.version>4.3.0</javalin.version>
<mockito.version>4.9.0</mockito.version>
<mockito.version>5.16.0</mockito.version>
<gmazzo.okhttp.mock.version>1.5.0</gmazzo.okhttp.mock.version>
<hamcrest.version>2.2</hamcrest.version>

Expand All @@ -131,7 +131,18 @@
<pluginRepository>
<id>sonatype</id>
<name>Sonatype</name>
<url>https://oss.sonatype.org/content/groups/public</url>
<url>https://s01.oss.sonatype.org/content/groups/public</url>
</pluginRepository>
<pluginRepository>
<name>Central Portal Snapshots</name>
<id>central-portal-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

Expand Down Expand Up @@ -380,6 +391,13 @@
<name>WSO2</name>
<url>https://maven.wso2.org/nexus/content/groups/wso2-public/</url>
</repository>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>

<!-- Provide a list of dependencies that are provided by the target platform
Expand Down Expand Up @@ -485,11 +503,6 @@
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
Expand Down Expand Up @@ -543,8 +556,8 @@

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>central</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>

Expand All @@ -556,14 +569,13 @@
<plugins>
<!-- To release to Sonatype/Maven central -->
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus.maven.version}</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoreleaseafterclose>false</autoreleaseafterclose>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>

Expand Down
16 changes: 0 additions & 16 deletions tests/org.eclipse.emfcloud.modelserver.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>com.github.gmazzo</groupId>
<artifactId>okhttp-mock</artifactId>
Expand Down Expand Up @@ -54,17 +49,6 @@
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down