Skip to content

Commit 62ead60

Browse files
hohwillehohwille
authored
devonfw#177: updated parent devonfw#118: avoid redundancies (devonfw#179)
1 parent 229f851 commit 62ead60

File tree

3 files changed

+79
-87
lines changed

3 files changed

+79
-87
lines changed

‎LICENSE.txt ‎LICENSE

File renamed without changes.

‎pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
<parent>
66
<groupId>com.devonfw</groupId>
77
<artifactId>maven-parent</artifactId>
8-
<version>1</version>
8+
<version>2</version>
99
</parent>
1010
<groupId>com.devonfw.java.dev</groupId>
1111
<artifactId>devon4j</artifactId>
1212
<version>dev-SNAPSHOT</version> <!-- This POM will never be released -->
1313
<packaging>pom</packaging>
1414
<name>${project.artifactId}</name>
1515
<description>Java stack of devonfw.com (devon4j): develop Java apps standardized, faster and with less risk.</description>
16-
<url>http://www.devonfw.com/devon4j/</url>
1716
<inceptionYear>2014</inceptionYear>
1817

1918
<modules>
@@ -27,6 +26,8 @@
2726
<properties>
2827
<revision>dev</revision>
2928
<changelist>-SNAPSHOT</changelist>
29+
<github.repository>devon4j</github.repository>
30+
<github.default.branch>develop</github.default.branch>
3031
<devon4j.version>${revision}${changelist}</devon4j.version>
3132
<spring.boot.version>2.1.9.RELEASE</spring.boot.version>
3233
<jackson.version>2.9.9.20190727</jackson.version> <!-- Overriding Jackson for fixing vulnerabilities -->

‎templates/server/src/main/resources/archetype-resources/pom.xml

+76-85
Original file line numberDiff line numberDiff line change
@@ -128,92 +128,91 @@
128128
<plugin>
129129
<groupId>org.apache.maven.plugins</groupId>
130130
<artifactId>maven-resources-plugin</artifactId>
131-
<version>3.0.2</version>
131+
<version>$[maven.resources.plugin.version]</version>
132132
</plugin>
133133
<plugin>
134134
<groupId>org.apache.maven.plugins</groupId>
135135
<artifactId>maven-compiler-plugin</artifactId>
136-
<version>3.7.0</version>
136+
<version>$[maven.compiler.plugin.version]</version>
137137
</plugin>
138138
<plugin>
139139
<groupId>org.apache.maven.plugins</groupId>
140140
<artifactId>maven-install-plugin</artifactId>
141-
<version>2.5.2</version>
141+
<version>$[maven.install.plugin.version]</version>
142142
</plugin>
143143
<plugin>
144144
<groupId>org.apache.maven.plugins</groupId>
145145
<artifactId>maven-deploy-plugin</artifactId>
146-
<version>2.8.2</version>
146+
<version>$[maven.deploy.plugin.version]</version>
147147
</plugin>
148148
<plugin>
149149
<groupId>org.apache.maven.plugins</groupId>
150150
<artifactId>maven-clean-plugin</artifactId>
151-
<version>3.0.0</version>
151+
<version>$[maven.clean.plugin.version]</version>
152152
</plugin>
153153
<plugin>
154154
<groupId>org.apache.maven.plugins</groupId>
155155
<artifactId>maven-jar-plugin</artifactId>
156-
<version>3.0.2</version>
156+
<version>$[maven.jar.plugin.version]</version>
157157
</plugin>
158158
<plugin>
159159
<groupId>org.apache.maven.plugins</groupId>
160160
<artifactId>maven-source-plugin</artifactId>
161-
<version>3.0.1</version>
161+
<version>$[maven.source.plugin.version]</version>
162162
</plugin>
163163
<plugin>
164164
<groupId>org.apache.maven.plugins</groupId>
165165
<artifactId>maven-site-plugin</artifactId>
166-
<version>3.7</version>
166+
<version>$[maven.site.plugin.version]</version>
167167
</plugin>
168168
<plugin>
169169
<groupId>org.apache.maven.plugins</groupId>
170170
<artifactId>maven-checkstyle-plugin</artifactId>
171-
<version>3.0.0</version>
171+
<version>$[maven.checkstyle.plugin.version]</version>
172172
</plugin>
173173
<plugin>
174174
<groupId>org.apache.maven.plugins</groupId>
175-
<artifactId>maven-antrun-plugin</artifactId>
176-
<version>1.8</version>
175+
<artifactId>maven-changes-plugin</artifactId>
176+
<version>$[maven.changes.plugin.version]</version>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-changelog-plugin</artifactId>
181+
<version>$[maven.changelog.plugin.version]</version>
177182
</plugin>
178183
<plugin>
179184
<groupId>org.apache.maven.plugins</groupId>
180185
<artifactId>maven-project-info-reports-plugin</artifactId>
181-
<version>2.9</version>
186+
<version>$[maven.project.info.reports.plugin.version]</version>
182187
</plugin>
183188
<plugin>
184189
<groupId>org.apache.maven.plugins</groupId>
185190
<artifactId>maven-jxr-plugin</artifactId>
186-
<version>2.5</version>
191+
<version>$[maven.jxr.plugin.version]</version>
187192
</plugin>
188193
<plugin>
189194
<groupId>org.apache.maven.plugins</groupId>
190195
<artifactId>maven-javadoc-plugin</artifactId>
191-
<version>3.0.0</version>
196+
<version>$[maven.javadoc.plugin.version]</version>
192197
<configuration>
193-
<additionalDependencies>
194-
<additionalDependency>
195-
<groupId>javax.interceptor</groupId>
196-
<artifactId>javax.interceptor-api</artifactId>
197-
<version>1.2</version>
198-
</additionalDependency>
199-
</additionalDependencies>
200-
<!-- https://issues.apache.org/jira/browse/MJAVADOC-308 -->
201-
<!-- <notree>true</notree> -->
202-
<show>private</show>
198+
<!-- http://jira.codehaus.org/browse/MJAVADOC-308 -->
199+
<!--<maxmemory>5048m</maxmemory>-->
200+
<notree>true</notree>
201+
<show>protected</show>
203202
<encoding>${project.reporting.outputEncoding}</encoding>
204203
<charset>${project.build.sourceEncoding}</charset>
205204
<docfilessubdirs>true</docfilessubdirs>
206-
<links>
207-
<link>http://docs.oracle.com/javase/8/docs/api/</link>
208-
</links>
209-
<doctitle>JavaDocs for ${project.name}</doctitle>
210-
<windowtitle>JavaDocs for ${project.name}</windowtitle>
205+
<stylesheetfile>${user.dir}/src/main/javadoc/stylesheet.css</stylesheetfile>
206+
<doclint>none</doclint>
207+
<source>${java.version}</source>
208+
<doctitle>JavaDocs for ${project.name} ${project.version}</doctitle>
209+
<windowtitle>JavaDocs for ${project.name} ${project.version}</windowtitle>
211210
</configuration>
212211
</plugin>
213212
<plugin>
214213
<groupId>org.apache.maven.plugins</groupId>
215214
<artifactId>maven-surefire-plugin</artifactId>
216-
<version>3.0.0-M3</version>
215+
<version>$[maven.surefire.plugin.version]</version>
217216
<configuration>
218217
<!-- Surefire changed the default to the project.build.directory causing trouble with file paths to test resources -->
219218
<workingDirectory>${basedir}</workingDirectory>
@@ -222,87 +221,101 @@
222221
<plugin>
223222
<groupId>org.apache.maven.plugins</groupId>
224223
<artifactId>maven-surefire-report-plugin</artifactId>
225-
<version>2.20.1</version>
224+
<version>$[maven.surefire.report.plugin.version]</version>
226225
</plugin>
227226
<plugin>
228227
<groupId>org.apache.maven.plugins</groupId>
229228
<artifactId>maven-pmd-plugin</artifactId>
230-
<version>3.9.0</version>
229+
<version>$[maven.pmd.plugin.version]</version>
231230
<configuration>
232231
<targetJdk>${java.version}</targetJdk>
233232
</configuration>
234233
</plugin>
235234
<plugin>
236235
<groupId>org.apache.maven.plugins</groupId>
237236
<artifactId>maven-war-plugin</artifactId>
238-
<version>3.2.0</version>
237+
<version>$[maven.war.plugin.version]</version>
239238
</plugin>
240239
<plugin>
241240
<groupId>org.apache.maven.plugins</groupId>
242-
<artifactId>maven-gpg-plugin</artifactId>
243-
<version>1.6</version>
241+
<artifactId>maven-antrun-plugin</artifactId>
242+
<version>$[maven.antrun.plugin.version]</version>
244243
</plugin>
245244
<plugin>
246245
<groupId>org.apache.maven.plugins</groupId>
247246
<artifactId>maven-help-plugin</artifactId>
248-
<version>3.2.0</version>
247+
<version>$[maven.help.plugin.version]</version>
249248
</plugin>
250249
<plugin>
251-
<groupId>org.codehaus.mojo</groupId>
252-
<artifactId>cobertura-maven-plugin</artifactId>
253-
<version>2.7</version>
250+
<groupId>org.apache.maven.plugins</groupId>
251+
<artifactId>maven-gpg-plugin</artifactId>
252+
<version>$[maven.gpg.plugin.version]</version>
254253
</plugin>
255254
<plugin>
256-
<groupId>org.codehaus.mojo</groupId>
257-
<artifactId>sonar-maven-plugin</artifactId>
258-
<version>3.4.0.905</version>
255+
<groupId>org.apache.maven.plugins</groupId>
256+
<artifactId>maven-archetype-plugin</artifactId>
257+
<version>$[maven.archetype.version]</version>
259258
</plugin>
260259
<plugin>
261-
<groupId>org.codehaus.mojo</groupId>
262-
<artifactId>findbugs-maven-plugin</artifactId>
263-
<version>3.0.5</version>
260+
<groupId>org.apache.maven.archetype</groupId>
261+
<artifactId>archetype-packaging</artifactId>
262+
<version>$[maven.archetype.version]</version>
264263
</plugin>
265264
<plugin>
266265
<groupId>org.codehaus.mojo</groupId>
267266
<artifactId>taglist-maven-plugin</artifactId>
268-
<version>2.4</version>
267+
<version>$[mojo.taglist.plugin.version]</version>
269268
</plugin>
270269
<plugin>
271270
<groupId>org.codehaus.mojo</groupId>
272-
<artifactId>flatten-maven-plugin</artifactId>
273-
<version>1.0.1</version>
271+
<artifactId>cobertura-maven-plugin</artifactId>
272+
<version>$[mojo.cobertura.plugin.version]</version>
274273
</plugin>
275274
<plugin>
276275
<groupId>org.codehaus.mojo</groupId>
277-
<artifactId>servicedocgen-maven-plugin</artifactId>
278-
<version>1.0.0-beta-3</version>
279-
</plugin>
280-
<plugin>
281-
<groupId>org.jacoco</groupId>
282-
<artifactId>jacoco-maven-plugin</artifactId>
283-
<version>0.8.3</version>
284-
</plugin>
285-
<plugin>
286-
<groupId>org.owasp</groupId>
287-
<artifactId>dependency-check-maven</artifactId>
288-
<version>5.1.0</version>
276+
<artifactId>flatten-maven-plugin</artifactId>
277+
<version>$[mojo.flatten.plugin.version]</version>
289278
</plugin>
290279
<plugin>
291280
<groupId>org.codehaus.mojo</groupId>
292281
<artifactId>license-maven-plugin</artifactId>
293-
<version>1.14</version>
282+
<version>$[mojo.license.plugin.version]</version>
294283
<configuration>
295284
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
296285
<sortArtifactByName>true</sortArtifactByName>
297286
<includeTransitiveDependencies>true</includeTransitiveDependencies>
298287
<useMissingFile>true</useMissingFile>
299288
<failOnMissing>true</failOnMissing>
300289
<licenseMerges>
301-
<licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache
302-
2.0|Apache License, Version 2.0</licenseMerge>
290+
<licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache License, Version 2.0</licenseMerge>
303291
</licenseMerges>
304292
</configuration>
305293
</plugin>
294+
<plugin>
295+
<groupId>org.codehaus.mojo</groupId>
296+
<artifactId>servicedocgen-maven-plugin</artifactId>
297+
<version>$[mojo.servicedocgen.plugin.version]</version>
298+
</plugin>
299+
<plugin>
300+
<groupId>org.sonarsource.scanner.maven</groupId>
301+
<artifactId>sonar-maven-plugin</artifactId>
302+
<version>$[sonar.maven.plugin.version]</version>
303+
</plugin>
304+
<plugin>
305+
<groupId>org.jacoco</groupId>
306+
<artifactId>jacoco-maven-plugin</artifactId>
307+
<version>$[jacoco.maven.plugin.version]</version>
308+
</plugin>
309+
<plugin>
310+
<groupId>org.owasp</groupId>
311+
<artifactId>dependency-check-maven</artifactId>
312+
<version>$[owasp.dependency.check.plugin.version]</version>
313+
</plugin>
314+
<plugin>
315+
<groupId>com.github.spotbugs</groupId>
316+
<artifactId>spotbugs-maven-plugin</artifactId>
317+
<version>$[spotbugs.plugin.version]</version>
318+
</plugin>
306319
<plugin>
307320
<groupId>org.springframework.boot</groupId>
308321
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -337,28 +350,6 @@
337350
<devonfw.test.excluded.groups>none</devonfw.test.excluded.groups>
338351
</properties>
339352
</profile>
340-
<profile>
341-
<id>doclint-disabled</id>
342-
<activation>
343-
<jdk>[1.8,)</jdk>
344-
</activation>
345-
<build>
346-
<pluginManagement>
347-
<plugins>
348-
<plugin>
349-
<groupId>org.apache.maven.plugins</groupId>
350-
<artifactId>maven-javadoc-plugin</artifactId>
351-
<!--<version>3.0.0</version> -->
352-
<configuration>
353-
<additionalOptions>
354-
<additionalOption>-Xdoclint:none</additionalOption>
355-
</additionalOptions>
356-
</configuration>
357-
</plugin>
358-
</plugins>
359-
</pluginManagement>
360-
</build>
361-
</profile>
362353
<profile>
363354
<id>security</id>
364355
<build>

0 commit comments

Comments
 (0)