Skip to content

Commit de2c10e

Browse files
Amos09Amos09
Amos09
authored and
Amos09
committed
调整代码
1 parent 8c98dee commit de2c10e

File tree

124 files changed

+5023
-1713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+5023
-1713
lines changed

‎.flattened-pom.xml

Lines changed: 98 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,22 @@
1818
</license>
1919
</licenses>
2020
<modules>
21-
<module>saltyfish-boot-infrastructure</module>
2221
<module>saltyfish-boot-client</module>
22+
<module>saltyfish-boot-domain</module>
23+
<module>saltyfish-boot-integration</module>
24+
<module>saltyfish-boot-infrastructure</module>
2325
<module>saltyfish-boot-app</module>
2426
<module>saltyfish-boot-adapter</module>
2527
<module>saltyfish-boot-server</module>
26-
<module>saltyfish-boot-domain</module>
27-
<module>saltyfish-boot-integration</module>
2828
</modules>
29+
<properties>
30+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
31+
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<maven.compiler.source>${java.version}</maven.compiler.source>
34+
<maven.compiler.target>${java.version}</maven.compiler.target>
35+
<maven.plugin.version>3.8.1</maven.plugin.version>
36+
</properties>
2937
<build>
3038
<extensions>
3139
<extension>
@@ -43,7 +51,6 @@
4351
</plugin>
4452
<plugin>
4553
<artifactId>maven-compiler-plugin</artifactId>
46-
<version>3.8.0</version>
4754
<configuration>
4855
<source>${java.version}</source>
4956
<target>${java.version}</target>
@@ -58,46 +65,122 @@
5865
<artifactId>mapstruct-processor</artifactId>
5966
<version>${mapstruct.version}</version>
6067
</path>
68+
<path>
69+
<groupId>org.springframework.boot</groupId>
70+
<artifactId>spring-boot-configuration-processor</artifactId>
71+
<version>${spring-boot.version}</version>
72+
</path>
6173
</annotationProcessorPaths>
74+
<encoding>${project.build.sourceEncoding}</encoding>
75+
<source>${maven.compiler.source}</source>
76+
<target>${maven.compiler.target}</target>
6277
</configuration>
6378
</plugin>
6479
<plugin>
6580
<artifactId>maven-resources-plugin</artifactId>
6681
<configuration>
6782
<encoding>UTF-8</encoding>
83+
<includeEmptyDirs>true</includeEmptyDirs>
6884
</configuration>
6985
</plugin>
7086
<plugin>
71-
<artifactId>maven-clean-plugin</artifactId>
72-
<version>3.1.0</version>
87+
<groupId>io.spring.javaformat</groupId>
88+
<artifactId>spring-javaformat-maven-plugin</artifactId>
89+
<executions>
90+
<execution>
91+
<phase>validate</phase>
92+
<goals>
93+
<goal>validate</goal>
94+
</goals>
95+
<inherited>true</inherited>
96+
</execution>
97+
</executions>
7398
</plugin>
7499
<plugin>
75-
<artifactId>maven-resources-plugin</artifactId>
76-
<version>3.0.2</version>
100+
<artifactId>maven-surefire-plugin</artifactId>
101+
<configuration>
102+
<argLine>-Dfile.encoding=UTF-8</argLine>
103+
</configuration>
77104
</plugin>
78105
<plugin>
79-
<artifactId>maven-surefire-plugin</artifactId>
80-
<version>2.22.1</version>
106+
<groupId>org.codehaus.mojo</groupId>
107+
<artifactId>flatten-maven-plugin</artifactId>
108+
<executions>
109+
<execution>
110+
<id>flatten</id>
111+
<phase>process-resources</phase>
112+
<goals>
113+
<goal>flatten</goal>
114+
</goals>
115+
</execution>
116+
<execution>
117+
<id>flatten.clean</id>
118+
<phase>clean</phase>
119+
<goals>
120+
<goal>clean</goal>
121+
</goals>
122+
</execution>
123+
</executions>
124+
<configuration>
125+
<flattenMode>resolveCiFriendliesOnly</flattenMode>
126+
<updatePomFile>true</updatePomFile>
127+
</configuration>
128+
</plugin>
129+
<plugin>
130+
<groupId>com.rudikershaw.gitbuildhook</groupId>
131+
<artifactId>git-build-hook-maven-plugin</artifactId>
132+
<version>${git-build-hook-maven-plugin.version}</version>
133+
<executions>
134+
<execution>
135+
<goals>
136+
<goal>configure</goal>
137+
</goals>
138+
</execution>
139+
</executions>
140+
<inherited>false</inherited>
141+
<configuration>
142+
<gitConfig>
143+
<core.hooksPath>.etc/git-hooks/</core.hooksPath>
144+
</gitConfig>
145+
</configuration>
146+
</plugin>
147+
<plugin>
148+
<artifactId>maven-checkstyle-plugin</artifactId>
149+
<executions>
150+
<execution>
151+
<id>checkstyle-validation</id>
152+
<phase>validate</phase>
153+
<goals>
154+
<goal>check</goal>
155+
</goals>
156+
<configuration>
157+
<configLocation>.etc/checkstyle/checkstyle.xml</configLocation>
158+
<suppressionsLocation>.etc/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
159+
<consoleOutput>true</consoleOutput>
160+
<failsOnError>true</failsOnError>
161+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
162+
</configuration>
163+
</execution>
164+
</executions>
165+
<inherited>true</inherited>
166+
</plugin>
167+
<plugin>
168+
<artifactId>maven-clean-plugin</artifactId>
81169
</plugin>
82170
<plugin>
83171
<artifactId>maven-jar-plugin</artifactId>
84-
<version>3.0.2</version>
85172
</plugin>
86173
<plugin>
87174
<artifactId>maven-install-plugin</artifactId>
88-
<version>2.5.2</version>
89175
</plugin>
90176
<plugin>
91177
<artifactId>maven-deploy-plugin</artifactId>
92-
<version>2.8.2</version>
93178
</plugin>
94179
<plugin>
95180
<artifactId>maven-site-plugin</artifactId>
96-
<version>3.7.1</version>
97181
</plugin>
98182
<plugin>
99183
<artifactId>maven-project-info-reports-plugin</artifactId>
100-
<version>3.0.0</version>
101184
</plugin>
102185
</plugins>
103186
</pluginManagement>

‎archetype/pom.xml

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
6-
<groupId>com.saltyfish</groupId>
7-
<artifactId>saltyfish-boot-archetype-archetype</artifactId>
8-
<version>1.0.0</version>
9-
<packaging>maven-archetype</packaging>
10-
<name>saltyfish-boot-archetype-archetype</name>
11-
<description>saltyfish项目基础功能组件库</description>
12-
13-
<build>
14-
<extensions>
15-
<extension>
16-
<groupId>org.apache.maven.archetype</groupId>
17-
<artifactId>archetype-packaging</artifactId>
18-
<version>3.1.1</version>
19-
</extension>
20-
</extensions>
21-
22-
<pluginManagement>
23-
<plugins>
24-
<plugin>
25-
<artifactId>maven-archetype-plugin</artifactId>
26-
<version>3.1.1</version>
27-
</plugin>
28-
</plugins>
29-
</pluginManagement>
30-
</build>
31-
32-
33-
<developers>
34-
<developer>
35-
<name>番薯(Amos09)</name>
36-
<email>[email protected]</email>
37-
</developer>
38-
</developers>
39-
40-
<licenses>
41-
<license>
42-
<name>Apache License, Version 2.0</name>
43-
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
44-
</license>
45-
</licenses>
46-
47-
<distributionManagement>
48-
<repository>
49-
<id>ossrh</id>
50-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
51-
</repository>
52-
<snapshotRepository>
53-
<id>ossrh</id>
54-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
55-
</snapshotRepository>
56-
</distributionManagement>
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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>com.saltyfish</groupId>
6+
<artifactId>saltyfish-boot-archetype-archetype</artifactId>
7+
<version>1.0.0</version>
8+
<packaging>maven-archetype</packaging>
9+
10+
<name>saltyfish-boot-archetype-archetype</name>
11+
12+
<build>
13+
<extensions>
14+
<extension>
15+
<groupId>org.apache.maven.archetype</groupId>
16+
<artifactId>archetype-packaging</artifactId>
17+
<version>3.1.1</version>
18+
</extension>
19+
</extensions>
20+
21+
<pluginManagement>
22+
<plugins>
23+
<plugin>
24+
<artifactId>maven-archetype-plugin</artifactId>
25+
<version>3.1.1</version>
26+
</plugin>
27+
</plugins>
28+
</pluginManagement>
29+
</build>
30+
31+
<description>saltyfish项目基础功能组件库</description>
32+
33+
<developers>
34+
<developer>
35+
<name>番薯(Amos09)</name>
36+
<email>[email protected]</email>
37+
</developer>
38+
</developers>
39+
40+
<licenses>
41+
<license>
42+
<name>Apache License, Version 2.0</name>
43+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
44+
</license>
45+
</licenses>
46+
47+
<distributionManagement>
48+
<repository>
49+
<id>ossrh</id>
50+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
51+
</repository>
52+
<snapshotRepository>
53+
<id>ossrh</id>
54+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
55+
</snapshotRepository>
56+
</distributionManagement>
5757
</project>

0 commit comments

Comments
 (0)