Skip to content

Commit 46817df

Browse files
author
Alexandre Dutra
committed
Format XML files
1 parent 0f0da29 commit 46817df

File tree

16 files changed

+77
-227
lines changed

16 files changed

+77
-227
lines changed

‎core-shaded/pom.xml

+7-42
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,13 @@
1818
-->
1919
<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">
2020
<modelVersion>4.0.0</modelVersion>
21-
2221
<parent>
2322
<groupId>com.datastax.oss</groupId>
2423
<artifactId>java-driver-parent</artifactId>
2524
<version>4.4.0-SNAPSHOT</version>
2625
</parent>
27-
2826
<artifactId>java-driver-core-shaded</artifactId>
29-
3027
<name>DataStax Java driver for Apache Cassandra(R) - core with shaded deps</name>
31-
3228
<dependencies>
3329
<!--
3430
Declare a dependency to the core driver itself so that all its classes get included;
@@ -94,15 +90,13 @@
9490
<artifactId>spotbugs-annotations</artifactId>
9591
</dependency>
9692
</dependencies>
97-
9893
<!--
9994
Generation of the shaded driver-core bundle during package phase:
10095
1) shade plugin shades the driver and creates a shaded jar + source jar
10196
2) dependency plugin unpacks the shaded jar to target/classes (and removes unwanted content)
10297
3) bundle plugin analyzes shaded classes and generates the bundle manifest
10398
4) assembly plugin re-creates the shaded jar by packing target/classes + manifest + shaded pom
10499
-->
105-
106100
<build>
107101
<plugins>
108102
<plugin>
@@ -176,10 +170,7 @@
176170
Exclude leftovers from the shading phase (this could also be done with a
177171
resource transformer by the shade plugin itself, but this way is more flexible).
178172
-->
179-
<excludes>
180-
META-INF/maven/com.datastax.oss/java-driver-core/**,
181-
META-INF/maven/io.netty/**,
182-
</excludes>
173+
<excludes>META-INF/maven/com.datastax.oss/java-driver-core/**, META-INF/maven/io.netty/**,</excludes>
183174
</configuration>
184175
</execution>
185176
<!-- Unpack shaded sources in order to run javadoc on them: -->
@@ -213,9 +204,7 @@
213204
</goals>
214205
<configuration>
215206
<sourcepath>${project.build.directory}/shaded-sources</sourcepath>
216-
<excludePackageNames>
217-
com.datastax.oss.driver.internal:com.datastax.oss.driver.shaded
218-
</excludePackageNames>
207+
<excludePackageNames>com.datastax.oss.driver.internal:com.datastax.oss.driver.shaded</excludePackageNames>
219208
<!--
220209
javadoc processes the shaded Netty sources (even though they're not included in the
221210
report), and will complain if it doesn't find JCTools classes.
@@ -255,54 +244,30 @@
255244
<!--
256245
1) Don't import packages shaded in the OSS driver, such as Netty (this excludes
257246
Guava, which resides in a separate bundle);
258-
-->
259-
!com.datastax.oss.driver.shaded.netty.*,
247+
-->!com.datastax.oss.driver.shaded.netty.*,
260248
<!--
261249
2) Don't include the packages below because they contain annotations only and are
262250
not required at runtime.
263-
-->
264-
!net.jcip.annotations.*,
265-
!edu.umd.cs.findbugs.annotations.*,
251+
-->!net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*,
266252
<!--
267253
3) Use resolution:=optional whenever possible in order to make it possible to use
268254
the OSS driver without such dependencies in an OSGi environment, as long as the
269255
application does not attempt to access their packages.
270256
Note: dependencies marked as optional are by default included with optional
271257
resolution in the manifest; we only need to manually set the resolution to
272258
optional for dependencies declared as non-optional in the pom files.
273-
-->
274-
jnr.*;resolution:=optional,
259+
-->jnr.*;resolution:=optional,
275260
<!--
276261
4) Don't import packages imported by shaded classes, if they are not used by the
277262
driver bundle.
278-
-->
279-
!com.google.protobuf.*,
280-
!com.jcraft.jzlib.*,
281-
!com.ning.compress.*,
282-
!lzma.sdk.*,
283-
!net.jpountz.xxhash.*,
284-
!org.bouncycastle.*,
285-
!org.conscrypt.*,
286-
!org.apache.commons.logging.*,
287-
!org.apache.log4j.*,
288-
!org.apache.logging.log4j.*,
289-
!org.eclipse.jetty.*,
290-
!org.jboss.marshalling.*,
291-
!sun.misc.*,
292-
!sun.security.*,
293-
!com.oracle.svm.core.annotate.*,
294-
*
263+
-->!com.google.protobuf.*, !com.jcraft.jzlib.*, !com.ning.compress.*, !lzma.sdk.*, !net.jpountz.xxhash.*, !org.bouncycastle.*, !org.conscrypt.*, !org.apache.commons.logging.*, !org.apache.log4j.*, !org.apache.logging.log4j.*, !org.eclipse.jetty.*, !org.jboss.marshalling.*, !sun.misc.*, !sun.security.*, !com.oracle.svm.core.annotate.*, *
295264
</Import-Package>
296265
<!--
297266
Export:
298267
1) The driver's packages (API and internal);
299268
2) All shaded packages, except Guava which resides in a separate bundle.
300269
-->
301-
<Export-Package>
302-
com.datastax.oss.driver.api.core.*,
303-
com.datastax.oss.driver.internal.core.*,
304-
com.datastax.oss.driver.shaded.netty.*,
305-
</Export-Package>
270+
<Export-Package>com.datastax.oss.driver.api.core.*, com.datastax.oss.driver.internal.core.*, com.datastax.oss.driver.shaded.netty.*,</Export-Package>
306271
</instructions>
307272
<rebuildBundle>true</rebuildBundle>
308273
</configuration>

‎core-shaded/src/assembly/shaded-jar.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright DataStax, Inc.
@@ -15,9 +16,7 @@
1516
limitations under the License.
1617
1718
-->
18-
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
19+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
2120
<id>shaded-jar</id>
2221
<formats>
2322
<format>jar</format>
@@ -41,4 +40,4 @@
4140
<destName>pom.xml</destName>
4241
</file>
4342
</files>
44-
</assembly>
43+
</assembly>

‎core/pom.xml

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright DataStax, Inc.
@@ -17,18 +18,14 @@
1718
-->
1819
<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">
1920
<modelVersion>4.0.0</modelVersion>
20-
2121
<parent>
2222
<groupId>com.datastax.oss</groupId>
2323
<artifactId>java-driver-parent</artifactId>
2424
<version>4.4.0-SNAPSHOT</version>
2525
</parent>
26-
2726
<artifactId>java-driver-core</artifactId>
2827
<packaging>bundle</packaging>
29-
3028
<name>DataStax Java driver for Apache Cassandra(R) - core</name>
31-
3229
<dependencies>
3330
<dependency>
3431
<groupId>com.datastax.oss</groupId>
@@ -130,7 +127,6 @@
130127
<scope>test</scope>
131128
</dependency>
132129
</dependencies>
133-
134130
<build>
135131
<resources>
136132
<resource>
@@ -197,23 +193,17 @@
197193
<!--
198194
1) Don't include the packages below because they contain annotations only and are
199195
not required at runtime.
200-
-->
201-
!net.jcip.annotations.*,
202-
!edu.umd.cs.findbugs.annotations.*,
196+
-->!net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*,
203197
<!--
204198
2) Use resolution:=optional for optional dependencies in order to make it possible
205199
to use the OSS driver without such dependencies in an OSGi environment, as long as
206200
the application does not attempt to access their packages.
207201
Note: dependencies marked as optional are by default included with optional
208202
resolution in the manifest; we only need to manually set the resolution to
209203
optional for dependencies declared as non-optional in the pom files.
210-
-->
211-
jnr.*;resolution:=optional,
212-
*
204+
-->jnr.*;resolution:=optional, *
213205
</Import-Package>
214-
<Export-Package>
215-
com.datastax.oss.driver.*.core.*
216-
</Export-Package>
206+
<Export-Package>com.datastax.oss.driver.*.core.*</Export-Package>
217207
</instructions>
218208
</configuration>
219209
</execution>

‎core/src/test/resources/logback-test.xml

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright DataStax, Inc.
@@ -16,14 +17,14 @@
1617
1718
-->
1819
<configuration>
19-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
20-
<encoder>
21-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
22-
</encoder>
23-
</appender>
24-
<root level="ERROR">
25-
<appender-ref ref="STDOUT"/>
26-
</root>
27-
<logger name="com.datastax.oss.driver" level= "${driverLevel:-WARN}"/>
28-
<logger name="com.datastax.oss.driver.internal.core.tracker.RequestLogger" level= "INFO"/>
29-
</configuration>
20+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
21+
<encoder>
22+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
23+
</encoder>
24+
</appender>
25+
<root level="ERROR">
26+
<appender-ref ref="STDOUT"/>
27+
</root>
28+
<logger name="com.datastax.oss.driver" level="${driverLevel:-WARN}"/>
29+
<logger name="com.datastax.oss.driver.internal.core.tracker.RequestLogger" level="INFO"/>
30+
</configuration>

‎distribution/pom.xml

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright DataStax, Inc.
@@ -17,19 +18,15 @@
1718
-->
1819
<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">
1920
<modelVersion>4.0.0</modelVersion>
20-
2121
<parent>
2222
<groupId>com.datastax.oss</groupId>
2323
<artifactId>java-driver-parent</artifactId>
2424
<version>4.4.0-SNAPSHOT</version>
2525
</parent>
26-
2726
<artifactId>java-driver-distribution</artifactId>
2827
<!-- Should be pom but Javadoc generation requires a "classpath-capable" package -->
2928
<packaging>jar</packaging>
30-
3129
<name>DataStax Java driver for Apache Cassandra(R) - binary distribution</name>
32-
3330
<!--
3431
These dependencies are only here to ensure proper build order and proper inclusion of binaries
3532
in the final tarball
@@ -56,7 +53,6 @@
5653
<version>${project.version}</version>
5754
</dependency>
5855
</dependencies>
59-
6056
<build>
6157
<finalName>datastax-java-driver-${project.version}</finalName>
6258
<plugins>
@@ -104,7 +100,6 @@
104100
</plugin>
105101
</plugins>
106102
</build>
107-
108103
<profiles>
109104
<profile>
110105
<id>release</id>
@@ -125,10 +120,8 @@
125120
</goals>
126121
<configuration>
127122
<includeDependencySources>true</includeDependencySources>
128-
<doctitle>DataStax Java driver for Apache Cassandra® ${project.version} API
129-
</doctitle>
130-
<windowtitle>DataStax Java driver for Apache Cassandra(R) ${project.version} API
131-
</windowtitle>
123+
<doctitle>DataStax Java driver for Apache Cassandra® ${project.version} API</doctitle>
124+
<windowtitle>DataStax Java driver for Apache Cassandra(R) ${project.version} API</windowtitle>
132125
</configuration>
133126
</execution>
134127
</executions>
@@ -156,4 +149,4 @@
156149
</build>
157150
</profile>
158151
</profiles>
159-
</project>
152+
</project>

‎distribution/src/assembly/binary-tarball.xml

+3-19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright DataStax, Inc.
@@ -15,17 +16,13 @@
1516
limitations under the License.
1617
1718
-->
18-
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
19+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
2120
<id>binary-tarball</id>
2221
<formats>
2322
<format>tar.gz</format>
2423
</formats>
2524
<includeBaseDirectory>true</includeBaseDirectory>
26-
2725
<moduleSets>
28-
2926
<!-- Module java-driver-core and its dependencies -->
3027
<moduleSet>
3128
<useAllReactorProjects>true</useAllReactorProjects>
@@ -50,7 +47,6 @@
5047
</dependencySets>
5148
</binaries>
5249
</moduleSet>
53-
5450
<!-- Module java-driver-query-builder and its dependencies -->
5551
<moduleSet>
5652
<useAllReactorProjects>true</useAllReactorProjects>
@@ -74,7 +70,6 @@
7470
</dependencySets>
7571
</binaries>
7672
</moduleSet>
77-
7873
<!--sources for all modules-->
7974
<moduleSet>
8075
<useAllReactorProjects>true</useAllReactorProjects>
@@ -85,24 +80,19 @@
8580
<binaries>
8681
<unpack>false</unpack>
8782
<attachmentClassifier>sources</attachmentClassifier>
88-
<outputFileNameMapping>${module.artifactId}-${module.version}-src.zip
89-
</outputFileNameMapping>
83+
<outputFileNameMapping>${module.artifactId}-${module.version}-src.zip</outputFileNameMapping>
9084
<outputDirectory>src</outputDirectory>
9185
<excludes>
9286
<exclude>*</exclude>
9387
</excludes>
9488
</binaries>
9589
</moduleSet>
96-
9790
</moduleSets>
98-
9991
<fileSets>
100-
10192
<fileSet>
10293
<directory>target/apidocs</directory>
10394
<outputDirectory>apidocs</outputDirectory>
10495
</fileSet>
105-
10696
<fileSet>
10797
<directory>..</directory>
10898
<outputDirectory>.</outputDirectory>
@@ -111,23 +101,17 @@
111101
<include>LICENSE*</include>
112102
</includes>
113103
</fileSet>
114-
115104
<fileSet>
116105
<directory>../changelog</directory>
117106
</fileSet>
118-
119107
<fileSet>
120108
<directory>../faq</directory>
121109
</fileSet>
122-
123110
<fileSet>
124111
<directory>../manual</directory>
125112
</fileSet>
126-
127113
<fileSet>
128114
<directory>../upgrade_guide</directory>
129115
</fileSet>
130-
131116
</fileSets>
132-
133117
</assembly>

0 commit comments

Comments
 (0)