Skip to content

Commit 015dbbf

Browse files
PioBeatPioBeat
committed
new version: 0.7.3
- Spring Boot Parent updated to 3.1.4 - Migration to Central Publishing Portal - Bugfixes and Refactorings
1 parent cda834a commit 015dbbf

File tree

4 files changed

+70
-75
lines changed

4 files changed

+70
-75
lines changed

‎README.adoc‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Just add the following Maven dependency to your project's `pom.xml`:
5656
<dependency>
5757
<groupId>org.bigraphs.springframework.data</groupId>
5858
<artifactId>spring-data-cdo</artifactId>
59-
<version>VERSION</version>
59+
<version>0.7.3</version>
6060
</dependency>
6161
----
6262

@@ -76,22 +76,22 @@ These dependencies are required when you want to start the standalone CDO server
7676
</dependency>
7777
----
7878

79-
==== SNAPSHOT Releases
80-
81-
For SNAPSHOT releases also include the following repository:
82-
83-
[source,xml]
84-
----
85-
<repositories>
86-
<repository>
87-
<snapshots>
88-
<enabled>true</enabled>
89-
</snapshots>
90-
<id>ossrh</id>
91-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
92-
</repository>
93-
</repositories>
94-
----
79+
// ==== SNAPSHOT Releases
80+
//
81+
// For SNAPSHOT releases also include the following repository:
82+
//
83+
// [source,xml]
84+
// ----
85+
// <repositories>
86+
// <repository>
87+
// <snapshots>
88+
// <enabled>true</enabled>
89+
// </snapshots>
90+
// <id>ossrh</id>
91+
// <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
92+
// </repository>
93+
// </repositories>
94+
// ----
9595

9696

9797

@@ -220,18 +220,27 @@ But if you want to try out the latest and greatest, Spring Data for CDO can be e
220220
or by using the https://github.com/apache/maven-wrapper[maven wrapper].
221221
If you want to build with the regular `mvn` command, you will need https://maven.apache.org/download.cgi[Maven v3.8.3 or above].
222222

223-
You also need JDK >=17.
224-
Check that the `JAVA_HOME` environment variable is pointing to the correct JDK.
223+
You also need JDK 17.
224+
Check that the `JAVA_HOME` environment variable is pointing to the correct JDK, or use:
225+
226+
[source,shell]
227+
----
228+
# (1) Select Java 17
229+
$ sudo update-alternatives --config java
230+
231+
# (2) Check
232+
$ mvn --version
233+
----
225234

226235
To build Spring Data for CDO, execute the following commands in the terminal from the root of this project:
227236

228237
[source,shell]
229238
----
230-
# 1) Get all required Eclipse dependencies first. This step needs to be run only once:
231-
mvn clean validate -f ./spring-data-cdo-distribution/pom.xml -PfetchEclipseDependencies
239+
# (1) Get all required Eclipse dependencies first. This step needs to be run only once:
240+
$ mvn clean validate -f ./spring-data-cdo-distribution/pom.xml -PfetchEclipseDependencies
232241
233-
# 2) Package and install the 'spring-data-cdo' module containing the framework
234-
mvn install -DskipTests
242+
# (2) Package and install the 'spring-data-cdo' module containing the framework
243+
$ mvn install -DskipTests
235244
----
236245

237246
The dependencies are deployed to your local Maven repository usually located at `~/.m2/`.
@@ -289,7 +298,7 @@ sudo apt install gnupg2
289298
```
290299

291300
and the GPG credentials being available e.g. from `settings.xml` (see [here](https://central.sonatype.org/publish/publish-maven/)).
292-
In `settings.xml` should be a profile and server configuration both with the `<id>ossrh</id>`.
301+
In `settings.xml` should be a profile and server configuration both with the `<id>central</id>`.
293302

294303
More information can be found [here](https://central.sonatype.org/publish/requirements/gpg/).
295304

‎pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.springframework.data.build</groupId>
88
<artifactId>spring-data-parent</artifactId>
9-
<version>2.6.5</version>
9+
<version>3.1.4</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

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

1818
<name>Spring Data for CDO - Parent</name>
@@ -107,7 +107,7 @@
107107
<!-- Versions: Other -->
108108
<spring.data.commons.version>2.4.1</spring.data.commons.version>
109109
<guava.version>31.0.1-jre</guava.version>
110-
<!-- <junit-jupiter.version>5.4.2</junit-jupiter.version>-->
110+
<!-- <junit-jupiter.version>5.4.2</junit-jupiter.version>-->
111111
<junit-jupiter.version>5.6.2</junit-jupiter.version>
112112
</properties>
113113

@@ -150,6 +150,7 @@
150150
<configuration>
151151
<source>${java.version}</source>
152152
<target>${java.version}</target>
153+
<release>${java.version}</release>
153154
</configuration>
154155
</plugin>
155156
<plugin>
@@ -167,10 +168,11 @@
167168
<plugin>
168169
<groupId>org.apache.maven.plugins</groupId>
169170
<artifactId>maven-compiler-plugin</artifactId>
170-
<version>3.11.0</version>
171+
<version>3.13.0</version>
171172
<configuration>
172173
<source>${java.version}</source>
173174
<target>${java.version}</target>
175+
<release>${java.version}</release>
174176
</configuration>
175177
</plugin>
176178
<plugin>

‎spring-data-cdo-distribution/pom.xml‎

Lines changed: 1 addition & 5 deletions
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>1.0.0-SNAPSHOT</version>
8+
<version>0.7.3</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
@@ -39,10 +39,6 @@
3939
<plugin>
4040
<groupId>org.apache.maven.plugins</groupId>
4141
<artifactId>maven-compiler-plugin</artifactId>
42-
<configuration>
43-
<source>${java.version}</source>
44-
<target>${java.version}</target>
45-
</configuration>
4642
</plugin>
4743
<plugin>
4844
<groupId>org.apache.maven.plugins</groupId>

‎spring-data-cdo/pom.xml‎

Lines changed: 30 additions & 42 deletions
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>1.0.0-SNAPSHOT</version>
10+
<version>0.7.3</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

@@ -279,35 +279,40 @@
279279
<dependency>
280280
<groupId>javax.enterprise</groupId>
281281
<artifactId>cdi-api</artifactId>
282-
<version>${cdi}</version>
283-
<scope>provided</scope>
284-
<optional>true</optional>
285-
</dependency>
286-
<dependency>
287-
<groupId>javax.annotation</groupId>
288-
<artifactId>javax.annotation-api</artifactId>
289-
<version>${javax-annotation-api}</version>
290-
<scope>test</scope>
291-
</dependency>
282+
<version>2.0.SP1</version>
283+
</dependency>
284+
<!-- <dependency>-->
285+
<!-- <groupId>javax.enterprise</groupId>-->
286+
<!-- <artifactId>cdi-api</artifactId>-->
287+
<!-- <version>${cdi}</version>-->
288+
<!-- <scope>provided</scope>-->
289+
<!-- <optional>true</optional>-->
290+
<!-- </dependency>-->
291+
<!-- <dependency>-->
292+
<!-- <groupId>javax.annotation</groupId>-->
293+
<!-- <artifactId>javax.annotation-api</artifactId>-->
294+
<!-- <version>${javax-annotation-api}</version>-->
295+
<!-- <scope>test</scope>-->
296+
<!-- </dependency>-->
292297
<!-- JSR 303 Validation -->
293-
<dependency>
294-
<groupId>javax.validation</groupId>
295-
<artifactId>validation-api</artifactId>
296-
<version>${validation}</version>
297-
<optional>true</optional>
298-
</dependency>
298+
<!-- <dependency>-->
299+
<!-- <groupId>javax.validation</groupId>-->
300+
<!-- <artifactId>validation-api</artifactId>-->
301+
<!-- <version>${validation}</version>-->
302+
<!-- <optional>true</optional>-->
303+
<!-- </dependency>-->
299304
<dependency>
300305
<groupId>org.hibernate</groupId>
301306
<artifactId>hibernate-validator</artifactId>
302307
<version>5.2.4.Final</version>
303308
<scope>test</scope>
304309
</dependency>
305-
<dependency>
306-
<groupId>joda-time</groupId>
307-
<artifactId>joda-time</artifactId>
308-
<version>${jodatime}</version>
309-
<scope>test</scope>
310-
</dependency>
310+
<!-- <dependency>-->
311+
<!-- <groupId>joda-time</groupId>-->
312+
<!-- <artifactId>joda-time</artifactId>-->
313+
<!-- <version>${jodatime}</version>-->
314+
<!-- <scope>test</scope>-->
315+
<!-- </dependency>-->
311316
<dependency>
312317
<groupId>org.slf4j</groupId>
313318
<artifactId>jul-to-slf4j</artifactId>
@@ -377,10 +382,6 @@
377382
<plugin>
378383
<groupId>org.apache.maven.plugins</groupId>
379384
<artifactId>maven-compiler-plugin</artifactId>
380-
<configuration>
381-
<source>${java.version}</source>
382-
<target>${java.version}</target>
383-
</configuration>
384385
</plugin>
385386
<plugin>
386387
<groupId>org.apache.maven.plugins</groupId>
@@ -394,8 +395,8 @@
394395
</configuration>
395396
</plugin>
396397
<plugin>
397-
<groupId>org.sonatype.plugins</groupId>
398-
<artifactId>nexus-staging-maven-plugin</artifactId>
398+
<groupId>org.sonatype.central</groupId>
399+
<artifactId>central-publishing-maven-plugin</artifactId>
399400
</plugin>
400401
<!-- Shade P2 Eclipse Dependencies -->
401402
<plugin>
@@ -433,19 +434,6 @@
433434
<include>schema/**</include>
434435
</includes>
435436
</filter>
436-
<!-- <filter>-->
437-
<!-- <artifact>org.eclipse.emf.cdo:*</artifact>-->
438-
<!-- <excludes>-->
439-
<!-- <exclude>META-INF/*.SF</exclude>-->
440-
<!-- <exclude>META-INF/*.DSA</exclude>-->
441-
<!-- <exclude>META-INF/*.RSA</exclude>-->
442-
<!-- <exclude>.options</exclude>-->
443-
<!-- <exclude>about.*</exclude>-->
444-
<!-- <exclude>*.png</exclude>-->
445-
<!--&lt;!&ndash; <exclude>plugin.properties</exclude>&ndash;&gt;-->
446-
<!-- <exclude>plugin.xml</exclude>-->
447-
<!-- </excludes>-->
448-
<!-- </filter>-->
449437
</filters>
450438
</configuration>
451439
</execution>

0 commit comments

Comments
 (0)