Skip to content

Commit 9651cf5

Browse files
doom369doom369
committed
#556 changed assembly plugin with shade plugin and excluded maven folder from build.
1 parent 1bdd43f commit 9651cf5

File tree

6 files changed

+75
-83
lines changed

6 files changed

+75
-83
lines changed

‎client/pom.xml

+24-16
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,35 @@
1313

1414
<plugins>
1515
<plugin>
16-
<artifactId>maven-assembly-plugin</artifactId>
17-
<version>${maven.assembly.plugin.version}</version>
18-
<configuration>
19-
<finalName>client-${project.version}</finalName>
20-
<archive>
21-
<manifest>
22-
<mainClass>cc.blynk.client.ClientLauncher</mainClass>
23-
</manifest>
24-
</archive>
25-
<descriptorRefs>
26-
<descriptorRef>jar-with-dependencies</descriptorRef>
27-
</descriptorRefs>
28-
<appendAssemblyId>false</appendAssemblyId>
29-
</configuration>
16+
<groupId>org.apache.maven.plugins</groupId>
17+
<artifactId>maven-shade-plugin</artifactId>
18+
<version>${maven.shade.plugin.version}</version>
3019
<executions>
3120
<execution>
32-
<id>make-assembly</id>
3321
<phase>package</phase>
3422
<goals>
35-
<goal>single</goal>
23+
<goal>shade</goal>
3624
</goals>
25+
<configuration>
26+
<finalName>client-${project.version}</finalName>
27+
<transformers>
28+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
29+
<manifestEntries>
30+
<Main-Class>cc.blynk.client.ClientLauncher</Main-Class>
31+
<Build-Number>${project.version}</Build-Number>
32+
<Build-By>Blynk Inc.</Build-By>
33+
</manifestEntries>
34+
</transformer>
35+
</transformers>
36+
<filters>
37+
<filter>
38+
<artifact>*:*</artifact>
39+
<excludes>
40+
<exclude>META-INF/maven/**</exclude>
41+
</excludes>
42+
</filter>
43+
</filters>
44+
</configuration>
3745
</execution>
3846
</executions>
3947
</plugin>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<!-- maven plugins -->
139139
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
140140
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
141-
<maven.assembly.plugin.version>2.6</maven.assembly.plugin.version>
141+
<maven.shade.plugin.version>3.0.0</maven.shade.plugin.version>
142142
<maven.surefire.plugin.version>2.19.1</maven.surefire.plugin.version>
143143

144144
<!-- dependencies -->

‎server/launcher/pom.xml

+24-16
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,35 @@
1212
<build>
1313
<plugins>
1414
<plugin>
15-
<artifactId>maven-assembly-plugin</artifactId>
16-
<version>${maven.assembly.plugin.version}</version>
17-
<configuration>
18-
<finalName>server-${project.version}</finalName>
19-
<archive>
20-
<manifest>
21-
<mainClass>cc.blynk.server.launcher.ServerLauncher</mainClass>
22-
</manifest>
23-
</archive>
24-
<descriptorRefs>
25-
<descriptorRef>jar-with-dependencies</descriptorRef>
26-
</descriptorRefs>
27-
<appendAssemblyId>false</appendAssemblyId>
28-
</configuration>
15+
<groupId>org.apache.maven.plugins</groupId>
16+
<artifactId>maven-shade-plugin</artifactId>
17+
<version>${maven.shade.plugin.version}</version>
2918
<executions>
3019
<execution>
31-
<id>make-assembly</id>
3220
<phase>package</phase>
3321
<goals>
34-
<goal>single</goal>
22+
<goal>shade</goal>
3523
</goals>
24+
<configuration>
25+
<finalName>server-${project.version}</finalName>
26+
<transformers>
27+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
28+
<manifestEntries>
29+
<Main-Class>cc.blynk.server.launcher.ServerLauncher</Main-Class>
30+
<Build-Number>${project.version}</Build-Number>
31+
<Build-By>Blynk Inc.</Build-By>
32+
</manifestEntries>
33+
</transformer>
34+
</transformers>
35+
<filters>
36+
<filter>
37+
<artifact>*:*</artifact>
38+
<excludes>
39+
<exclude>META-INF/maven/**</exclude>
40+
</excludes>
41+
</filter>
42+
</filters>
43+
</configuration>
3644
</execution>
3745
</executions>
3846
</plugin>

‎server/launcher/src/main/java/cc/blynk/utils/JarUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ private static boolean isResource(String filename) {
102102
* @return server version
103103
*/
104104
public static String getServerVersion() {
105-
try (InputStream is = JarUtil.class.getResourceAsStream("/META-INF/maven/cc.blynk.server/launcher/pom.properties")) {
105+
try (InputStream is = JarUtil.class.getResourceAsStream("/META-INF/MANIFEST.MF")) {
106106
Properties properties = new Properties();
107107
properties.load(is);
108-
return properties.getProperty("version", "");
108+
return properties.getProperty("Build-Number", "");
109109
} catch (Exception e) {
110110
return "";
111111
}

‎server/launcher/src/main/resources/log4j2.xml

-32
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
</Policies>
3434
</RollingFile>
3535

36-
<!-- this is much quicker and simpler than below routing -->
3736
<RollingFile name="userLog" fileName="${sys:logs.folder}/blynk.log"
3837
filePattern="${sys:logs.folder}/archive/blynk.log.%d{yyyy-MM-dd}">
3938
<PatternLayout>
@@ -44,37 +43,6 @@
4443
</Policies>
4544
</RollingFile>
4645

47-
<!--
48-
<Routing name="userLog">
49-
<Routes pattern="$${ctx:user}">
50-
51-
<Route key="$${ctx:user}">
52-
<RollingFile name="default" fileName="${sys:logs.folder}/blynk.log"
53-
filePattern="${sys:logs.folder}/archive/blynk.log.%d{yyyy-MM-dd}">
54-
<PatternLayout>
55-
<pattern>%d{HH:mm:ss.SSS} %-5level - %msg%n</pattern>
56-
</PatternLayout>
57-
<Policies>
58-
<TimeBasedTriggeringPolicy/>
59-
</Policies>
60-
</RollingFile>
61-
</Route>
62-
63-
<Route>
64-
<RollingFile name="${ctx:user}" fileName="${sys:logs.folder}/users/${ctx:user}.log"
65-
filePattern="${sys:logs.folder}/users/archive/${ctx:user}.log.%d{yyyy-MM-dd}">
66-
<PatternLayout>
67-
<pattern>%d{yyyy-MM-dd} %d{HH:mm:ss.SSS} %-5level - %msg%n</pattern>
68-
</PatternLayout>
69-
<Policies>
70-
<TimeBasedTriggeringPolicy/>
71-
</Policies>
72-
</RollingFile>
73-
</Route>
74-
</Routes>
75-
</Routing>
76-
-->
77-
7846
</Appenders>
7947

8048
<Loggers>

‎server/tools/pom.xml

+24-16
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,35 @@
1414
<build>
1515
<plugins>
1616
<plugin>
17-
<artifactId>maven-assembly-plugin</artifactId>
18-
<version>${maven.assembly.plugin.version}</version>
19-
<configuration>
20-
<finalName>tools-${project.version}</finalName>
21-
<archive>
22-
<manifest>
23-
<mainClass>cc.blynk.server.tools.ReportingDataCleaner</mainClass>
24-
</manifest>
25-
</archive>
26-
<descriptorRefs>
27-
<descriptorRef>jar-with-dependencies</descriptorRef>
28-
</descriptorRefs>
29-
<appendAssemblyId>false</appendAssemblyId>
30-
</configuration>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-shade-plugin</artifactId>
19+
<version>${maven.shade.plugin.version}</version>
3120
<executions>
3221
<execution>
33-
<id>make-assembly</id>
3422
<phase>package</phase>
3523
<goals>
36-
<goal>single</goal>
24+
<goal>shade</goal>
3725
</goals>
26+
<configuration>
27+
<finalName>tools-${project.version}</finalName>
28+
<transformers>
29+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
30+
<manifestEntries>
31+
<Main-Class>cc.blynk.server.tools.ReportingDataCleaner</Main-Class>
32+
<Build-Number>${project.version}</Build-Number>
33+
<Build-By>Blynk Inc.</Build-By>
34+
</manifestEntries>
35+
</transformer>
36+
</transformers>
37+
<filters>
38+
<filter>
39+
<artifact>*:*</artifact>
40+
<excludes>
41+
<exclude>META-INF/maven/**</exclude>
42+
</excludes>
43+
</filter>
44+
</filters>
45+
</configuration>
3846
</execution>
3947
</executions>
4048
</plugin>

0 commit comments

Comments
 (0)