Skip to content

Commit

Permalink
issues/1775: Upgrade to Cassandra to 4.0-beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
@steve-todorov @sbespalov
steve-todorov authored and sbespalov committed Oct 27, 2020
1 parent 2f42188 commit e08b500
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 12 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<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">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.carlspring.strongbox</groupId>
<artifactId>strongbox-parent</artifactId>
<version>1.0-PR-62-SNAPSHOT</version>
</parent>

<artifactId>strongbox-db</artifactId>
<packaging>pom</packaging>
<version>1.0-PR-19-SNAPSHOT</version>

<properties>
<serverId />
<deployUrl />
Expand Down
126 changes: 121 additions & 5 deletions strongbox-db-import/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<artifactId>strongbox-db-schema</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
Expand All @@ -52,8 +52,28 @@
<goal>run</goal>
</goals>
<configuration>
<jvmArguments>-Xmx1024m</jvmArguments>
<arguments>
<jvmArguments>
-Xmx1024m
-Djdk.attach.allowAttachSelf=true
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
--add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
--add-exports java.sql/java.sql=ALL-UNNAMED

--add-opens java.base/java.lang.module=ALL-UNNAMED
--add-opens java.base/jdk.internal.loader=ALL-UNNAMED
--add-opens java.base/jdk.internal.ref=ALL-UNNAMED
--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
--add-opens java.base/jdk.internal.math=ALL-UNNAMED
--add-opens java.base/jdk.internal.module=ALL-UNNAMED
--add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
</jvmArguments>
<arguments>--strongbox.db.janus-graph.storage-root=${project.build.directory}/db</arguments>
<arguments>
--strongbox.dbimport.root=${project.build.directory}
</arguments>
</configuration>
Expand All @@ -74,11 +94,107 @@
<descriptors>
<descriptor>src/main/assembly/db-schema.xml</descriptor>
</descriptors>
</configuration>
</configuration>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk-default</id>
<activation>
<jdk>!11</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>strongbox-export-db</id>
<phase>prepare-package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>run</goal>
</goals>
<configuration>
<jvmArguments>
-Xmx1024m
</jvmArguments>
<arguments>--strongbox.db.janus-graph.storage-root=${project.build.directory}/db</arguments>
<arguments>
--strongbox.dbimport.root=${project.build.directory}
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk11</id>
<activation>
<jdk>11</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>strongbox-export-db</id>
<phase>prepare-package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>run</goal>
</goals>
<configuration>
<jvmArguments>
-Xmx1024m
-Djdk.attach.allowAttachSelf=true
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
--add-exports
java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
--add-exports
java.rmi/sun.rmi.registry=ALL-UNNAMED
--add-exports
java.rmi/sun.rmi.server=ALL-UNNAMED
--add-exports
java.sql/java.sql=ALL-UNNAMED

--add-opens
java.base/java.lang.module=ALL-UNNAMED
--add-opens
java.base/jdk.internal.loader=ALL-UNNAMED
--add-opens
java.base/jdk.internal.ref=ALL-UNNAMED
--add-opens
java.base/jdk.internal.reflect=ALL-UNNAMED
--add-opens
java.base/jdk.internal.math=ALL-UNNAMED
--add-opens
java.base/jdk.internal.module=ALL-UNNAMED
--add-opens
java.base/jdk.internal.util.jar=ALL-UNNAMED
--add-opens
jdk.management/com.sun.management.internal=ALL-UNNAMED
</jvmArguments>
<arguments>--strongbox.db.janus-graph.storage-root=${project.build.directory}/db</arguments>
<arguments>
--strongbox.dbimport.root=${project.build.directory}
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
11 changes: 8 additions & 3 deletions strongbox-db-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -79,17 +79,22 @@
<groupId>org.neo4j</groupId>
<artifactId>neo4j-ogm-api</artifactId>
</dependency>

<!--dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-ogm-bolt-driver</artifactId>
</dependency-->

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>

</dependencies>
</project>
1 change: 0 additions & 1 deletion strongbox-db-server/src/main/resources/etc/conf/cassandra.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ permissions_validity_in_ms: 2000
## Network
## ------------------------
## start_rpc - disable thrift - it's deprecated and should not be used!
start_rpc: false
listen_address: 127.0.0.1
storage_port: 7010
ssl_storage_port: 7011
Expand Down

0 comments on commit e08b500

Please sign in to comment.