Skip to content

Commit 1ee2ee6

Browse files
author
Dominik Grzelak
committed
Merge branch 'develop'
# Conflicts: # README.adoc
2 parents 183d585 + 3b325b9 commit 1ee2ee6

File tree

4 files changed

+66
-50
lines changed

4 files changed

+66
-50
lines changed

‎README.adoc‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Version Compatability
99
|2024-09 (4.33.0)
1010
|51
1111

12-
|0.7.1
12+
|0.7.2
1313
|https://www.eclipse.org/downloads/packages/release/2022-12/r/eclipse-modeling-tools[2022-12 (4.26.0)]
1414
|48
1515

@@ -37,11 +37,11 @@ They can also be used afterwards with *Spring Data CDO*.
3737

3838
=== Working with Eclipse IDEs
3939

40-
This framework provides a feature to start a standalone CDO server.
41-
To inspect the contents, use the Eclipse CDO Explorer to view and modify Ecore models:
40+
This framework includes functionality to launch a standalone CDO server.
41+
Use the Eclipse CDO Explorer, which allows you to easily view and interact with Ecore models hosted on the CDO server.
4242

4343
* Download CDO Explorer via the link:https://www.eclipse.org/downloads/packages/installer[Eclipse Installer].
44-
See table above to see which Eclipse Version to use.
44+
See table above to see which Eclipse Version to use.
4545

4646
=== Dependency Configuration (Maven)
4747

@@ -54,13 +54,22 @@ Just add the following Maven dependency to your project's `pom.xml`:
5454
<artifactId>spring-data-cdo</artifactId>
5555
<version>VERSION</version>
5656
</dependency>
57+
----
58+
59+
These dependencies are required when you want to start the standalone CDO server that is shipped with this framework:
5760

58-
<!-- Required for the CDO standalone server -->
61+
[source,xml]
62+
----
5963
<dependency>
6064
<groupId>org.eclipse.platform</groupId>
6165
<artifactId>org.eclipse.core.runtime</artifactId>
6266
<version>3.26.100</version>
6367
</dependency>
68+
<dependency>
69+
<groupId>org.eclipse.platform</groupId>
70+
<artifactId>org.eclipse.equinox.common</artifactId>
71+
<version>3.17.100</version>
72+
</dependency>
6473
----
6574

6675
==== SNAPSHOT Releases
@@ -189,7 +198,15 @@ if (ePackage == null) {
189198
When required, one can listen to specific events emitted by some repository actions for adding extended behavior.
190199
Events are implemented for Delete, Save and Insert operations, including "after" and "before" notions for fine-grained control.
191200

201+
=== Standalone CDO Server
202+
203+
For testing purposes you can start a standalone CDO server like this:
192204

205+
[source,java]
206+
----
207+
CDOStandaloneServer server = new CDOStandaloneServer("repo1");
208+
CDOStandaloneServer.start(server);
209+
----
193210
== Development: Building from Source
194211

195212
You do not need to build from source to use Spring Data for CDO.

‎pom.xml‎

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

@@ -111,6 +111,7 @@
111111
<!-- Should match with the version in Bigraph Framework + Bigraph Ecore Metamodel -->
112112
<emf.cdo.common.version>4.20.0-SNAPSHOT</emf.cdo.common.version><!--4.20.0.v20221106-0628-->
113113
<eclipse.core.runtime.version>3.26.100</eclipse.core.runtime.version>
114+
<eclipse.equinox.common.version>3.17.100</eclipse.equinox.common.version>
114115
<emf.ecore.change.version>2.14.0</emf.ecore.change.version>
115116
<!-- Versions: Other -->
116117
<spring.data.commons.version>2.4.1</spring.data.commons.version>
@@ -225,7 +226,7 @@
225226
<plugin>
226227
<groupId>org.apache.maven.plugins</groupId>
227228
<artifactId>maven-shade-plugin</artifactId>
228-
<version>3.5.1</version>
229+
<version>3.6.0</version>
229230
</plugin>
230231
<plugin>
231232
<groupId>org.reficio</groupId>

‎spring-data-cdo/pom.xml‎

Lines changed: 38 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,18 @@
7373
<!-- ******************************************************** -->
7474
<!-- Eclipse Dependencies available at the Central Repository -->
7575
<!-- ******************************************************** -->
76-
<!-- Eclipse Platform : Required for the CDO standalone server -->
76+
<!-- Eclipse Platform: Required for the CDO standalone server -->
7777
<dependency>
7878
<groupId>org.eclipse.platform</groupId>
7979
<artifactId>org.eclipse.core.runtime</artifactId>
8080
<version>${eclipse.core.runtime.version}</version>
81+
<scope>provided</scope>
8182
</dependency>
8283
<dependency>
8384
<groupId>org.eclipse.platform</groupId>
8485
<artifactId>org.eclipse.equinox.common</artifactId>
85-
<version>3.17.100</version>
86-
<!-- <exclusions>-->
87-
<!-- <exclusion>-->
88-
<!-- <groupId>org.eclipse.platform</groupId>-->
89-
<!-- <artifactId>org.eclipse.core.runtime</artifactId>-->
90-
<!-- </exclusion>-->
91-
<!-- </exclusions>-->
86+
<version>${eclipse.equinox.common.version}</version>
87+
<scope>provided</scope>
9288
</dependency>
9389
<dependency>
9490
<groupId>org.eclipse.emf</groupId>
@@ -114,6 +110,12 @@
114110
<groupId>org.eclipse.emf</groupId>
115111
<artifactId>org.eclipse.emf.codegen</artifactId>
116112
<version>${emf.codegen.version}</version>
113+
<exclusions>
114+
<exclusion>
115+
<groupId>org.eclipse.platform</groupId>
116+
<artifactId>org.eclipse.core.runtime</artifactId>
117+
</exclusion>
118+
</exclusions>
117119
</dependency>
118120
<dependency>
119121
<groupId>org.eclipse.ocl</groupId>
@@ -125,28 +127,11 @@
125127
<artifactId>org.eclipse.ocl.ecore</artifactId>
126128
<version>3.3.100.v20140610-0641</version>
127129
</dependency>
128-
<!-- <dependency>-->
129-
<!-- <groupId>org.eclipse.acceleo</groupId>-->
130-
<!-- <artifactId>org.eclipse.ocl.common</artifactId>-->
131-
<!-- <version>1.2.0.v20140610-0641</version>-->
132-
<!-- </dependency>-->
133130
<dependency>
134131
<groupId>org.eclipse.ocl</groupId>
135132
<artifactId>org.eclipse.ocl.common</artifactId>
136133
<version>1.2.0.v20140610-0641</version>
137134
</dependency>
138-
<!-- OCL -->
139-
<!-- <dependency>-->
140-
<!-- <groupId>org.eclipse.acceleo</groupId>-->
141-
<!-- <artifactId>lpg.runtime.java</artifactId>-->
142-
<!-- <version>2.0.17.v201004271640</version>-->
143-
<!-- <exclusions>-->
144-
<!-- <exclusion>-->
145-
<!-- <groupId>org.eclipse.platform</groupId>-->
146-
<!-- <artifactId>org.eclipse.core.runtime</artifactId>-->
147-
<!-- </exclusion>-->
148-
<!-- </exclusions>-->
149-
<!-- </dependency>-->
150135
<!-- ************************** -->
151136
<!-- P2 Repository Dependencies -->
152137
<!-- ************************** -->
@@ -216,12 +201,6 @@
216201
<groupId>org.eclipse.emf.cdo</groupId>
217202
<artifactId>org.eclipse.net4j.util</artifactId>
218203
<version>3.21.0-SNAPSHOT</version>
219-
<exclusions>
220-
<exclusion>
221-
<groupId>org.eclipse.platform</groupId>
222-
<artifactId>org.eclipse.core.runtime</artifactId>
223-
</exclusion>
224-
</exclusions>
225204
</dependency>
226205
<dependency>
227206
<groupId>org.eclipse.emf.cdo</groupId>
@@ -279,7 +258,7 @@
279258
<dependency>
280259
<groupId>org.bigraphs.framework</groupId>
281260
<artifactId>bigraph-core</artifactId>
282-
<version>2.0.0</version>
261+
<version>2.0.1</version>
283262
<scope>test</scope>
284263
</dependency>
285264
<!-- CDI -->
@@ -424,25 +403,41 @@
424403
<configuration>
425404
<!-- <minimizeJar>true</minimizeJar> -->
426405
<createDependencyReducedPom>true</createDependencyReducedPom>
427-
<artifactSet>
428-
<includes>
429-
<include>org.eclipse.emf.cdo:*</include>
430-
</includes>
431-
</artifactSet>
406+
<!-- <artifactSet>-->
407+
<!-- <includes>-->
408+
<!-- <include>org.eclipse.emf.cdo:*</include>-->
409+
<!-- </includes>-->
410+
<!-- </artifactSet>-->
432411
<filters>
433412
<filter>
434-
<artifact>org.eclipse.emf.cdo:*</artifact>
413+
<artifact>*:*</artifact>
435414
<excludes>
436415
<exclude>META-INF/*.SF</exclude>
437416
<exclude>META-INF/*.DSA</exclude>
438417
<exclude>META-INF/*.RSA</exclude>
439-
<exclude>.options</exclude>
440-
<exclude>about.*</exclude>
441-
<exclude>*.png</exclude>
442-
<!-- <exclude>plugin.properties</exclude>-->
443-
<!-- <exclude>plugin.xml</exclude>-->
444418
</excludes>
445419
</filter>
420+
<filter>
421+
<artifact>org.eclipse.emf.cdo:*</artifact>
422+
<includes>
423+
<include>META-INF/**</include>
424+
<include>org/**</include>
425+
<include>schema/**</include>
426+
</includes>
427+
</filter>
428+
<!-- <filter>-->
429+
<!-- <artifact>org.eclipse.emf.cdo:*</artifact>-->
430+
<!-- <excludes>-->
431+
<!-- <exclude>META-INF/*.SF</exclude>-->
432+
<!-- <exclude>META-INF/*.DSA</exclude>-->
433+
<!-- <exclude>META-INF/*.RSA</exclude>-->
434+
<!-- <exclude>.options</exclude>-->
435+
<!-- <exclude>about.*</exclude>-->
436+
<!-- <exclude>*.png</exclude>-->
437+
<!--&lt;!&ndash; <exclude>plugin.properties</exclude>&ndash;&gt;-->
438+
<!-- <exclude>plugin.xml</exclude>-->
439+
<!-- </excludes>-->
440+
<!-- </filter>-->
446441
</filters>
447442
</configuration>
448443
</execution>

‎spring-data-cdo/src/main/resources/plugin.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
_UI_DiagnosticRoot_diagnostic=_UI_DiagnosticRoot_diagnostic
2+
_UI_ValidationFailed_diagnostic=Validation failed with an exception for ''{0}''
3+
_UI_EClassifierInstanceTypeNameAnalysisResult_diagnostic = Analysis result for the instance type name ''{0}''

0 commit comments

Comments
 (0)