Skip to content

Commit c0953b3

Browse files
dkropachevdkropachev
committed
pom: restructure all poms to make release work
New sonatype plugin and sonatype central has different requirements from old system. As result release proccess is broken in multiple steps. This commit address most of this problems doing the following: 1. Drop old sonatype plugin 2. Move module release skipping to the parent pom.xml 3. Populate missing fields in modules, like description 4. Move all deps version info to parent pom.xml DependencyManagement 5. Move all plugin version info to parent pom.xml PluginManagement
1 parent 83b041c commit c0953b3

File tree

16 files changed

+181
-233
lines changed

16 files changed

+181
-233
lines changed

‎bom/pom.xml‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -33,60 +33,6 @@
3333
<artifactId>java-driver-bom</artifactId>
3434
<packaging>pom</packaging>
3535
<name>Java driver for Scylla and Apache Cassandra(R) - Bill Of Materials</name>
36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>com.scylladb</groupId>
40-
<artifactId>java-driver-core</artifactId>
41-
<version>4.19.0.2-SNAPSHOT</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>com.scylladb</groupId>
45-
<artifactId>java-driver-core-shaded</artifactId>
46-
<version>4.19.0.2-SNAPSHOT</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>com.scylladb</groupId>
50-
<artifactId>java-driver-mapper-processor</artifactId>
51-
<version>4.19.0.2-SNAPSHOT</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>com.scylladb</groupId>
55-
<artifactId>java-driver-mapper-runtime</artifactId>
56-
<version>4.19.0.2-SNAPSHOT</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.scylladb</groupId>
60-
<artifactId>java-driver-query-builder</artifactId>
61-
<version>4.19.0.2-SNAPSHOT</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>com.scylladb</groupId>
65-
<artifactId>java-driver-guava-shaded</artifactId>
66-
<version>4.19.0.2-SNAPSHOT</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>com.scylladb</groupId>
70-
<artifactId>java-driver-test-infra</artifactId>
71-
<version>4.19.0.2-SNAPSHOT</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>com.scylladb</groupId>
75-
<artifactId>java-driver-metrics-micrometer</artifactId>
76-
<version>4.19.0.2-SNAPSHOT</version>
77-
</dependency>
78-
<dependency>
79-
<groupId>com.scylladb</groupId>
80-
<artifactId>java-driver-metrics-microprofile</artifactId>
81-
<version>4.19.0.2-SNAPSHOT</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>com.scylladb</groupId>
85-
<artifactId>native-protocol</artifactId>
86-
<version>1.5.2.1</version>
87-
</dependency>
88-
</dependencies>
89-
</dependencyManagement>
9036
<build>
9137
<plugins>
9238
<plugin>

‎core-shaded/pom.xml‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,16 @@
3232
</parent>
3333
<artifactId>java-driver-core-shaded</artifactId>
3434
<name>Java driver for Scylla and Apache Cassandra(R) - core with shaded deps</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>
35+
<description>Shaded distribution of the ScyllaDB Java Driver core module with relocated third-party dependencies.</description>
36+
<url>https://github.com/scylladb/java-driver</url>
37+
<licenses>
38+
<license>
39+
<name>Apache License, Version 2.0</name>
40+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
41+
<distribution>repo</distribution>
42+
<comments>Apache License Version 2.0</comments>
43+
</license>
44+
</licenses>
4645
<dependencies>
4746
<!--
4847
Declare a dependency to the core driver itself so that all its classes get included;
@@ -297,14 +296,29 @@
297296
-->
298297
<additionalDependencies>
299298
<additionalDependency>
300-
<groupId>org.jctools</groupId>
301-
<artifactId>jctools-core</artifactId>
302-
<version>4.0.5</version>
299+
<groupId>org.xerial.snappy</groupId>
300+
<artifactId>snappy-java</artifactId>
301+
<version>${snappy.version}</version>
302+
</additionalDependency>
303+
<additionalDependency>
304+
<groupId>org.lz4</groupId>
305+
<artifactId>lz4-java</artifactId>
306+
<version>${lz4.version}</version>
307+
</additionalDependency>
308+
<additionalDependency>
309+
<groupId>org.apache.tinkerpop</groupId>
310+
<artifactId>gremlin-core</artifactId>
311+
<version>${tinkerpop.version}</version>
312+
</additionalDependency>
313+
<additionalDependency>
314+
<groupId>org.apache.tinkerpop</groupId>
315+
<artifactId>tinkergraph-gremlin</artifactId>
316+
<version>${tinkerpop.version}</version>
303317
</additionalDependency>
304318
<additionalDependency>
305319
<groupId>com.esri.geometry</groupId>
306320
<artifactId>esri-geometry-api</artifactId>
307-
<version>2.2.4</version>
321+
<version>${esri.version}</version>
308322
</additionalDependency>
309323
</additionalDependencies>
310324
</configuration>

‎core/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@
3333
<artifactId>java-driver-core</artifactId>
3434
<packaging>bundle</packaging>
3535
<name>Java driver for Scylla and Apache Cassandra(R) - core</name>
36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>${project.groupId}</groupId>
40-
<artifactId>java-driver-bom</artifactId>
41-
<version>${project.version}</version>
42-
<type>pom</type>
43-
<scope>import</scope>
44-
</dependency>
45-
</dependencies>
46-
</dependencyManagement>
4736
<dependencies>
4837
<dependency>
4938
<groupId>com.scylladb</groupId>

‎distribution-source/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
<plugin>
101101
<groupId>net.nicoulaj.maven.plugins</groupId>
102102
<artifactId>checksum-maven-plugin</artifactId>
103-
<version>1.11</version>
104103
<executions>
105104
<execution>
106105
<goals>

‎distribution-tests/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@
3232
</parent>
3333
<artifactId>java-driver-distribution-tests</artifactId>
3434
<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>
4635
<dependencies>
4736
<dependency>
4837
<groupId>com.scylladb</groupId>

‎distribution/pom.xml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,37 +38,22 @@
3838
These dependencies are only here to ensure proper build order and proper inclusion of binaries
3939
in the final tarball
4040
-->
41-
<dependencyManagement>
42-
<dependencies>
43-
<dependency>
44-
<groupId>${project.groupId}</groupId>
45-
<artifactId>java-driver-bom</artifactId>
46-
<version>${project.version}</version>
47-
<type>pom</type>
48-
<scope>import</scope>
49-
</dependency>
50-
</dependencies>
51-
</dependencyManagement>
5241
<dependencies>
5342
<dependency>
54-
<groupId>${project.groupId}</groupId>
43+
<groupId>com.scylladb</groupId>
5544
<artifactId>java-driver-core</artifactId>
56-
<version>${project.version}</version>
5745
</dependency>
5846
<dependency>
59-
<groupId>${project.groupId}</groupId>
47+
<groupId>com.scylladb</groupId>
6048
<artifactId>java-driver-query-builder</artifactId>
61-
<version>${project.version}</version>
6249
</dependency>
6350
<dependency>
64-
<groupId>${project.groupId}</groupId>
51+
<groupId>com.scylladb</groupId>
6552
<artifactId>java-driver-mapper-runtime</artifactId>
66-
<version>${project.version}</version>
6753
</dependency>
6854
<dependency>
69-
<groupId>${project.groupId}</groupId>
55+
<groupId>com.scylladb</groupId>
7056
<artifactId>java-driver-mapper-processor</artifactId>
71-
<version>${project.version}</version>
7257
</dependency>
7358
</dependencies>
7459
<build>
@@ -112,7 +97,6 @@
11297
<plugin>
11398
<groupId>org.apache.maven.plugins</groupId>
11499
<artifactId>maven-gpg-plugin</artifactId>
115-
<version>3.2.8</version>
116100
<configuration>
117101
<skip>true</skip>
118102
</configuration>

‎examples/pom.xml‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,20 @@
3333
<artifactId>java-driver-examples</artifactId>
3434
<name>Java driver for Scylla and Apache Cassandra(R) - examples.</name>
3535
<description>A collection of examples to demonstrate Java Driver for Scylla and Apache Cassandra(R).</description>
36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>${project.groupId}</groupId>
40-
<artifactId>java-driver-bom</artifactId>
41-
<version>${project.version}</version>
42-
<type>pom</type>
43-
<scope>import</scope>
44-
</dependency>
45-
</dependencies>
46-
</dependencyManagement>
4736
<dependencies>
4837
<!-- driver dependencies -->
4938
<dependency>
50-
<groupId>${project.groupId}</groupId>
39+
<groupId>com.scylladb</groupId>
5140
<artifactId>java-driver-core</artifactId>
5241
</dependency>
5342
<dependency>
54-
<groupId>${project.groupId}</groupId>
43+
<groupId>com.scylladb</groupId>
5544
<artifactId>java-driver-query-builder</artifactId>
5645
</dependency>
5746
<dependency>
58-
<groupId>${project.groupId}</groupId>
47+
<groupId>com.scylladb</groupId>
5948
<artifactId>java-driver-mapper-runtime</artifactId>
49+
<scope>compile</scope>
6050
</dependency>
6151
<!-- Jackson -->
6252
<dependency>
@@ -166,6 +156,11 @@
166156
<artifactId>java-driver-mapper-processor</artifactId>
167157
<version>${project.version}</version>
168158
</path>
159+
<path>
160+
<groupId>com.scylladb</groupId>
161+
<artifactId>java-driver-mapper-runtime</artifactId>
162+
<version>${project.version}</version>
163+
</path>
169164
</annotationProcessorPaths>
170165
</configuration>
171166
</plugin>

‎integration-tests/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@
3939
<skipSerialITs>${skipITs}</skipSerialITs>
4040
<skipIsolatedITs>${skipITs}</skipIsolatedITs>
4141
</properties>
42-
<dependencyManagement>
43-
<dependencies>
44-
<dependency>
45-
<groupId>${project.groupId}</groupId>
46-
<artifactId>java-driver-bom</artifactId>
47-
<version>${project.version}</version>
48-
<type>pom</type>
49-
<scope>import</scope>
50-
</dependency>
51-
</dependencies>
52-
</dependencyManagement>
5342
<dependencies>
5443
<dependency>
5544
<groupId>com.scylladb</groupId>

‎mapper-processor/pom.xml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,25 @@
3232
</parent>
3333
<artifactId>java-driver-mapper-processor</artifactId>
3434
<name>Java driver for Scylla and Apache Cassandra(R) - object mapper processor</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>
35+
<description>Annotation processor that generates mapper implementations for the ScyllaDB Java Driver.</description>
36+
<url>https://github.com/scylladb/java-driver</url>
37+
<licenses>
38+
<license>
39+
<name>Apache License, Version 2.0</name>
40+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
41+
<distribution>repo</distribution>
42+
<comments>Apache License Version 2.0</comments>
43+
</license>
44+
</licenses>
4645
<dependencies>
46+
<dependency>
47+
<groupId>com.scylladb</groupId>
48+
<artifactId>java-driver-core</artifactId>
49+
</dependency>
4750
<dependency>
4851
<groupId>com.scylladb</groupId>
4952
<artifactId>java-driver-mapper-runtime</artifactId>
53+
<scope>compile</scope>
5054
</dependency>
5155
<dependency>
5256
<groupId>com.scylladb</groupId>

‎mapper-runtime/pom.xml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,13 @@
3333
<artifactId>java-driver-mapper-runtime</artifactId>
3434
<packaging>bundle</packaging>
3535
<name>Java driver for Scylla and Apache Cassandra(R) - object mapper runtime</name>
36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>${project.groupId}</groupId>
40-
<artifactId>java-driver-bom</artifactId>
41-
<version>${project.version}</version>
42-
<type>pom</type>
43-
<scope>import</scope>
44-
</dependency>
45-
</dependencies>
46-
</dependencyManagement>
4736
<dependencies>
4837
<dependency>
49-
<groupId>${project.groupId}</groupId>
38+
<groupId>com.scylladb</groupId>
5039
<artifactId>java-driver-core</artifactId>
5140
</dependency>
5241
<dependency>
53-
<groupId>${project.groupId}</groupId>
42+
<groupId>com.scylladb</groupId>
5443
<artifactId>java-driver-query-builder</artifactId>
5544
</dependency>
5645
<dependency>

0 commit comments

Comments
 (0)