Skip to content

Commit 5c26a7f

Browse files
BouncheckBouncheck
committed
Merge commit '8352d4c733da70461dc5cb7763a98d4d0c960925' of https://github.com/apache/cassandra-java-driver into pull-upstream-4.18.1-v3
Partial pull moving towards 4.18.1 Conflict resolution resulted in the following changes: - Version was changed to 4.18.1.0-SNAPSHOT - deep-lic-scan.yaml was removed. Likewise we don't have a fossa subscription. - added with modifications previously skipped distribution-source module. Changed groupId, versions and names. - added with modifications previously skipped distribution-tests module. Changed groupId, versions and names. - Skipped license-maven-plugin which was checking for ASF license headers. - removed `<oldArtifacts>` section of revapi plugin configuration pointing to datastax. - Skipped addition of maven-remote-resources-plugin (pom.xml). - Skipped removal of distributionManagement section (pom.xml). We are not using `org.apache` parent pom to define that part.
2 parents 663064f + 8352d4c commit 5c26a7f

File tree

17 files changed

+281
-61
lines changed

17 files changed

+281
-61
lines changed

‎.github/workflows/dep-lic-scan.yaml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎bom/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>com.scylladb</groupId>
3030
<artifactId>java-driver-parent</artifactId>
31-
<version>4.18.0.3-SNAPSHOT</version>
31+
<version>4.18.1.0-SNAPSHOT</version>
3232
</parent>
3333
<artifactId>java-driver-bom</artifactId>
3434
<packaging>pom</packaging>
@@ -38,42 +38,42 @@
3838
<dependency>
3939
<groupId>com.scylladb</groupId>
4040
<artifactId>java-driver-core</artifactId>
41-
<version>4.18.0.3-SNAPSHOT</version>
41+
<version>4.18.1.0-SNAPSHOT</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>com.scylladb</groupId>
4545
<artifactId>java-driver-core-shaded</artifactId>
46-
<version>4.18.0.3-SNAPSHOT</version>
46+
<version>4.18.1.0-SNAPSHOT</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>com.scylladb</groupId>
5050
<artifactId>java-driver-mapper-processor</artifactId>
51-
<version>4.18.0.3-SNAPSHOT</version>
51+
<version>4.18.1.0-SNAPSHOT</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>com.scylladb</groupId>
5555
<artifactId>java-driver-mapper-runtime</artifactId>
56-
<version>4.18.0.3-SNAPSHOT</version>
56+
<version>4.18.1.0-SNAPSHOT</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.scylladb</groupId>
6060
<artifactId>java-driver-query-builder</artifactId>
61-
<version>4.18.0.3-SNAPSHOT</version>
61+
<version>4.18.1.0-SNAPSHOT</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>com.scylladb</groupId>
6565
<artifactId>java-driver-test-infra</artifactId>
66-
<version>4.18.0.3-SNAPSHOT</version>
66+
<version>4.18.1.0-SNAPSHOT</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>com.scylladb</groupId>
7070
<artifactId>java-driver-metrics-micrometer</artifactId>
71-
<version>4.18.0.3-SNAPSHOT</version>
71+
<version>4.18.1.0-SNAPSHOT</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>com.scylladb</groupId>
7575
<artifactId>java-driver-metrics-microprofile</artifactId>
76-
<version>4.18.0.3-SNAPSHOT</version>
76+
<version>4.18.1.0-SNAPSHOT</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>com.datastax.oss</groupId>

‎core-shaded/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>com.scylladb</groupId>
3030
<artifactId>java-driver-parent</artifactId>
31-
<version>4.18.0.3-SNAPSHOT</version>
31+
<version>4.18.1.0-SNAPSHOT</version>
3232
</parent>
3333
<artifactId>java-driver-core-shaded</artifactId>
3434
<name>Java driver for Scylla and Apache Cassandra(R) - core with shaded deps</name>

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>com.scylladb</groupId>
3030
<artifactId>java-driver-parent</artifactId>
31-
<version>4.18.0.3-SNAPSHOT</version>
31+
<version>4.18.1.0-SNAPSHOT</version>
3232
</parent>
3333
<artifactId>java-driver-core</artifactId>
3434
<packaging>bundle</packaging>

‎distribution-source/pom.xml‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing, software
15+
distributed under the License is distributed on an "AS IS" BASIS,
16+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
See the License for the specific language governing permissions and
18+
limitations under the License.
19+
20+
-->
21+
<!--
22+
Copyright (C) 2025 ScyllaDB
23+
24+
Modified by ScyllaDB
25+
-->
26+
<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/maven-v4_0_0.xsd">
27+
<modelVersion>4.0.0</modelVersion>
28+
<parent>
29+
<groupId>com.scylladb</groupId>
30+
<artifactId>java-driver-parent</artifactId>
31+
<version>4.18.1.0-SNAPSHOT</version>
32+
</parent>
33+
<artifactId>java-driver-distribution-source</artifactId>
34+
<packaging>pom</packaging>
35+
<name>Scylla Java Driver - source distribution</name>
36+
<build>
37+
<finalName>scylla-java-driver-${project.version}-source</finalName>
38+
<plugins>
39+
<plugin>
40+
<artifactId>maven-jar-plugin</artifactId>
41+
<!-- http://stackoverflow.com/questions/13218313/unable-to-disable-generation-of-empty-jar-maven-jar-plugin -->
42+
<executions>
43+
<execution>
44+
<id>default-jar</id>
45+
<phase>none</phase>
46+
</execution>
47+
</executions>
48+
</plugin>
49+
<plugin>
50+
<artifactId>maven-source-plugin</artifactId>
51+
<configuration>
52+
<skipSource>true</skipSource>
53+
</configuration>
54+
</plugin>
55+
<plugin>
56+
<artifactId>maven-install-plugin</artifactId>
57+
<configuration>
58+
<skip>true</skip>
59+
</configuration>
60+
</plugin>
61+
<plugin>
62+
<artifactId>maven-deploy-plugin</artifactId>
63+
<configuration>
64+
<skip>true</skip>
65+
</configuration>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.revapi</groupId>
69+
<artifactId>revapi-maven-plugin</artifactId>
70+
<configuration>
71+
<skip>true</skip>
72+
</configuration>
73+
</plugin>
74+
<plugin>
75+
<groupId>org.sonatype.plugins</groupId>
76+
<artifactId>nexus-staging-maven-plugin</artifactId>
77+
<configuration>
78+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
79+
</configuration>
80+
</plugin>
81+
</plugins>
82+
</build>
83+
<profiles>
84+
<profile>
85+
<id>release</id>
86+
<build>
87+
<plugins>
88+
<plugin>
89+
<artifactId>maven-assembly-plugin</artifactId>
90+
<executions>
91+
<execution>
92+
<id>assemble-source-tarball</id>
93+
<phase>package</phase>
94+
<goals>
95+
<goal>single</goal>
96+
</goals>
97+
</execution>
98+
</executions>
99+
<configuration>
100+
<appendAssemblyId>false</appendAssemblyId>
101+
<descriptors>
102+
<descriptor>src/assembly/source-tarball.xml</descriptor>
103+
</descriptors>
104+
<tarLongFileMode>posix</tarLongFileMode>
105+
</configuration>
106+
</plugin>
107+
<plugin>
108+
<groupId>net.nicoulaj.maven.plugins</groupId>
109+
<artifactId>checksum-maven-plugin</artifactId>
110+
<version>1.7</version>
111+
<executions>
112+
<execution>
113+
<goals>
114+
<goal>artifacts</goal>
115+
</goals>
116+
</execution>
117+
</executions>
118+
<configuration>
119+
<attachChecksums>true</attachChecksums>
120+
<algorithms>
121+
<algorithm>sha256</algorithm>
122+
<algorithm>sha512</algorithm>
123+
</algorithms>
124+
</configuration>
125+
</plugin>
126+
</plugins>
127+
</build>
128+
</profile>
129+
</profiles>
130+
</project>

‎distribution-tests/pom.xml‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing, software
15+
distributed under the License is distributed on an "AS IS" BASIS,
16+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
See the License for the specific language governing permissions and
18+
limitations under the License.
19+
20+
-->
21+
<!--
22+
Copyright (C) 2025 ScyllaDB
23+
24+
Modified by ScyllaDB
25+
-->
26+
<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/maven-v4_0_0.xsd">
27+
<modelVersion>4.0.0</modelVersion>
28+
<parent>
29+
<groupId>com.scylladb</groupId>
30+
<artifactId>java-driver-parent</artifactId>
31+
<version>4.18.1.0-SNAPSHOT</version>
32+
</parent>
33+
<artifactId>java-driver-distribution-tests</artifactId>
34+
<name>Scylla Java Driver - distribution tests</name>
35+
<dependencyManagement>
36+
<dependencies>
37+
<dependency>
38+
<groupId>${project.groupId}</groupId>
39+
<artifactId>java-driver-bom</artifactId>
40+
<version>${project.version}</version>
41+
<type>pom</type>
42+
<scope>import</scope>
43+
</dependency>
44+
</dependencies>
45+
</dependencyManagement>
46+
<dependencies>
47+
<dependency>
48+
<groupId>com.scylladb</groupId>
49+
<artifactId>java-driver-test-infra</artifactId>
50+
<scope>test</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>com.scylladb</groupId>
54+
<artifactId>java-driver-query-builder</artifactId>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.scylladb</groupId>
59+
<artifactId>java-driver-mapper-processor</artifactId>
60+
<scope>test</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.scylladb</groupId>
64+
<artifactId>java-driver-mapper-runtime</artifactId>
65+
<scope>test</scope>
66+
</dependency>
67+
<dependency>
68+
<groupId>com.scylladb</groupId>
69+
<artifactId>java-driver-core</artifactId>
70+
<scope>test</scope>
71+
</dependency>
72+
<dependency>
73+
<groupId>com.scylladb</groupId>
74+
<artifactId>java-driver-metrics-micrometer</artifactId>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>com.scylladb</groupId>
79+
<artifactId>java-driver-metrics-microprofile</artifactId>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>junit</groupId>
84+
<artifactId>junit</artifactId>
85+
<scope>test</scope>
86+
</dependency>
87+
</dependencies>
88+
<build>
89+
<plugins>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-surefire-plugin</artifactId>
93+
<configuration>
94+
<jvm>${testing.jvm}/bin/java</jvm>
95+
<argLine>${mockitoopens.argline}</argLine>
96+
<threadCount>1</threadCount>
97+
</configuration>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.revapi</groupId>
101+
<artifactId>revapi-maven-plugin</artifactId>
102+
<configuration>
103+
<skip>true</skip>
104+
</configuration>
105+
</plugin>
106+
<plugin>
107+
<artifactId>maven-install-plugin</artifactId>
108+
<configuration>
109+
<skip>true</skip>
110+
</configuration>
111+
</plugin>
112+
<plugin>
113+
<artifactId>maven-deploy-plugin</artifactId>
114+
<configuration>
115+
<skip>true</skip>
116+
</configuration>
117+
</plugin>
118+
<plugin>
119+
<groupId>org.sonatype.plugins</groupId>
120+
<artifactId>nexus-staging-maven-plugin</artifactId>
121+
<configuration>
122+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
123+
</configuration>
124+
</plugin>
125+
</plugins>
126+
</build>
127+
</project>

‎distribution/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>com.scylladb</groupId>
3030
<artifactId>java-driver-parent</artifactId>
31-
<version>4.18.0.3-SNAPSHOT</version>
31+
<version>4.18.1.0-SNAPSHOT</version>
3232
</parent>
3333
<artifactId>java-driver-distribution</artifactId>
3434
<!-- Should be pom but Javadoc generation requires a "classpath-capable" package -->

‎examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>java-driver-parent</artifactId>
3030
<groupId>com.scylladb</groupId>
31-
<version>4.18.0.3-SNAPSHOT</version>
31+
<version>4.18.1.0-SNAPSHOT</version>
3232
</parent>
3333
<artifactId>java-driver-examples</artifactId>
3434
<name>Java driver for Scylla and Apache Cassandra(R) - examples.</name>

0 commit comments

Comments
 (0)