Skip to content

Commit b8e12d1

Browse files
chernserchernser
authored
Merge pull request #2426 from ClickHouse/fix_nightly
[repo] removed shaded jar for JDBC2 because it is included into clickhouse-jdbc
2 parents 4eff362 + 9eaa69f commit b8e12d1

File tree

3 files changed

+6
-243
lines changed

3 files changed

+6
-243
lines changed

‎clickhouse-jdbc/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
<configuration>
410410
<shadedArtifactAttached>true</shadedArtifactAttached>
411411
<createDependencyReducedPom>true</createDependencyReducedPom>
412-
<createSourcesJar>true</createSourcesJar>
412+
<!-- <createSourcesJar>true</createSourcesJar>-->
413413
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
414414
<shadedClassifierName>shaded</shadedClassifierName>
415415
<artifactSet>
@@ -471,7 +471,7 @@
471471
<configuration>
472472
<shadedArtifactAttached>true</shadedArtifactAttached>
473473
<createDependencyReducedPom>true</createDependencyReducedPom>
474-
<createSourcesJar>true</createSourcesJar>
474+
<!-- <createSourcesJar>true</createSourcesJar>-->
475475
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
476476
<shadedClassifierName>all</shadedClassifierName>
477477
<artifactSet>
@@ -562,7 +562,7 @@
562562
<configuration>
563563
<shadedArtifactAttached>true</shadedArtifactAttached>
564564
<createDependencyReducedPom>true</createDependencyReducedPom>
565-
<createSourcesJar>true</createSourcesJar>
565+
<!-- <createSourcesJar>true</createSourcesJar>-->
566566
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
567567
<shadedClassifierName>http</shadedClassifierName>
568568
<artifactSet>
@@ -610,7 +610,7 @@
610610
<configuration>
611611
<shadedArtifactAttached>false</shadedArtifactAttached>
612612
<createDependencyReducedPom>true</createDependencyReducedPom>
613-
<createSourcesJar>true</createSourcesJar>
613+
<!-- <createSourcesJar>true</createSourcesJar>-->
614614
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
615615
<shadedClassifierName>default</shadedClassifierName>
616616
<artifactSet>
@@ -654,7 +654,7 @@
654654
<configuration>
655655
<shadedArtifactAttached>true</shadedArtifactAttached>
656656
<createDependencyReducedPom>true</createDependencyReducedPom>
657-
<createSourcesJar>true</createSourcesJar>
657+
<!-- <createSourcesJar>true</createSourcesJar>-->
658658
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
659659
<shadedClassifierName>shaded-all</shadedClassifierName>
660660
<relocations>

‎jdbc-v2/pom.xml‎

Lines changed: 0 additions & 237 deletions
Original file line numberDiff line numberDiff line change
@@ -147,243 +147,6 @@
147147
</archive>
148148
</configuration>
149149
</plugin>
150-
<plugin>
151-
<groupId>org.apache.maven.plugins</groupId>
152-
<artifactId>maven-shade-plugin</artifactId>
153-
<executions>
154-
<!-- '-http' are minimal jars(without native libraries) for
155-
specific protocol; '-shaded' is a combination of '-cli' and '-http' with Apache http client;
156-
'-all' is fat for a reason as it includes everything we have ;) -->
157-
<execution>
158-
<id>shade</id>
159-
<phase>package</phase>
160-
<goals>
161-
<goal>shade</goal>
162-
</goals>
163-
<configuration>
164-
<shadedArtifactAttached>true</shadedArtifactAttached>
165-
<createDependencyReducedPom>true</createDependencyReducedPom>
166-
<createSourcesJar>true</createSourcesJar>
167-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
168-
<shadedClassifierName>shaded</shadedClassifierName>
169-
<artifactSet>
170-
<includes>
171-
<include>com.clickhouse:clickhouse-data</include>
172-
<include>com.clickhouse:client-v2</include>
173-
<include>com.clickhouse:clickhouse-http-client</include>
174-
<include>org.apache.httpcomponents.client5:httpclient5</include>
175-
<include>org.apache.httpcomponents.core5:httpcore5</include>
176-
<include>org.apache.httpcomponents.core5:httpcore5-h2</include>
177-
<include>org.lz4:lz4-java</include>
178-
</includes>
179-
</artifactSet>
180-
<relocations>
181-
<relocation>
182-
<pattern>org.apache</pattern>
183-
<shadedPattern>${shade.base}.apache</shadedPattern>
184-
</relocation>
185-
<relocation>
186-
<pattern>net.jpountz</pattern>
187-
<shadedPattern>${shade.base}.jpountz</shadedPattern>
188-
</relocation>
189-
</relocations>
190-
<transformers>
191-
<transformer
192-
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
193-
<transformer
194-
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
195-
<transformer
196-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
197-
<transformer
198-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
199-
<manifestEntries>
200-
<Automatic-Module-Name>${project.groupId}.jdbc</Automatic-Module-Name>
201-
<Specification-Title>${spec.title}</Specification-Title>
202-
<Specification-Version>${spec.version}</Specification-Version>
203-
</manifestEntries>
204-
</transformer>
205-
</transformers>
206-
<filters>
207-
<filter>
208-
<artifact>*:*</artifact>
209-
<excludes>
210-
<exclude>**/module-info.class</exclude>
211-
</excludes>
212-
</filter>
213-
</filters>
214-
</configuration>
215-
</execution>
216-
<execution>
217-
<id>shade-all</id>
218-
<phase>package</phase>
219-
<goals>
220-
<goal>shade</goal>
221-
</goals>
222-
<configuration>
223-
<shadedArtifactAttached>true</shadedArtifactAttached>
224-
<createDependencyReducedPom>true</createDependencyReducedPom>
225-
<createSourcesJar>true</createSourcesJar>
226-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
227-
<shadedClassifierName>all</shadedClassifierName>
228-
<relocations>
229-
<relocation>
230-
<pattern>org.slf4j</pattern>
231-
<shadedPattern>${shade.base}.org.slf4j</shadedPattern>
232-
</relocation>
233-
234-
<relocation>
235-
<pattern>org.apache</pattern>
236-
<shadedPattern>${shade.base}.org.apache</shadedPattern>
237-
</relocation>
238-
239-
<relocation>
240-
<!-- lz4 -->
241-
<pattern>net.jpountz</pattern>
242-
<shadedPattern>${shade.base}.net.jpountz.lz4</shadedPattern>
243-
</relocation>
244-
245-
<relocation>
246-
<pattern>org.ow2</pattern>
247-
<shadedPattern>${shade.base}.org.ow2</shadedPattern>
248-
</relocation>
249-
250-
<relocation>
251-
<pattern>com.fasterxml</pattern>
252-
<shadedPattern>${shade.base}.com.fasterxml</shadedPattern>
253-
</relocation>
254-
255-
<relocation>
256-
<pattern>org.roaringbitmap</pattern>
257-
<shadedPattern>${shade.base}.org.roaringbitmap</shadedPattern>
258-
</relocation>
259-
260-
<relocation>
261-
<pattern>org.objectweb</pattern>
262-
<shadedPattern>${shade.base}.org.objectweb</shadedPattern>
263-
</relocation>
264-
<relocation>
265-
<pattern>com.google</pattern>
266-
<shadedPattern>${shade.base}.com.google</shadedPattern>
267-
</relocation>
268-
</relocations>
269-
<transformers>
270-
<transformer
271-
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
272-
<transformer
273-
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
274-
<transformer
275-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
276-
<transformer
277-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
278-
<manifestEntries>
279-
<Automatic-Module-Name>${project.groupId}.jdbc</Automatic-Module-Name>
280-
<Specification-Title>${spec.title}</Specification-Title>
281-
<Specification-Version>${spec.version}</Specification-Version>
282-
</manifestEntries>
283-
</transformer>
284-
</transformers>
285-
<filters>
286-
<filter>
287-
<artifact>*:*</artifact>
288-
<excludes>
289-
<exclude>google/**</exclude>
290-
<exclude>org/checkerframework/**</exclude>
291-
<exclude>org/codehaus/**</exclude>
292-
<exclude>**/module-info.class</exclude>
293-
</excludes>
294-
</filter>
295-
</filters>
296-
</configuration>
297-
</execution>
298-
<execution>
299-
<id>shade-http</id>
300-
<phase>package</phase>
301-
<goals>
302-
<goal>shade</goal>
303-
</goals>
304-
<configuration>
305-
<shadedArtifactAttached>true</shadedArtifactAttached>
306-
<createDependencyReducedPom>true</createDependencyReducedPom>
307-
<createSourcesJar>true</createSourcesJar>
308-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
309-
<shadedClassifierName>http</shadedClassifierName>
310-
<artifactSet>
311-
<includes>
312-
<include>com.clickhouse:clickhouse-data</include>
313-
<include>com.clickhouse:client-v2</include>
314-
<include>com.clickhouse:clickhouse-http-client</include>
315-
<include>org.lz4:lz4-java</include>
316-
</includes>
317-
</artifactSet>
318-
<relocations>
319-
<relocation>
320-
<pattern>net.jpountz</pattern>
321-
<shadedPattern>${shade.base}.jpountz</shadedPattern>
322-
</relocation>
323-
</relocations>
324-
<transformers>
325-
<transformer
326-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
327-
<manifestEntries>
328-
<Automatic-Module-Name>${project.groupId}.jdbc</Automatic-Module-Name>
329-
<Specification-Title>${spec.title}</Specification-Title>
330-
<Specification-Version>${spec.version}</Specification-Version>
331-
</manifestEntries>
332-
</transformer>
333-
</transformers>
334-
<filters>
335-
<filter>
336-
<artifact>*:*</artifact>
337-
<excludes>
338-
<exclude>**/module-info.class</exclude>
339-
</excludes>
340-
</filter>
341-
</filters>
342-
</configuration>
343-
</execution>
344-
<execution>
345-
<id>shade-default</id>
346-
<phase>package</phase>
347-
<goals>
348-
<goal>shade</goal>
349-
</goals>
350-
<configuration>
351-
<shadedArtifactAttached>false</shadedArtifactAttached>
352-
<createDependencyReducedPom>true</createDependencyReducedPom>
353-
<createSourcesJar>true</createSourcesJar>
354-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
355-
<shadedClassifierName>default</shadedClassifierName>
356-
<artifactSet>
357-
<includes>
358-
<include>com.clickhouse:clickhouse-data</include>
359-
<include>com.clickhouse:client-v2</include>
360-
<include>com.clickhouse:clickhouse-http-client</include>
361-
</includes>
362-
</artifactSet>
363-
<transformers>
364-
<transformer
365-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
366-
<transformer
367-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
368-
<manifestEntries>
369-
<Automatic-Module-Name>${project.groupId}.jdbc</Automatic-Module-Name>
370-
<Specification-Title>${spec.title}</Specification-Title>
371-
<Specification-Version>${spec.version}</Specification-Version>
372-
</manifestEntries>
373-
</transformer>
374-
</transformers>
375-
<filters>
376-
<filter>
377-
<artifact>*:*</artifact>
378-
<excludes>
379-
<exclude>**/module-info.class</exclude>
380-
</excludes>
381-
</filter>
382-
</filters>
383-
</configuration>
384-
</execution>
385-
</executions>
386-
</plugin>
387150
<plugin>
388151
<groupId>org.codehaus.mojo</groupId>
389152
<artifactId>flatten-maven-plugin</artifactId>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@
954954
<execution>
955955
<id>attach-sources</id>
956956
<goals>
957-
<goal>jar-no-fork</goal>
957+
<goal>jar</goal>
958958
</goals>
959959
</execution>
960960
</executions>

0 commit comments

Comments
 (0)