Skip to content
This repository was archived by the owner on Oct 29, 2019. It is now read-only.

Commit c468852

Browse files
committed
Changed to newer httpclient and shaded it due to dependency corruption with Hyperium Client itself
1 parent b6c4fd0 commit c468852

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

pom.xml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>cc.hyperium.installer</groupId>
88
<artifactId>Installer</artifactId>
9-
<version>1.7</version>
9+
<version>1.8</version>
1010

1111
<properties>
1212
<kotlin.version>1.2.50</kotlin.version>
@@ -75,22 +75,26 @@
7575
</plugin>
7676
<plugin>
7777
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-assembly-plugin</artifactId>
79-
<version>2.6</version>
78+
<artifactId>maven-shade-plugin</artifactId>
79+
<version>3.2.1</version>
8080
<executions>
8181
<execution>
82-
<id>make-assembly</id>
8382
<phase>package</phase>
84-
<goals> <goal>single</goal> </goals>
83+
<goals>
84+
<goal>shade</goal>
85+
</goals>
8586
<configuration>
86-
<archive>
87-
<manifest>
87+
<transformers>
88+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
8889
<mainClass>cc.hyperium.installer.InstallerMain</mainClass>
89-
</manifest>
90-
</archive>
91-
<descriptorRefs>
92-
<descriptorRef>jar-with-dependencies</descriptorRef>
93-
</descriptorRefs>
90+
</transformer>
91+
</transformers>
92+
<relocations>
93+
<relocation>
94+
<pattern>org.apache.http</pattern>
95+
<shadedPattern>cc.hyperium.installer.utils.http</shadedPattern>
96+
</relocation>
97+
</relocations>
9498
</configuration>
9599
</execution>
96100
</executions>
@@ -125,7 +129,7 @@
125129
<dependency>
126130
<groupId>org.apache.httpcomponents</groupId>
127131
<artifactId>httpclient</artifactId>
128-
<version>4.3.3</version>
132+
<version>4.5.6</version>
129133
</dependency>
130134
<dependency>
131135
<groupId>com.google.code.gson</groupId>

0 commit comments

Comments
 (0)