Skip to content

Commit e068d42

Browse files
oldratleeoldratlee
committed
chore(pom): cleanup pom:
- remove dependency declaration in `dependencyManagement` when existed in `spring-boot-dependencies` - manage plugin versions in `pluginManagement` - remove default `org.apache.maven.plugins` groupId for plugins - use `maven.deploy.skip` property to simplify `maven-deploy-plugin` config
1 parent c41df73 commit e068d42

File tree

12 files changed

+194
-189
lines changed

12 files changed

+194
-189
lines changed

‎cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,25 @@
127127
<pluginManagement>
128128
<plugins>
129129
<plugin>
130-
<groupId>org.apache.maven.plugins</groupId>
131130
<artifactId>maven-source-plugin</artifactId>
132131
<version>3.2.1</version>
133132
</plugin>
134133
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136134
<artifactId>maven-resources-plugin</artifactId>
137-
<version>3.2.0</version>
135+
<version>3.3.0</version>
138136
</plugin>
139137
<plugin>
140-
<groupId>org.apache.maven.plugins</groupId>
141138
<artifactId>maven-compiler-plugin</artifactId>
142139
<version>3.10.1</version>
143140
</plugin>
141+
<plugin>
142+
<artifactId>maven-source-plugin</artifactId>
143+
<version>3.2.1</version>
144+
</plugin>
145+
<plugin>
146+
<artifactId>maven-javadoc-plugin</artifactId>
147+
<version>3.4.0</version>
148+
</plugin>
144149
<plugin>
145150
<artifactId>maven-deploy-plugin</artifactId>
146151
<configuration>

‎cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,25 @@
133133
<pluginManagement>
134134
<plugins>
135135
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137136
<artifactId>maven-source-plugin</artifactId>
138137
<version>3.2.1</version>
139138
</plugin>
140139
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142140
<artifactId>maven-resources-plugin</artifactId>
143-
<version>3.2.0</version>
141+
<version>3.3.0</version>
144142
</plugin>
145143
<plugin>
146-
<groupId>org.apache.maven.plugins</groupId>
147144
<artifactId>maven-compiler-plugin</artifactId>
148145
<version>3.10.1</version>
149146
</plugin>
147+
<plugin>
148+
<artifactId>maven-source-plugin</artifactId>
149+
<version>3.2.1</version>
150+
</plugin>
151+
<plugin>
152+
<artifactId>maven-javadoc-plugin</artifactId>
153+
<version>3.4.0</version>
154+
</plugin>
150155
<plugin>
151156
<artifactId>maven-deploy-plugin</artifactId>
152157
<configuration>

‎cola-archetypes/pom.xml‎

Lines changed: 72 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -71,37 +71,61 @@
7171
<version>3.2.1</version>
7272
</extension>
7373
</extensions>
74-
<plugins>
75-
<plugin>
76-
<artifactId>maven-archetype-plugin</artifactId>
77-
<version>3.2.1</version>
78-
</plugin>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-resources-plugin</artifactId>
82-
<version>3.3.0</version>
83-
</plugin>
84-
<plugin>
85-
<groupId>org.apache.maven.plugins</groupId>
86-
<artifactId>maven-compiler-plugin</artifactId>
87-
<version>3.10.1</version>
88-
</plugin>
89-
<plugin>
90-
<groupId>org.apache.maven.plugins</groupId>
91-
<artifactId>maven-jar-plugin</artifactId>
92-
<version>3.2.2</version>
93-
</plugin>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-surefire-plugin</artifactId>
97-
<version>2.22.2</version>
98-
</plugin>
99-
<plugin>
100-
<groupId>org.apache.maven.plugins</groupId>
101-
<artifactId>maven-deploy-plugin</artifactId>
102-
<version>3.0.0</version>
103-
</plugin>
104-
</plugins>
74+
<pluginManagement>
75+
<plugins>
76+
<plugin>
77+
<artifactId>maven-archetype-plugin</artifactId>
78+
<version>3.2.1</version>
79+
</plugin>
80+
<plugin>
81+
<artifactId>maven-resources-plugin</artifactId>
82+
<version>3.3.0</version>
83+
</plugin>
84+
<plugin>
85+
<artifactId>maven-compiler-plugin</artifactId>
86+
<version>3.10.1</version>
87+
</plugin>
88+
<plugin>
89+
<artifactId>maven-source-plugin</artifactId>
90+
<version>3.2.1</version>
91+
</plugin>
92+
<plugin>
93+
<artifactId>maven-javadoc-plugin</artifactId>
94+
<version>3.4.0</version>
95+
</plugin>
96+
<plugin>
97+
<artifactId>maven-gpg-plugin</artifactId>
98+
<version>3.0.1</version>
99+
</plugin>
100+
<plugin>
101+
<artifactId>maven-jar-plugin</artifactId>
102+
<version>3.2.2</version>
103+
</plugin>
104+
<plugin>
105+
<artifactId>maven-surefire-plugin</artifactId>
106+
<version>2.22.2</version>
107+
</plugin>
108+
<plugin>
109+
<artifactId>maven-deploy-plugin</artifactId>
110+
<version>3.0.0</version>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.sonatype.plugins</groupId>
114+
<artifactId>nexus-staging-maven-plugin</artifactId>
115+
<version>1.6.13</version>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.jacoco</groupId>
119+
<artifactId>jacoco-maven-plugin</artifactId>
120+
<version>0.8.8</version>
121+
</plugin>
122+
<plugin>
123+
<groupId>pl.project13.maven</groupId>
124+
<artifactId>git-commit-id-plugin</artifactId>
125+
<version>4.9.10</version>
126+
</plugin>
127+
</plugins>
128+
</pluginManagement>
105129
</build>
106130

107131
<distributionManagement>
@@ -113,7 +137,7 @@
113137

114138
<profiles>
115139
<profile>
116-
<id>gen-src+doc</id>
140+
<id>gen-java-src</id>
117141
<activation>
118142
<property>
119143
<name>performRelease</name>
@@ -123,9 +147,7 @@
123147
<build>
124148
<plugins>
125149
<plugin>
126-
<groupId>org.apache.maven.plugins</groupId>
127150
<artifactId>maven-source-plugin</artifactId>
128-
<version>3.2.1</version>
129151
<executions>
130152
<execution>
131153
<id>attach-sources</id>
@@ -135,10 +157,21 @@
135157
</execution>
136158
</executions>
137159
</plugin>
160+
</plugins>
161+
</build>
162+
</profile>
163+
<profile>
164+
<id>gen-java-doc</id>
165+
<activation>
166+
<property>
167+
<name>performRelease</name>
168+
<value>true</value>
169+
</property>
170+
</activation>
171+
<build>
172+
<plugins>
138173
<plugin>
139-
<groupId>org.apache.maven.plugins</groupId>
140174
<artifactId>maven-javadoc-plugin</artifactId>
141-
<version>3.4.0</version>
142175
<executions>
143176
<execution>
144177
<id>attach-javadoc</id>
@@ -175,9 +208,7 @@
175208
<build>
176209
<plugins>
177210
<plugin>
178-
<groupId>org.apache.maven.plugins</groupId>
179211
<artifactId>maven-gpg-plugin</artifactId>
180-
<version>3.0.1</version>
181212
<executions>
182213
<execution>
183214
<id>sign-artifacts</id>
@@ -209,7 +240,6 @@
209240
<plugin>
210241
<groupId>pl.project13.maven</groupId>
211242
<artifactId>git-commit-id-plugin</artifactId>
212-
<version>4.9.10</version>
213243
<executions>
214244
<execution>
215245
<id>get-the-git-infos</id>
@@ -234,7 +264,9 @@
234264
</validationProperty>
235265
</validationProperties>
236266
<generateGitPropertiesFile>true</generateGitPropertiesFile>
237-
<generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/scm/${project.groupId}/${project.artifactId}/git.properties</generateGitPropertiesFilename>
267+
<generateGitPropertiesFilename>
268+
${project.build.outputDirectory}/META-INF/scm/${project.groupId}/${project.artifactId}/git.properties
269+
</generateGitPropertiesFilename>
238270
</configuration>
239271
</plugin>
240272
</plugins>
@@ -255,9 +287,7 @@
255287
https://stackoverflow.com/a/18420462/922688
256288
-->
257289
<plugin>
258-
<groupId>org.apache.maven.plugins</groupId>
259290
<artifactId>maven-enforcer-plugin</artifactId>
260-
<version>3.1.0</version>
261291
<executions>
262292
<execution>
263293
<id>enforce-jdk-versions</id>
@@ -290,7 +320,6 @@
290320
<plugin>
291321
<groupId>org.sonatype.plugins</groupId>
292322
<artifactId>nexus-staging-maven-plugin</artifactId>
293-
<version>1.6.13</version>
294323
<extensions>true</extensions>
295324
<configuration>
296325
<serverId>ossrh</serverId>

‎cola-components/cola-components-bom/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
<build>
136136
<plugins>
137137
<plugin>
138-
<groupId>org.apache.maven.plugins</groupId>
139138
<artifactId>maven-gpg-plugin</artifactId>
140139
<version>3.0.1</version>
141140
<executions>

‎cola-components/dev-util-archetypes/cola-normal-component-archetype/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
<plugins>
2222
<plugin>
23-
<groupId>org.apache.maven.plugins</groupId>
2423
<artifactId>maven-source-plugin</artifactId>
2524
<version>3.0.1</version>
2625
<executions>
@@ -35,13 +34,11 @@
3534
</plugin>
3635

3736
<plugin>
38-
<groupId>org.apache.maven.plugins</groupId>
3937
<artifactId>maven-archetype-plugin</artifactId>
4038
<version>3.0.1</version>
4139
</plugin>
4240

4341
<plugin>
44-
<groupId>org.apache.maven.plugins</groupId>
4542
<artifactId>maven-resources-plugin</artifactId>
4643
<version>3.0.1</version>
4744
<configuration>

0 commit comments

Comments
 (0)