Skip to content

Remove residual DSE compatibility and build wiring #1042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkropachev wants to merge 1 commit into
base: scylla-4.x
Choose a base branch
from
Open

Remove residual DSE compatibility and build wiring #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public TestRule chain = RuleChain.outerRule(ccmRule).around(sessionRule);

Only use this for:

* CCM tests that use `@CassandraRequirement` or `@DseRequirement` or `@ScyllaRequirement` restrictions at the method level
* CCM tests that use `@CassandraRequirement`, `@ScyllaRequirement`, or `@BackendRequirement` restrictions at the method level
(ex: `BatchStatementIT`).
* tests where you *really* need to restart from a clean state for every method.

Expand Down
2 changes: 1 addition & 1 deletion ci/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jabba use ${TEST_JAVA_VERSION}
# Find out the latest patch version of Cassandra
PATCH_SERVER_VERSION=$(curl -s https://downloads.apache.org/cassandra/ | grep -oP '(?<=href=\")[0-9]+\.[0-9]+\.[0-9]+(?=)' | sort -rV | uniq -w 3 | grep $SERVER_VERSION)
printenv | sort
mvn -B -V verify -T 1 -Ptest-jdk-${TEST_JAVA_MAJOR_VERSION} -DtestJavaHome=$(jabba which ${TEST_JAVA_VERSION}) -Dccm.version=${PATCH_SERVER_VERSION} -Dccm.dse=false -Dmaven.test.failure.ignore=true -Dmaven.javadoc.skip=true
mvn -B -V verify -T 1 -Ptest-jdk-${TEST_JAVA_MAJOR_VERSION} -DtestJavaHome=$(jabba which ${TEST_JAVA_VERSION}) -Dccm.version=${PATCH_SERVER_VERSION} -Dmaven.test.failure.ignore=true -Dmaven.javadoc.skip=true
35 changes: 3 additions & 32 deletions core-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,6 @@
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
</dependency>
<dependency>
<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
Expand Down Expand Up @@ -316,21 +301,6 @@
<artifactId>lz4-java</artifactId>
<version>${lz4.version}</version>
</additionalDependency>
<additionalDependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>${tinkerpop.version}</version>
</additionalDependency>
<additionalDependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<version>${tinkerpop.version}</version>
</additionalDependency>
<additionalDependency>
<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
<version>${esri.version}</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</execution>
Expand Down Expand Up @@ -375,7 +345,7 @@
Note: dependencies marked as optional are by default included with optional
resolution in the manifest; we only need to manually set the resolution to
optional for dependencies declared as non-optional in the pom files.
-->jnr.*;resolution:=optional, com.esri.core.geometry.*;resolution:=optional,org.reactivestreams.*;resolution:=optional, org.apache.tinkerpop.*;resolution:=optional, org.javatuples.*;resolution:=optional, reactor.blockhound.*;resolution:=optional,
-->jnr.*;resolution:=optional,org.reactivestreams.*;resolution:=optional, reactor.blockhound.*;resolution:=optional,
<!--
5) Don't import packages imported by shaded classes, if they are not used by the
driver bundle.
Expand All @@ -386,7 +356,8 @@
1) The driver's packages (API and internal);
2) All shaded packages, except Guava which resides in a separate bundle.
-->
<Export-Package>com.datastax.oss.driver.api.core.*, com.datastax.oss.driver.internal.core.*, com.datastax.dse.driver.api.core.*, com.datastax.dse.driver.internal.core.*, com.datastax.oss.driver.shaded.netty.*, com.datastax.oss.driver.shaded.fasterxml.jackson.*,</Export-Package>
<!-- DSE-namespaced exports are limited to generic reactive compatibility packages. -->
<Export-Package>com.datastax.oss.driver.api.core.*, com.datastax.oss.driver.internal.core.*, com.datastax.dse.driver.api.core.cql.reactive, com.datastax.dse.driver.internal.core.cql.reactive, com.datastax.dse.driver.internal.core.util.concurrent, com.datastax.oss.driver.shaded.netty.*, com.datastax.oss.driver.shaded.fasterxml.jackson.*,</Export-Package>
</instructions>
<rebuildBundle>true</rebuildBundle>
</configuration>
Expand Down
38 changes: 3 additions & 35 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,6 @@
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
</dependency>
<dependency>
<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down Expand Up @@ -324,32 +309,15 @@
Note: dependencies marked as optional are by default included with optional
resolution in the manifest; we only need to manually set the resolution to
optional for dependencies declared as non-optional in the pom files.
-->jnr.*;resolution:=optional, com.esri.core.geometry.*;resolution:=optional, org.reactivestreams.*;resolution:=optional, org.apache.tinkerpop.*;resolution:=optional, org.javatuples.*;resolution:=optional, reactor.blockhound.*;resolution:=optional, *
-->jnr.*;resolution:=optional, org.reactivestreams.*;resolution:=optional, reactor.blockhound.*;resolution:=optional, *
</Import-Package>
<Export-Package>com.datastax.oss.driver.*.core.*, com.datastax.dse.driver.*.core.*</Export-Package>
<!-- The DSE-namespaced packages below contain generic reactive APIs retained for compatibility. -->
<Export-Package>com.datastax.oss.driver.*.core.*, com.datastax.dse.driver.api.core.cql.reactive, com.datastax.dse.driver.internal.core.cql.reactive, com.datastax.dse.driver.internal.core.util.concurrent</Export-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>generate-dependency-list</id>
<goals>
<goal>list</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<includeScope>runtime</includeScope>
<outputScope>true</outputScope>
<excludeGroupIds>com.datastax.cassandra,com.datastax.dse</excludeGroupIds>
<outputFile>${project.build.outputDirectory}/com/datastax/dse/driver/internal/deps.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
17 changes: 1 addition & 16 deletions core/revapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"packages": {
"regex": true,
"exclude": [
"com\\.datastax\\.(oss|dse)\\.protocol\\.internal(\\..+)?",
"com\\.datastax\\.oss\\.protocol\\.internal(\\..+)?",
"com\\.datastax\\.(oss|dse)\\.driver\\.internal(\\..+)?",
"com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?",
"org\\.assertj(\\..+)?"
Expand Down Expand Up @@ -4836,28 +4836,13 @@
"annotation": "@edu.umd.cs.findbugs.annotations.NonNull",
"justification": "JAVA-2434: added @NonNull to ProgrammaticSslEngineFactory(SSLContext) constructor"
},
{
"code": "java.class.nonFinalClassInheritsFromNewClass",
"old": "class com.datastax.oss.driver.api.core.auth.PlainTextAuthProviderBase.PlainTextAuthenticator",
"new": "class com.datastax.oss.driver.api.core.auth.PlainTextAuthProviderBase.PlainTextAuthenticator",
"superClass": "com.datastax.dse.driver.api.core.auth.BaseDseAuthenticator",
"justification": "New parent doesn't add constraints for implementors"
},
{
"code": "java.method.exception.runtimeAdded",
"old": "method com.datastax.oss.driver.api.core.auth.Authenticator com.datastax.oss.driver.api.core.auth.PlainTextAuthProviderBase::newAuthenticator(com.datastax.oss.driver.api.core.metadata.EndPoint, java.lang.String)",
"new": "method com.datastax.oss.driver.api.core.auth.Authenticator com.datastax.oss.driver.api.core.auth.PlainTextAuthProviderBase::newAuthenticator(com.datastax.oss.driver.api.core.metadata.EndPoint, java.lang.String) throws com.datastax.oss.driver.api.core.auth.AuthenticationException",
"exception": "com.datastax.oss.driver.api.core.auth.AuthenticationException",
"justification": "New exception is unchecked"
},
{
"code": "java.class.superTypeTypeParametersChanged",
"old": "class com.datastax.dse.driver.api.core.DseSessionBuilderBase<SelfT extends com.datastax.oss.driver.api.core.session.SessionBuilder, SessionT extends java.lang.Object>",
"new": "class com.datastax.dse.driver.api.core.DseSessionBuilderBase<SelfT extends com.datastax.dse.driver.api.core.DseSessionBuilderBase<SelfT, SessionT extends java.lang.Object>, SessionT>",
"oldSuperType": "com.datastax.oss.driver.api.core.session.SessionBuilder<SelfT extends com.datastax.oss.driver.api.core.session.SessionBuilder, SessionT extends java.lang.Object>",
"newSuperType": "com.datastax.oss.driver.api.core.session.SessionBuilder<SelfT extends com.datastax.dse.driver.api.core.DseSessionBuilderBase<SelfT, SessionT extends java.lang.Object>, SessionT>",
"justification": "JAVA-2411: Type parameters were wrong but it is unlikely that implementors would notice that in subclasses"
},
{
"code": "java.method.removed",
"old": "method <E> org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal<?, E> org.apache.tinkerpop.gremlin.process.remote.RemoteConnection::submit(org.apache.tinkerpop.gremlin.process.traversal.Bytecode) throws org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException",
Expand Down
70 changes: 0 additions & 70 deletions core/src/main/java/com/datastax/dse/driver/api/core/DseProtocolVersion.java
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions core/src/main/java/com/datastax/dse/driver/api/core/DseSession.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions core/src/main/java/com/datastax/dse/driver/api/core/DseSessionBuilder.java
View file
Open in desktop

This file was deleted.

Loading
Loading