Skip to content

Commit 24723df

Browse files
adutraadutra
authored
Merge pull request apache#851 from datastax/java1411
JAVA-1266 & JAVA-1411: Stop using oss-parent and normalize versions across the build
2 parents e38c210 + e157033 commit 24723df

12 files changed

Lines changed: 1224 additions & 1059 deletions

File tree

‎ci/appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ platform: x64
99
install:
1010
- ps: .\ci\appveyor.ps1
1111
build_script:
12-
- "set \"JAVA_HOME=%JAVA_8_HOME%\" && mvn install -DskipTests=true -D\"maven.javadoc.skip\"=true -B -V"
12+
- "set \"JAVA_HOME=%JAVA_8_HOME%\" && mvn install -DskipTests=true -B -V"
1313
test_script:
14-
- "set \"JAVA_HOME=%JAVA_PLATFORM_HOME%\" && mvn -B -D\"ccm.java.home\"=\"%JAVA_8_HOME%\" -D\"ccm.maxNumberOfNodes\"=1 -D\"cassandra.version\"=%cassandra_version% test -P %test_profile%"
14+
- "set \"JAVA_HOME=%JAVA_PLATFORM_HOME%\" && mvn -B -D\"ccm.java.home\"=\"%JAVA_8_HOME%\" -D\"ccm.maxNumberOfNodes\"=1 -D\"cassandra.version\"=%cassandra_version% verify -P %test_profile%"
1515
on_finish:
1616
- ps: .\ci\uploadtests.ps1
1717
cache:

‎driver-core/pom.xml‎

Lines changed: 93 additions & 159 deletions
Large diffs are not rendered by default.

‎driver-dist/pom.xml‎

Lines changed: 73 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,83 +16,48 @@
1616
1717
-->
1818
<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">
19+
1920
<modelVersion>4.0.0</modelVersion>
21+
2022
<parent>
2123
<groupId>com.datastax.cassandra</groupId>
2224
<artifactId>cassandra-driver-parent</artifactId>
23-
<version>3.2.1-SNAPSHOT</version>
25+
<version>3.3.0-SNAPSHOT</version>
2426
</parent>
25-
<artifactId>cassandra-driver-dist</artifactId>
2627

28+
<artifactId>cassandra-driver-dist</artifactId>
2729
<!-- Should be pom but Javadoc generation requires a "classpath-capable" package -->
2830
<packaging>jar</packaging>
29-
3031
<name>DataStax Java Driver for Apache Cassandra - Binary distribution</name>
3132

32-
<!-- These dependencies are only here to ensure proper build order -->
33+
<!-- These dependencies are only here to ensure proper build order and proper inclusion of binaries in the final tarball -->
3334
<dependencies>
35+
3436
<dependency>
3537
<groupId>com.datastax.cassandra</groupId>
3638
<artifactId>cassandra-driver-core</artifactId>
37-
<version>${project.parent.version}</version>
3839
</dependency>
3940

4041
<dependency>
4142
<groupId>com.datastax.cassandra</groupId>
4243
<artifactId>cassandra-driver-mapping</artifactId>
43-
<version>${project.parent.version}</version>
4444
</dependency>
4545

4646
<dependency>
4747
<groupId>com.datastax.cassandra</groupId>
4848
<artifactId>cassandra-driver-extras</artifactId>
49-
<version>${project.parent.version}</version>
5049
</dependency>
5150

5251
</dependencies>
5352

5453
<build>
54+
5555
<finalName>cassandra-java-driver-${project.version}</finalName>
56+
5657
<plugins>
57-
<plugin>
58-
<artifactId>maven-javadoc-plugin</artifactId>
59-
<version>2.9.1</version>
60-
<executions>
61-
<execution>
62-
<id>dependencies-javadoc</id>
63-
<phase>package</phase>
64-
<goals>
65-
<goal>jar</goal>
66-
</goals>
67-
<configuration>
68-
<includeDependencySources>true</includeDependencySources>
69-
</configuration>
70-
</execution>
71-
</executions>
72-
</plugin>
73-
<plugin>
74-
<artifactId>maven-assembly-plugin</artifactId>
75-
<version>3.0.0</version>
76-
<executions>
77-
<execution>
78-
<id>assemble-binary-tarball</id>
79-
<phase>package</phase>
80-
<goals>
81-
<goal>single</goal>
82-
</goals>
83-
</execution>
84-
</executions>
85-
<configuration>
86-
<appendAssemblyId>false</appendAssemblyId>
87-
<descriptors>
88-
<descriptor>src/assembly/binary-tarball.xml</descriptor>
89-
</descriptors>
90-
<tarLongFileMode>posix</tarLongFileMode>
91-
</configuration>
92-
</plugin>
58+
9359
<plugin>
9460
<artifactId>maven-jar-plugin</artifactId>
95-
<version>3.0.2</version>
9661
<!-- http://stackoverflow.com/questions/13218313/unable-to-disable-generation-of-empty-jar-maven-jar-plugin -->
9762
<executions>
9863
<execution>
@@ -101,24 +66,84 @@
10166
</execution>
10267
</executions>
10368
</plugin>
69+
70+
<plugin>
71+
<artifactId>maven-source-plugin</artifactId>
72+
<configuration>
73+
<skipSource>true</skipSource>
74+
</configuration>
75+
</plugin>
76+
10477
<plugin>
105-
<groupId>org.apache.maven.plugins</groupId>
10678
<artifactId>maven-install-plugin</artifactId>
107-
<version>2.5.1</version>
10879
<configuration>
10980
<skip>true</skip>
11081
</configuration>
11182
</plugin>
83+
11284
<plugin>
113-
<groupId>org.apache.maven.plugins</groupId>
11485
<artifactId>maven-deploy-plugin</artifactId>
115-
<version>2.8.1</version>
11686
<configuration>
11787
<skip>true</skip>
11888
</configuration>
11989
</plugin>
90+
12091
</plugins>
92+
12193
</build>
12294

95+
<profiles>
96+
97+
<profile>
98+
<id>release</id>
99+
<build>
100+
<plugins>
101+
<plugin>
102+
<artifactId>maven-javadoc-plugin</artifactId>
103+
<executions>
104+
<execution>
105+
<id>dependencies-javadoc</id>
106+
<phase>package</phase>
107+
<goals>
108+
<goal>jar</goal>
109+
</goals>
110+
<configuration>
111+
<includeDependencySources>true</includeDependencySources>
112+
</configuration>
113+
</execution>
114+
</executions>
115+
</plugin>
116+
<plugin>
117+
<artifactId>maven-assembly-plugin</artifactId>
118+
<executions>
119+
<execution>
120+
<id>assemble-binary-tarball</id>
121+
<phase>package</phase>
122+
<goals>
123+
<goal>single</goal>
124+
</goals>
125+
</execution>
126+
</executions>
127+
<configuration>
128+
<appendAssemblyId>false</appendAssemblyId>
129+
<descriptors>
130+
<descriptor>src/assembly/binary-tarball.xml</descriptor>
131+
</descriptors>
132+
<tarLongFileMode>posix</tarLongFileMode>
133+
</configuration>
134+
</plugin>
135+
<plugin>
136+
<groupId>org.sonatype.plugins</groupId>
137+
<artifactId>nexus-staging-maven-plugin</artifactId>
138+
<configuration>
139+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
140+
</configuration>
141+
</plugin>
142+
</plugins>
143+
</build>
144+
</profile>
145+
146+
</profiles>
147+
123148
</project>
124149

‎driver-dist/src/assembly/binary-tarball.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@
6767
<exclude>com.datastax.cassandra:cassandra-driver-core</exclude>
6868
<exclude>com.datastax.cassandra:cassandra-driver-mapping</exclude>
6969
<exclude>com.datastax.cassandra:cassandra-driver-extras</exclude>
70+
<!-- already included in lib/core -->
71+
<exclude>com.google.guava:guava</exclude>
72+
<exclude>org.slf4j:slf4j-api</exclude>
7073
</excludes>
7174
<useTransitiveFiltering>true</useTransitiveFiltering>
7275
</dependencySet>
7376
</dependencySets>
7477
</binaries>
7578
</moduleSet>
7679

77-
<!-- dependencies of module cassandra:cassandra-driver-extras -->
80+
<!-- dependencies of module cassandra-driver-extras -->
7881
<moduleSet>
7982
<useAllReactorProjects>true</useAllReactorProjects>
8083
<includes>
@@ -92,6 +95,7 @@
9295
<exclude>com.datastax.cassandra:cassandra-driver-extras</exclude>
9396
<!-- already included in lib/core -->
9497
<exclude>com.google.guava:guava</exclude>
98+
<exclude>org.slf4j:slf4j-api</exclude>
9599
</excludes>
96100
<useTransitiveFiltering>true</useTransitiveFiltering>
97101
</dependencySet>

0 commit comments

Comments
 (0)