Skip to content

Commit

Permalink
migrate to orientdb 3.2.10 (#1446)
Browse files Browse the repository at this point in the history 
migrated to orientdb 3.2.10
  • Loading branch information
@udovidio
udovidio authored Oct 5, 2022
1 parent a3d3b76 commit ee64589
Show file tree
Hide file tree
Showing 70 changed files with 146 additions and 71 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ include::content/docs/variables.adoc-include[]

* The `html` field type will be removed in the future. Instead the `string` type will be used in combination with an additional configuration property for this field in the schema. Of course, your existing schemas will be migrated for you.

[[v1.10.0]]
== 1.10.0 (TBD)

icon:check[] Core: The OrientDB database as been updated to version 3.2.10.

[[v1.9.3]]
== 1.9.3 (22.09.2022)

Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -25,7 +25,7 @@
<spring.security.version>5.5.7</spring.security.version>
<ferma.version>${project.version}</ferma.version>
<elasticsearch.client.version>1.1.1</elasticsearch.client.version>
<orientdb.version>3.1.18</orientdb.version>
<orientdb.version>3.2.10</orientdb.version>
<hazelcast.version>3.12.8</hazelcast.version>
<jackson.version>2.13.2</jackson.version>
<jackson-databind.version>2.13.2</jackson-databind.version>
Expand Down
2 changes: 1 addition & 1 deletion changelog-system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion common-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion databases/orientdb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh-databases</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions ...s/orientdb/src/main/java/com/gentics/mesh/graphdb/cluster/OrientDBClusterManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,15 +578,15 @@ public boolean isWriteQuorumReached() {

/**
* Check whether any of the cluster members is set to have exceeded the disk quota
* @return Optional name of the (first found) instance having the disk quota exceeded
* @return Optional uuid of the (first found) instance having the disk quota exceeded
*/
public Optional<String> getInstanceDiskQuotaExceeded() {
if (!isClusteringEnabled || hazelcastPlugin == null) {
return Optional.empty();
} else {
return hazelcastPlugin.getHazelcastInstance().getCluster().getMembers().stream()
.filter(m -> m.getBooleanAttribute(MESH_MEMBER_DISK_QUOTA_EXCEEDED) == Boolean.TRUE)
.map(m -> hazelcastPlugin.getNodeName(m)).findFirst();
.map(m -> m.getUuid()).findFirst();
}
}

Expand Down
2 changes: 1 addition & 1 deletion databases/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion demo/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh-demos</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion demo/default/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh-demos</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion distributed-coordinator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>mesh-distributed-coordinator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion distributed/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion doc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>mesh-doc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
16 changes: 15 additions & 1 deletion ferma/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>ferma</artifactId>
Expand Down Expand Up @@ -40,10 +40,24 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-graphdb</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
2 changes: 1 addition & 1 deletion madl/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>madl</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>madl-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion madl/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>madl</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>madl-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion madl/madl-ferma/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>madl</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>madl-ferma</artifactId>
Expand Down
30 changes: 29 additions & 1 deletion madl/orientdb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>madl</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>madl-orientdb</artifactId>
Expand All @@ -25,19 +25,47 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-server</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-distributed</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Load graphdb last to avoid class path conflict: PRJ-10537 -->
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-graphdb</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
Expand Down
2 changes: 1 addition & 1 deletion madl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>madl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mdm/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh-mdm</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>mesh-mdm-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mdm/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh-mdm</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>mesh-mdm-common</artifactId>
Expand Down
30 changes: 29 additions & 1 deletion mdm/orientdb-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh-mdm</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>mesh-mdm-orientdb-api</artifactId>
Expand All @@ -34,19 +34,47 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-server</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-distributed</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Load graphdb last to avoid class path conflict: PRJ-10537 -->
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-graphdb</artifactId>
<exclusions>
<exclusion>
<!-- This dependency is shipping an slf4j logger factory which is interfering with the bootstrap process -->
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- External API deps -->
Expand Down
2 changes: 1 addition & 1 deletion mdm/orientdb-wrapper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh-mdm</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>mesh-mdm-orientdb-wrapper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mdm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gentics.mesh</groupId>
<artifactId>mesh</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>mesh-mdm</artifactId>
Expand Down
Loading

0 comments on commit ee64589

Please sign in to comment.