Skip to content

Commit 4158129

Browse files
eneufeldeneufeld
committed
Update Sonatype
1 parent 6feb264 commit 4158129

File tree

3 files changed

+37
-41
lines changed

3 files changed

+37
-41
lines changed

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pipeline {
33

44
tools {
55
maven 'apache-maven-3.8.6'
6-
jdk 'openjdk-jdk11-latest'
6+
jdk 'openjdk-jdk17-latest'
77
}
88

99
environment {

‎pom.xml‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
<package.type.test>eclipse-test-plugin</package.type.test>
6767

6868
<!-- Build Plugin Versions -->
69-
<tycho.version>2.7.5</tycho.version>
70-
<jacoco.version>0.8.8</jacoco.version>
69+
<tycho.version>3.0.5</tycho.version>
70+
<jacoco.version>0.8.13</jacoco.version>
7171
<maven.compiler.version>3.10.1</maven.compiler.version>
7272
<maven.clean.version>3.2.0</maven.clean.version>
7373
<maven.checkstyle.version>3.2.0</maven.checkstyle.version>
7474
<puppycrawl.checkstyle.version>8.44</puppycrawl.checkstyle.version>
7575
<emfcloud.checkstyle.version>0.1.0-SNAPSHOT</emfcloud.checkstyle.version>
7676
<maven.resources.version>3.2.0</maven.resources.version>
77-
<maven.surefire.version>3.0.0-M6</maven.surefire.version>
78-
<maven.failsafe.version>3.0.0-M6</maven.failsafe.version>
77+
<maven.surefire.version>3.5.3</maven.surefire.version>
78+
<maven.failsafe.version>3.5.3</maven.failsafe.version>
7979
<maven.source.plugin>3.2.1</maven.source.plugin>
8080
<maven.dependency.version>3.3.0</maven.dependency.version>
8181
<maven.shade.version>3.3.0</maven.shade.version>
@@ -93,17 +93,17 @@
9393
<jackson.databind.version>2.12.6.1</jackson.databind.version>
9494
<eclipse.core.runtime.version>3.7.0</eclipse.core.runtime.version>
9595
<eclipse.core.resources.version>3.7.100</eclipse.core.resources.version>
96-
<emf.common.version>2.23.0</emf.common.version>
97-
<emf.ecore.version>2.23.0</emf.ecore.version>
96+
<emf.common.version>2.28.0</emf.common.version>
97+
<emf.ecore.version>2.33.0</emf.ecore.version>
9898
<emf.ecore.change.version>2.14.0</emf.ecore.change.version>
99-
<emf.ecore.xmi.version>2.16.0</emf.ecore.xmi.version>
99+
<emf.ecore.xmi.version>2.18.0</emf.ecore.xmi.version>
100100
<emf.edit.version>2.16.0</emf.edit.version>
101101
<emf.transaction.version>1.8.0.201405281451</emf.transaction.version>
102102
<emf.validation.version>1.8.0.201405281429</emf.validation.version>
103-
<emfjson.jackson.version>2.0.0</emfjson.jackson.version>
103+
<emfjson.jackson.version>2.3.0-SNAPSHOT</emfjson.jackson.version>
104104
<commons.io.version>2.8.0</commons.io.version>
105105
<junit.version>4.13.2</junit.version>
106-
<net.bytebuddy.version>1.12.16</net.bytebuddy.version>
106+
<net.bytebuddy.version>1.15.11</net.bytebuddy.version>
107107
<org.objenesis.version>3.3</org.objenesis.version>
108108
<json-patch.version>1.13</json-patch.version>
109109

@@ -118,7 +118,7 @@
118118
<jetty.version>9.4.44.v20210927</jetty.version>
119119
<jetty.websocket.version>9.4.44.v20210927</jetty.websocket.version>
120120
<javalin.version>4.3.0</javalin.version>
121-
<mockito.version>4.9.0</mockito.version>
121+
<mockito.version>5.16.0</mockito.version>
122122
<gmazzo.okhttp.mock.version>1.5.0</gmazzo.okhttp.mock.version>
123123
<hamcrest.version>2.2</hamcrest.version>
124124

@@ -131,7 +131,18 @@
131131
<pluginRepository>
132132
<id>sonatype</id>
133133
<name>Sonatype</name>
134-
<url>https://oss.sonatype.org/content/groups/public</url>
134+
<url>https://s01.oss.sonatype.org/content/groups/public</url>
135+
</pluginRepository>
136+
<pluginRepository>
137+
<name>Central Portal Snapshots</name>
138+
<id>central-portal-snapshots</id>
139+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
140+
<releases>
141+
<enabled>false</enabled>
142+
</releases>
143+
<snapshots>
144+
<enabled>true</enabled>
145+
</snapshots>
135146
</pluginRepository>
136147
</pluginRepositories>
137148

@@ -380,6 +391,13 @@
380391
<name>WSO2</name>
381392
<url>https://maven.wso2.org/nexus/content/groups/wso2-public/</url>
382393
</repository>
394+
<repository>
395+
<id>central</id>
396+
<url>https://repo1.maven.org/maven2</url>
397+
<releases>
398+
<enabled>true</enabled>
399+
</releases>
400+
</repository>
383401
</repositories>
384402

385403
<!-- Provide a list of dependencies that are provided by the target platform
@@ -485,11 +503,6 @@
485503
<artifactId>mockito-core</artifactId>
486504
<version>${mockito.version}</version>
487505
</dependency>
488-
<dependency>
489-
<groupId>org.mockito</groupId>
490-
<artifactId>mockito-inline</artifactId>
491-
<version>${mockito.version}</version>
492-
</dependency>
493506
<dependency>
494507
<groupId>org.hamcrest</groupId>
495508
<artifactId>hamcrest-core</artifactId>
@@ -543,8 +556,8 @@
543556

544557
<distributionManagement>
545558
<snapshotRepository>
546-
<id>ossrh</id>
547-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
559+
<id>central</id>
560+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
548561
</snapshotRepository>
549562
</distributionManagement>
550563

@@ -556,14 +569,13 @@
556569
<plugins>
557570
<!-- To release to Sonatype/Maven central -->
558571
<plugin>
559-
<groupId>org.sonatype.plugins</groupId>
560-
<artifactId>nexus-staging-maven-plugin</artifactId>
561-
<version>${nexus.maven.version}</version>
572+
<groupId>org.sonatype.central</groupId>
573+
<artifactId>central-publishing-maven-plugin</artifactId>
574+
<version>0.8.0</version>
562575
<extensions>true</extensions>
563576
<configuration>
564-
<serverId>ossrh</serverId>
565-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
566-
<autoreleaseafterclose>false</autoreleaseafterclose>
577+
<publishingServerId>central</publishingServerId>
578+
<autoPublish>true</autoPublish>
567579
</configuration>
568580
</plugin>
569581

‎tests/org.eclipse.emfcloud.modelserver.tests/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<artifactId>mockito-core</artifactId>
1717
<version>${mockito.version}</version>
1818
</dependency>
19-
<dependency>
20-
<groupId>org.mockito</groupId>
21-
<artifactId>mockito-inline</artifactId>
22-
<version>${mockito.version}</version>
23-
</dependency>
2419
<dependency>
2520
<groupId>com.github.gmazzo</groupId>
2621
<artifactId>okhttp-mock</artifactId>
@@ -54,17 +49,6 @@
5449
</goals>
5550
<configuration>
5651
<artifactItems>
57-
<artifactItem>
58-
<groupId>org.mockito</groupId>
59-
<artifactId>mockito-inline</artifactId>
60-
<version>${mockito.version}</version>
61-
</artifactItem>
62-
<artifactItem>
63-
<groupId>org.mockito</groupId>
64-
<artifactId>mockito-inline</artifactId>
65-
<version>${mockito.version}</version>
66-
<classifier>sources</classifier>
67-
</artifactItem>
6852
<artifactItem>
6953
<groupId>org.mockito</groupId>
7054
<artifactId>mockito-core</artifactId>

0 commit comments

Comments
 (0)