Skip to content

Commit 2c69f82

Browse files
committed
Merge remote-tracking branch 'github/release-please--branches--master'
1 parent 632f634 commit 2c69f82

1 file changed

Lines changed: 8 additions & 15 deletions

File tree

pom.xml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

75
<groupId>com.da</groupId>
86
<artifactId>crystal-report-server-java</artifactId>
9-
<version>1.1.1</version>
7+
<version>1.1.1-SNAPSHOT</version>
108
<name>crystal-report-server-java</name>
119
<description>An Crystal Report Server for java</description>
1210

@@ -27,7 +25,7 @@
2725
<name>Robert Huang</name>
2826
<email>56649783@qq.com</email>
2927
<organization>Dedienne Aerospace China ZhuHai</organization>
30-
<organizationUrl />
28+
<organizationUrl/>
3129
</developer>
3230
</developers>
3331

@@ -337,8 +335,7 @@
337335
</goals>
338336
<configuration>
339337
<target>
340-
<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
341-
tofile="${project.build.directory}/${project.artifactId}.jar" />
338+
<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" tofile="${project.build.directory}/${project.artifactId}.jar"/>
342339
</target>
343340
</configuration>
344341
</execution>
@@ -380,8 +377,7 @@
380377
</filter>
381378
</filters>
382379
<transformers>
383-
<transformer
384-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
380+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
385381
<manifestEntries>
386382
<Main-Class>com.da.crystal.report.VertxApp</Main-Class>
387383
<!-- for <scope>system</scope>, Must keep it for the fat jar -->
@@ -403,12 +399,9 @@
403399
</Class-Path>
404400
</manifestEntries>
405401
</transformer>
406-
<transformer
407-
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
408-
<transformer
409-
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
410-
<transformer
411-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
402+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
403+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
404+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
412405
</transformers>
413406
<outputFile>
414407
${project.build.directory}/${project.artifactId}-fat.jar

0 commit comments

Comments
 (0)