Skip to content

Commit cda834a

Browse files
committed
Merge branch 'develop'
2 parents 896c232 + 8113dde commit cda834a

File tree

4 files changed

+33
-29
lines changed

4 files changed

+33
-29
lines changed

README.adoc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Building the documentation builds also the project without running tests:
242242

243243
[source,bash]
244244
----
245-
mvn install -DskipTests -Pdistribute
245+
$ mvn install -DskipTests -Pdistribute
246246
----
247247

248248
The generated documentation is available from `target/site/reference/html/index.html`.
@@ -257,9 +257,12 @@ The Java artifacts are deployed to the Central Repository:
257257

258258
[source,shell]
259259
----
260-
mvn deploy -DskipTests -P ossrh,release -pl :spring-data-cdo
261-
mvn deploy -DskipTests -P ossrh,release -pl :spring-data-cdo-distribution
262-
# mvn deploy -DskipTests -P ossrh,release # deploys all modules
260+
# Deploy single modules
261+
$ mvn clean deploy -DskipTests -P release,central -pl :spring-data-cdo
262+
$ mvn clean deploy -DskipTests -P release,central -pl :spring-data-cdo-distribution
263+
264+
# Deploy all modules
265+
$ mvn clean deploy -DskipTests -P release,central
263266
----
264267

265268
The staged artifacts have to be released manually.

pom.xml

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bigraphs.springframework.data</groupId>
1414
<artifactId>spring-data-cdo-parent</artifactId>
15-
<version>0.7.3</version>
15+
<version>1.0.0-SNAPSHOT</version>
1616
<packaging>pom</packaging>
1717

1818
<name>Spring Data for CDO - Parent</name>
@@ -56,21 +56,12 @@
5656

5757
<distributionManagement>
5858
<snapshotRepository>
59-
<id>ossrh</id>
60-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
59+
<id>central</id>
60+
<url>https://central.sonatype.com</url>
6161
</snapshotRepository>
62-
<repository>
63-
<id>ossrh</id>
64-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
65-
</repository>
6662
</distributionManagement>
6763

6864
<repositories>
69-
<repository>
70-
<id>central</id>
71-
<name>Central Repository</name>
72-
<url>https://repo1.maven.org/maven2/</url>
73-
</repository>
7465
<repository>
7566
<id>eclipse-release</id>
7667
<name>Eclipse Releases Repository</name>
@@ -94,8 +85,8 @@
9485

9586
<properties>
9687
<!-- Project-specific Settings -->
97-
<project.type>multi</project.type>
9888
<java.version>17</java.version>
89+
<project.type>multi</project.type>
9990
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10091
<maven.compiler.target>${java.version}</maven.compiler.target>
10192
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -209,18 +200,16 @@
209200
</configuration>
210201
</plugin>
211202
<plugin>
212-
<groupId>org.sonatype.plugins</groupId>
213-
<artifactId>nexus-staging-maven-plugin</artifactId>
214-
<version>1.6.13</version>
203+
<groupId>org.sonatype.central</groupId>
204+
<artifactId>central-publishing-maven-plugin</artifactId>
205+
<version>0.8.0</version>
215206
<extensions>true</extensions>
216207
<configuration>
217-
<serverId>ossrh</serverId>
218-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
219-
<!-- With the property autoReleaseAfterClose set to false you can manually inspect the staging
220-
repository in the Nexus Repository Manager and trigger a release of the staging repository
221-
later with mvn nexus-staging:release If you find something went wrong you can drop the staging
222-
repository with mvn nexus-staging:drop -->
223-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
208+
<publishingServerId>central</publishingServerId>
209+
<!-- <autoPublish>true</autoPublish>-->
210+
<!-- <waitUntil>published</waitUntil>-->
211+
<autoPublish>false</autoPublish>
212+
<waitUntil>validated</waitUntil>
224213
</configuration>
225214
</plugin>
226215
<plugin>
@@ -313,6 +302,10 @@
313302
</execution>
314303
</executions>
315304
</plugin>
305+
<plugin>
306+
<groupId>org.sonatype.central</groupId>
307+
<artifactId>central-publishing-maven-plugin</artifactId>
308+
</plugin>
316309
</plugins>
317310
</build>
318311
</profile>

spring-data-cdo-distribution/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.bigraphs.springframework.data</groupId>
77
<artifactId>spring-data-cdo-parent</artifactId>
8-
<version>0.7.3</version>
8+
<version>1.0.0-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

spring-data-cdo/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.bigraphs.springframework.data</groupId>
99
<artifactId>spring-data-cdo-parent</artifactId>
10-
<version>0.7.3</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

@@ -253,6 +253,14 @@
253253
<version>3.9</version>
254254
</dependency>
255255
<!-- ************ -->
256+
<!-- Deployment -->
257+
<!-- ************ -->
258+
<dependency>
259+
<groupId>org.sonatype.central</groupId>
260+
<artifactId>central-publishing-maven-plugin</artifactId>
261+
<version>0.8.0</version>
262+
</dependency>
263+
<!-- ************ -->
256264
<!-- Test -->
257265
<!-- ************ -->
258266
<dependency>

0 commit comments

Comments
 (0)