Skip to content

Commit e08b500

Browse files
steve-todorovsbespalov
steve-todorov
authored and
sbespalov
committed
issues/1775: Upgrade to Cassandra to 4.0-beta2
1 parent 2f42188 commit e08b500

File tree

4 files changed

+132
-12
lines changed

4 files changed

+132
-12
lines changed

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33

44
<modelVersion>4.0.0</modelVersion>
5-
5+
66
<parent>
77
<groupId>org.carlspring.strongbox</groupId>
88
<artifactId>strongbox-parent</artifactId>
99
<version>1.0-PR-62-SNAPSHOT</version>
1010
</parent>
11-
11+
1212
<artifactId>strongbox-db</artifactId>
1313
<packaging>pom</packaging>
1414
<version>1.0-PR-19-SNAPSHOT</version>
15-
15+
1616
<properties>
1717
<serverId />
1818
<deployUrl />

‎strongbox-db-import/pom.xml

+121-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<artifactId>strongbox-db-schema</artifactId>
2727
<version>${project.version}</version>
2828
</dependency>
29-
29+
3030
<dependency>
3131
<groupId>org.springframework.boot</groupId>
3232
<artifactId>spring-boot-starter</artifactId>
@@ -52,8 +52,28 @@
5252
<goal>run</goal>
5353
</goals>
5454
<configuration>
55-
<jvmArguments>-Xmx1024m</jvmArguments>
56-
<arguments>
55+
<jvmArguments>
56+
-Xmx1024m
57+
-Djdk.attach.allowAttachSelf=true
58+
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
59+
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
60+
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
61+
--add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
62+
--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
63+
--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
64+
--add-exports java.sql/java.sql=ALL-UNNAMED
65+
66+
--add-opens java.base/java.lang.module=ALL-UNNAMED
67+
--add-opens java.base/jdk.internal.loader=ALL-UNNAMED
68+
--add-opens java.base/jdk.internal.ref=ALL-UNNAMED
69+
--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
70+
--add-opens java.base/jdk.internal.math=ALL-UNNAMED
71+
--add-opens java.base/jdk.internal.module=ALL-UNNAMED
72+
--add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
73+
--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
74+
</jvmArguments>
75+
<arguments>--strongbox.db.janus-graph.storage-root=${project.build.directory}/db</arguments>
76+
<arguments>
5777
--strongbox.dbimport.root=${project.build.directory}
5878
</arguments>
5979
</configuration>
@@ -74,11 +94,107 @@
7494
<descriptors>
7595
<descriptor>src/main/assembly/db-schema.xml</descriptor>
7696
</descriptors>
77-
</configuration>
97+
</configuration>
7898
</execution>
7999
</executions>
80-
</plugin>
100+
</plugin>
81101
</plugins>
82102
</build>
83103

104+
<profiles>
105+
<profile>
106+
<id>jdk-default</id>
107+
<activation>
108+
<jdk>!11</jdk>
109+
</activation>
110+
<build>
111+
<plugins>
112+
<plugin>
113+
<groupId>org.springframework.boot</groupId>
114+
<artifactId>spring-boot-maven-plugin</artifactId>
115+
<executions>
116+
<execution>
117+
<id>strongbox-export-db</id>
118+
<phase>prepare-package</phase> <!-- bind to the packaging phase -->
119+
<goals>
120+
<goal>run</goal>
121+
</goals>
122+
<configuration>
123+
<jvmArguments>
124+
-Xmx1024m
125+
</jvmArguments>
126+
<arguments>--strongbox.db.janus-graph.storage-root=${project.build.directory}/db</arguments>
127+
<arguments>
128+
--strongbox.dbimport.root=${project.build.directory}
129+
</arguments>
130+
</configuration>
131+
</execution>
132+
</executions>
133+
</plugin>
134+
</plugins>
135+
</build>
136+
</profile>
137+
<profile>
138+
<id>jdk11</id>
139+
<activation>
140+
<jdk>11</jdk>
141+
</activation>
142+
<build>
143+
<plugins>
144+
<plugin>
145+
<groupId>org.springframework.boot</groupId>
146+
<artifactId>spring-boot-maven-plugin</artifactId>
147+
<executions>
148+
<execution>
149+
<id>strongbox-export-db</id>
150+
<phase>prepare-package</phase> <!-- bind to the packaging phase -->
151+
<goals>
152+
<goal>run</goal>
153+
</goals>
154+
<configuration>
155+
<jvmArguments>
156+
-Xmx1024m
157+
-Djdk.attach.allowAttachSelf=true
158+
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
159+
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
160+
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
161+
--add-exports
162+
java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
163+
--add-exports
164+
java.rmi/sun.rmi.registry=ALL-UNNAMED
165+
--add-exports
166+
java.rmi/sun.rmi.server=ALL-UNNAMED
167+
--add-exports
168+
java.sql/java.sql=ALL-UNNAMED
169+
170+
--add-opens
171+
java.base/java.lang.module=ALL-UNNAMED
172+
--add-opens
173+
java.base/jdk.internal.loader=ALL-UNNAMED
174+
--add-opens
175+
java.base/jdk.internal.ref=ALL-UNNAMED
176+
--add-opens
177+
java.base/jdk.internal.reflect=ALL-UNNAMED
178+
--add-opens
179+
java.base/jdk.internal.math=ALL-UNNAMED
180+
--add-opens
181+
java.base/jdk.internal.module=ALL-UNNAMED
182+
--add-opens
183+
java.base/jdk.internal.util.jar=ALL-UNNAMED
184+
--add-opens
185+
jdk.management/com.sun.management.internal=ALL-UNNAMED
186+
</jvmArguments>
187+
<arguments>--strongbox.db.janus-graph.storage-root=${project.build.directory}/db</arguments>
188+
<arguments>
189+
--strongbox.dbimport.root=${project.build.directory}
190+
</arguments>
191+
</configuration>
192+
</execution>
193+
</executions>
194+
</plugin>
195+
</plugins>
196+
</build>
197+
</profile>
198+
</profiles>
199+
84200
</project>

‎strongbox-db-server/pom.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
</properties>
24-
24+
2525
<dependencies>
2626
<dependency>
2727
<groupId>com.fasterxml.jackson.core</groupId>
@@ -79,17 +79,22 @@
7979
<groupId>org.neo4j</groupId>
8080
<artifactId>neo4j-ogm-api</artifactId>
8181
</dependency>
82-
82+
8383
<!--dependency>
8484
<groupId>org.neo4j</groupId>
8585
<artifactId>neo4j-ogm-bolt-driver</artifactId>
8686
</dependency-->
87-
87+
8888
<dependency>
8989
<groupId>commons-lang</groupId>
9090
<artifactId>commons-lang</artifactId>
9191
<version>2.6</version>
9292
</dependency>
9393

94+
<dependency>
95+
<groupId>javax.annotation</groupId>
96+
<artifactId>javax.annotation-api</artifactId>
97+
</dependency>
98+
9499
</dependencies>
95100
</project>

‎strongbox-db-server/src/main/resources/etc/conf/cassandra.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ permissions_validity_in_ms: 2000
1616
## Network
1717
## ------------------------
1818
## start_rpc - disable thrift - it's deprecated and should not be used!
19-
start_rpc: false
2019
listen_address: 127.0.0.1
2120
storage_port: 7010
2221
ssl_storage_port: 7011

0 commit comments

Comments
 (0)