Skip to content

Commit 55c2f02

Browse files
author
jacky
committed
factor to module
1 parent 787c384 commit 55c2f02

22 files changed

Lines changed: 162 additions & 271 deletions

File tree

‎assembly/pom.xml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>exejar</artifactId>
7+
<groupId>com.jk.exejar</groupId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>assembly</artifactId>
13+
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.boot</groupId>
18+
<artifactId>spring-boot-starter-web</artifactId>
19+
</dependency>
20+
</dependencies>
21+
<build>
22+
<plugins>
23+
<plugin>
24+
<groupId>org.apache.maven.plugins</groupId>
25+
<artifactId>maven-assembly-plugin</artifactId>
26+
<version>3.1.1</version>
27+
<configuration>
28+
<descriptors>
29+
<descriptor>src/assembly/distribution.xml</descriptor>
30+
</descriptors>
31+
</configuration>
32+
<executions>
33+
<execution>
34+
<id>make-assembly</id>
35+
<phase>package</phase>
36+
<goals>
37+
<goal>single</goal>
38+
</goals>
39+
<configuration>
40+
<descriptorRefs>
41+
<descriptorRef>jar-with-dependencies</descriptorRef>
42+
</descriptorRefs>
43+
<archive>
44+
<manifest>
45+
<mainClass>com.jk.exejar.assembly.Runner</mainClass>
46+
</manifest>
47+
</archive>
48+
</configuration>
49+
</execution>
50+
</executions>
51+
</plugin>
52+
</plugins>
53+
</build>
54+
</project>

src/assembly/distribution.xml renamed to assembly/src/assembly/distribution.xml

File renamed without changes.

‎assembly/src/main/java/com/jk/exejar/assembly/Runner.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.jk.exejar.assembly;
2+
3+
/**
4+
* created by jacky. 2020/2/7 11:46 AM
5+
*/
6+
public class Runner {
7+
8+
public static void main(String[] args) {
9+
System.out.println("assembly runner.");
10+
}
11+
}

src/main/resources/application.properties renamed to assembly/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
name=fromProperties
2+
confing.name=@config.name@
33
server.port=8080
44
server.servlet.context-path=/demo

‎config-beta.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config.name=beta

‎config-dev.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config.name=dev

‎pom-assembly.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<version>3.1.1</version>
4646
<configuration>
4747
<descriptors>
48-
<descriptor>src/assembly/distribution.xml</descriptor>
48+
<descriptor>assembly/assembly/distribution.xml</descriptor>
4949
</descriptors>
5050
</configuration>
5151
<executions>

‎pom-withRes.xml‎

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

‎pom.xml‎

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,49 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6+
<packaging>pom</packaging>
7+
<modules>
8+
<module>simple</module>
9+
<module>spring-boot</module>
10+
<module>with-deps</module>
11+
<module>with-deps-res</module>
12+
<module>assembly</module>
13+
</modules>
614
<parent>
715
<groupId>org.springframework.boot</groupId>
816
<artifactId>spring-boot-starter-parent</artifactId>
917
<version>2.1.4.RELEASE</version>
1018
<relativePath/> <!-- lookup parent from repository -->
1119
</parent>
12-
<groupId>com.jk.test.excutablejar</groupId>
13-
<artifactId>executejar</artifactId>
20+
<groupId>com.jk.exejar</groupId>
21+
<artifactId>exejar</artifactId>
1422
<version>1.0-SNAPSHOT</version>
1523

1624
<properties>
1725
<java.version>1.8</java.version>
1826
</properties>
1927

28+
<profiles>
29+
<profile>
30+
<id>dev</id>
31+
<build>
32+
<filters>
33+
<filter>../config-dev.properties</filter>
34+
</filters>
35+
</build>
36+
</profile>
37+
<profile>
38+
<id>beta</id>
39+
<build>
40+
<filters>
41+
<filter>../config-beta.properties</filter>
42+
</filters>
43+
</build>
44+
</profile>
45+
</profiles>
46+
2047
<dependencies>
21-
<dependency>
22-
<groupId>org.springframework.boot</groupId>
23-
<artifactId>spring-boot-starter-web</artifactId>
24-
</dependency>
48+
2549
<dependency>
2650
<groupId>com.alibaba</groupId>
2751
<artifactId>fastjson</artifactId>
@@ -38,35 +62,16 @@
3862
<target>${java.version}</target>
3963
</configuration>
4064
</plugin>
41-
4265
<plugin>
4366
<groupId>org.apache.maven.plugins</groupId>
44-
<artifactId>maven-assembly-plugin</artifactId>
45-
<version>3.1.1</version>
67+
<artifactId>maven-resources-plugin</artifactId>
4668
<configuration>
47-
<descriptors>
48-
<descriptor>src/assembly/distribution.xml</descriptor>
49-
</descriptors>
69+
<encoding>utf-8</encoding>
70+
<delimiters>
71+
<delimiter>@</delimiter>
72+
</delimiters>
73+
<useDefaultDelimiters>false</useDefaultDelimiters>
5074
</configuration>
51-
<executions>
52-
<execution>
53-
<id>make-assembly</id>
54-
<phase>package</phase>
55-
<goals>
56-
<goal>single</goal>
57-
</goals>
58-
<configuration>
59-
<descriptorRefs>
60-
<descriptorRef>jar-with-dependencies</descriptorRef>
61-
</descriptorRefs>
62-
<archive>
63-
<manifest>
64-
<mainClass>com.jk.test.excutablejar.WithDepRes</mainClass>
65-
</manifest>
66-
</archive>
67-
</configuration>
68-
</execution>
69-
</executions>
7075
</plugin>
7176

7277
</plugins>

pom-simple.xml renamed to simple/pom.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>exejar</artifactId>
7+
<groupId>com.jk.exejar</groupId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
510
<modelVersion>4.0.0</modelVersion>
611

7-
<groupId>com.jk.test.excutablejar</groupId>
8-
<artifactId>executejar</artifactId>
9-
<version>1.0-SNAPSHOT</version>
10-
<packaging>jar</packaging>
11-
<dependencies>
12-
<dependency>
13-
<groupId>com.alibaba</groupId>
14-
<artifactId>fastjson</artifactId>
15-
<version>1.2.47</version>
16-
</dependency>
17-
</dependencies>
12+
<artifactId>simple</artifactId>
1813
<build>
1914
<plugins>
2015
<plugin>
@@ -24,11 +19,12 @@
2419
<configuration>
2520
<archive>
2621
<manifest>
27-
<mainClass>com.jk.test.excutablejar.Simple</mainClass>
22+
<mainClass>com.jk.exejar.simple.Runner</mainClass>
2823
</manifest>
2924
</archive>
3025
</configuration>
3126
</plugin>
3227
</plugins>
3328
</build>
29+
3430
</project>

0 commit comments

Comments
 (0)