Skip to content

Commit bb4debd

Browse files
authored
[MPIR-432] upgrade to parent POM 39 (#46)
* MPIR-432 upgrade to parent POM 39
1 parent 5757c0d commit bb4debd

File tree

69 files changed

+3544
-4767
lines changed

Some content is hidden

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

69 files changed

+3544
-4767
lines changed

pom.xml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version='1.0' encoding='UTF-8'?>
2-
1+
<?xml version="1.0" encoding="UTF-8"?>
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -18,14 +17,13 @@ KIND, either express or implied. See the License for the
1817
specific language governing permissions and limitations
1918
under the License.
2019
-->
21-
2220
<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">
2321
<modelVersion>4.0.0</modelVersion>
2422

2523
<parent>
26-
<artifactId>maven-plugins</artifactId>
2724
<groupId>org.apache.maven.plugins</groupId>
28-
<version>36</version>
25+
<artifactId>maven-plugins</artifactId>
26+
<version>39</version>
2927
<relativePath />
3028
</parent>
3129

@@ -34,10 +32,8 @@ under the License.
3432
<packaging>maven-plugin</packaging>
3533

3634
<name>Apache Maven Project Info Reports Plugin</name>
37-
<description>
38-
The Maven Project Info Reports Plugin generates standard reports
39-
for the specified project.
40-
</description>
35+
<description>The Maven Project Info Reports Plugin generates standard reports
36+
for the specified project.</description>
4137
<inceptionYear>2005</inceptionYear>
4238

4339
<contributors>
@@ -99,8 +95,8 @@ under the License.
9995
<scm>
10096
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git</connection>
10197
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git</developerConnection>
102-
<url>https://github.com/apache/maven-project-info-reports-plugin/tree/${project.scm.tag}</url>
10398
<tag>HEAD</tag>
99+
<url>https://github.com/apache/maven-project-info-reports-plugin/tree/${project.scm.tag}</url>
104100
</scm>
105101
<issueManagement>
106102
<system>JIRA</system>
@@ -118,7 +114,6 @@ under the License.
118114
</distributionManagement>
119115

120116
<properties>
121-
<javaVersion>8</javaVersion>
122117
<doxiaVersion>1.11.1</doxiaVersion>
123118
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
124119
<mavenVersion>3.2.5</mavenVersion>
@@ -200,7 +195,8 @@ under the License.
200195
<groupId>org.apache.maven.shared</groupId>
201196
<artifactId>maven-shared-jar</artifactId>
202197
<version>1.2</version>
203-
<exclusions><!-- Replace problematic BCEL version until MSHARED JAR has been updated -->
198+
<exclusions>
199+
<!-- Replace problematic BCEL version until MSHARED JAR has been updated -->
204200
<exclusion>
205201
<groupId>com.google.code.findbugs</groupId>
206202
<artifactId>bcel-findbugs</artifactId>
@@ -524,7 +520,8 @@ under the License.
524520
<artifactId>maven-surefire-plugin</artifactId>
525521
<configuration>
526522
<excludes>
527-
<exclude>**/DependenciesReportTest*</exclude><!-- FIXME: missing Maven 3 class or conflict -->
523+
<exclude>**/DependenciesReportTest*</exclude>
524+
<!-- FIXME: missing Maven 3 class or conflict -->
528525
</excludes>
529526
</configuration>
530527
</plugin>
@@ -535,11 +532,11 @@ under the License.
535532
<executions>
536533
<execution>
537534
<id>init</id>
538-
<phase>initialize</phase>
539535
<goals>
540536
<goal>clean</goal>
541537
<goal>generateKeyPair</goal>
542538
</goals>
539+
<phase>initialize</phase>
543540
</execution>
544541
</executions>
545542
</plugin>

src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java

Lines changed: 27 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.apache.maven.report.projectinfo;
2-
31
/*
42
* Licensed to the Apache Software Foundation (ASF) under one
53
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@
1816
* specific language governing permissions and limitations
1917
* under the License.
2018
*/
19+
package org.apache.maven.report.projectinfo;
2120

2221
import java.util.Locale;
2322
import java.util.regex.Pattern;
@@ -31,9 +30,7 @@
3130
* @author Hervé Boutemy
3231
*
3332
*/
34-
public abstract class AbstractProjectInfoRenderer
35-
extends AbstractMavenReportRenderer
36-
{
33+
public abstract class AbstractProjectInfoRenderer extends AbstractMavenReportRenderer {
3734
/**
3835
* {@link I18N}.
3936
*/
@@ -49,58 +46,48 @@ public abstract class AbstractProjectInfoRenderer
4946
* @param i18n {@link I18N}
5047
* @param locale {@link Locale}
5148
*/
52-
public AbstractProjectInfoRenderer( Sink sink, I18N i18n, Locale locale )
53-
{
54-
super( sink );
49+
public AbstractProjectInfoRenderer(Sink sink, I18N i18n, Locale locale) {
50+
super(sink);
5551

5652
this.i18n = i18n;
5753

5854
this.locale = locale;
5955
}
6056

6157
@Override
62-
public String getTitle()
63-
{
64-
return getI18nString( "title" );
58+
public String getTitle() {
59+
return getI18nString("title");
6560
}
6661

6762
/**
6863
* @param key The key.
6964
* @return The translated string.
7065
*/
71-
protected String getI18nString( String key )
72-
{
73-
return getI18nString( getI18Nsection(), key );
66+
protected String getI18nString(String key) {
67+
return getI18nString(getI18Nsection(), key);
7468
}
7569

7670
/**
7771
* @param section The section.
7872
* @param key The key to translate.
7973
* @return the translated key.
8074
*/
81-
protected String getI18nString( String section, String key )
82-
{
83-
return i18n.getString( "project-info-reports", locale, "report." + section + '.' + key );
75+
protected String getI18nString(String section, String key) {
76+
return i18n.getString("project-info-reports", locale, "report." + section + '.' + key);
8477
}
8578

8679
@Override
87-
protected void text( String text )
88-
{
89-
if ( StringUtils.isEmpty( text ) ) // Take care of spaces
90-
{
91-
sink.text( "-" );
92-
}
93-
else
80+
protected void text(String text) {
81+
if (StringUtils.isEmpty(text)) // Take care of spaces
9482
{
83+
sink.text("-");
84+
} else {
9585
// custombundle text with xml?
9686
String regex = "(.+?)<(\"[^\"]*\"|'[^']*'|[^'\">])*>(.+?)";
97-
if ( Pattern.matches( regex, text ) )
98-
{
99-
sink.rawText( text );
100-
}
101-
else
102-
{
103-
sink.text( text );
87+
if (Pattern.matches(regex, text)) {
88+
sink.rawText(text);
89+
} else {
90+
sink.text(text);
10491
}
10592
}
10693
}
@@ -112,11 +99,10 @@ protected void text( String text )
11299
* {@inheritDoc}
113100
*/
114101
@Override
115-
protected void verbatimText( String text )
116-
{
117-
sink.verbatim( null );
102+
protected void verbatimText(String text) {
103+
sink.verbatim(null);
118104

119-
text( text );
105+
text(text);
120106

121107
sink.verbatim_();
122108
}
@@ -125,17 +111,13 @@ protected void verbatimText( String text )
125111
* {@inheritDoc}
126112
*/
127113
@Override
128-
protected void verbatimLink( String text, String href )
129-
{
130-
if ( StringUtils.isEmpty( href ) )
131-
{
132-
verbatimText( text );
133-
}
134-
else
135-
{
136-
sink.verbatim( null );
114+
protected void verbatimLink(String text, String href) {
115+
if (StringUtils.isEmpty(href)) {
116+
verbatimText(text);
117+
} else {
118+
sink.verbatim(null);
137119

138-
link( href, text );
120+
link(href, text);
139121

140122
sink.verbatim_();
141123
}

0 commit comments

Comments
 (0)