Skip to content

Commit 4c73a0b

Browse files
committed
simplify generate executable-jar
1 parent a1efa10 commit 4c73a0b

File tree

2 files changed

+29
-62
lines changed

2 files changed

+29
-62
lines changed

pom.xml

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@
6767
<target>${java.version}</target>
6868
<testSource>${java.version}</testSource>
6969
<testTarget>${java.version}</testTarget>
70-
<!--
71-
<compilerArgs>
72-
<arg>-Werror</arg>
73-
<arg>-Xlint:all</arg>
74-
<arg>-Xlint:-processing</arg>
75-
<arg>-Xlint:-serial</arg>
76-
<arg>-Xmaxerrs</arg>
77-
<arg>20</arg>
78-
<arg>-XprintProcessorInfo</arg>
79-
<arg>-XprintRounds</arg>
80-
</compilerArgs>
81-
-->
70+
<!--
71+
<compilerArgs>
72+
<arg>-Werror</arg>
73+
<arg>-Xlint:all</arg>
74+
<arg>-Xlint:-processing</arg>
75+
<arg>-Xlint:-serial</arg>
76+
<arg>-Xmaxerrs</arg>
77+
<arg>20</arg>
78+
<arg>-XprintProcessorInfo</arg>
79+
<arg>-XprintRounds</arg>
80+
</compilerArgs>
81+
-->
8282
<showWarnings>true</showWarnings>
8383
</configuration>
8484
</plugin>
@@ -93,8 +93,18 @@
9393
<plugin>
9494
<artifactId>maven-assembly-plugin</artifactId>
9595
<version>2.6</version>
96+
<executions>
97+
<execution>
98+
<phase>package</phase>
99+
<goals>
100+
<goal>single</goal>
101+
</goals>
102+
</execution>
103+
</executions>
96104
<configuration>
97-
<descriptor>src/main/assembly/test-jar-with-dependencies.xml</descriptor>
105+
<descriptorRefs>
106+
<descriptorRef>jar-with-dependencies</descriptorRef>
107+
</descriptorRefs>
98108
<archive>
99109
<manifest>
100110
<mainClass>JCurl</mainClass>
@@ -109,14 +119,6 @@
109119
</archive>
110120
<outputDirectory>${project.basedir}/target</outputDirectory>
111121
</configuration>
112-
<executions>
113-
<execution>
114-
<phase>package</phase>
115-
<goals>
116-
<goal>assembly</goal>
117-
</goals>
118-
</execution>
119-
</executions>
120122
</plugin>
121123
</plugins>
122124
</build>
@@ -352,12 +354,12 @@
352354
<scope>test</scope>
353355
</dependency>
354356
<dependency>
355-
<!--
356-
<groupId>com.github.tomakehurst</groupId>
357-
<artifactId>wiremock</artifactId>
358-
<version>2.27.2</version>
359-
<scope>test</scope>
360-
-->
357+
<!--
358+
<groupId>com.github.tomakehurst</groupId>
359+
<artifactId>wiremock</artifactId>
360+
<version>2.27.2</version>
361+
<scope>test</scope>
362+
-->
361363
<groupId>com.github.tomakehurst</groupId>
362364
<artifactId>wiremock-jre8</artifactId>
363365
<version>2.33.2</version>

src/main/assembly/test-jar-with-dependencies.xml

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)