Skip to content

Commit 219811b

Browse files
committed
[SCM-1005] Upgrade Parent to 39
This closes #165
1 parent 26ed440 commit 219811b

File tree

446 files changed

+15020
-20899
lines changed

Some content is hidden

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

446 files changed

+15020
-20899
lines changed

maven-scm-api/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
~ Licensed to the Apache Software Foundation (ASF) under one
54
~ or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.apache.maven.scm;
2-
31
/*
42
* Licensed to the Apache Software Foundation (ASF) under one
53
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@
97
* "License"); you may not use this file except in compliance
108
* with the License. You may obtain a copy of the License at
119
*
12-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1311
*
1412
* Unless required by applicable law or agreed to in writing,
1513
* software distributed under the License is distributed on an
@@ -18,47 +16,41 @@
1816
* specific language governing permissions and limitations
1917
* under the License.
2018
*/
19+
package org.apache.maven.scm;
2120

2221
import java.io.Serializable;
2322

2423
/**
2524
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
2625
*
2726
*/
28-
public abstract class AbstractScmVersion
29-
implements ScmVersion, Serializable
30-
{
27+
public abstract class AbstractScmVersion implements ScmVersion, Serializable {
3128
private static final long serialVersionUID = -3388495744009098066L;
3229

3330
private String name;
3431

3532
/**
3633
* @param name could be null
3734
*/
38-
public AbstractScmVersion( String name )
39-
{
40-
setName( name );
35+
public AbstractScmVersion(String name) {
36+
setName(name);
4137
}
4238

4339
/** {@inheritDoc} */
44-
public String getName()
45-
{
40+
public String getName() {
4641
return name;
4742
}
4843

4944
/** {@inheritDoc} */
50-
public void setName( String name )
51-
{
52-
if ( name != null )
53-
{
45+
public void setName(String name) {
46+
if (name != null) {
5447
name = name.trim();
5548
}
5649
this.name = name;
5750
}
5851

5952
/** {@inheritDoc} */
60-
public String toString()
61-
{
53+
public String toString() {
6254
return getName();
6355
}
6456
}

maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java

Lines changed: 29 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.apache.maven.scm;
2-
31
/*
42
* Licensed to the Apache Software Foundation (ASF) under one
53
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@
97
* "License"); you may not use this file except in compliance
108
* with the License. You may obtain a copy of the License at
119
*
12-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1311
*
1412
* Unless required by applicable law or agreed to in writing,
1513
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
1816
* specific language governing permissions and limitations
1917
* under the License.
2018
*/
19+
package org.apache.maven.scm;
2120

2221
import java.io.Serializable;
2322

@@ -29,9 +28,7 @@
2928
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
3029
*
3130
*/
32-
public class ChangeFile
33-
implements Serializable
34-
{
31+
public class ChangeFile implements Serializable {
3532
private static final long serialVersionUID = 6294855290542668753L;
3633

3734
/**
@@ -68,9 +65,8 @@ public class ChangeFile
6865
*
6966
* @param name file name
7067
*/
71-
public ChangeFile( String name )
72-
{
73-
setName( name );
68+
public ChangeFile(String name) {
69+
setName(name);
7470
}
7571

7672
/**
@@ -79,20 +75,18 @@ public ChangeFile( String name )
7975
* @param name file name
8076
* @param rev latest revision of the file
8177
*/
82-
public ChangeFile( String name, String rev )
83-
{
84-
setName( name );
78+
public ChangeFile(String name, String rev) {
79+
setName(name);
8580

86-
setRevision( rev );
81+
setRevision(rev);
8782
}
8883

8984
/**
9085
* Gets the name attribute of the ChangeLogFile object.
9186
*
9287
* @return the file name
9388
*/
94-
public String getName()
95-
{
89+
public String getName() {
9690
return name;
9791
}
9892

@@ -101,29 +95,24 @@ public String getName()
10195
*
10296
* @param name New value of property name.
10397
*/
104-
public void setName( String name )
105-
{
98+
public void setName(String name) {
10699
this.name = name;
107100
}
108101

109-
public String getOriginalName()
110-
{
102+
public String getOriginalName() {
111103
return originalName;
112104
}
113105

114-
public void setOriginalName( String originalName )
115-
{
106+
public void setOriginalName(String originalName) {
116107

117108
this.originalName = originalName;
118109
}
119110

120-
public String getOriginalRevision()
121-
{
111+
public String getOriginalRevision() {
122112
return originalRevision;
123113
}
124114

125-
public void setOriginalRevision( String originalRevision )
126-
{
115+
public void setOriginalRevision(String originalRevision) {
127116
this.originalRevision = originalRevision;
128117
}
129118

@@ -132,8 +121,7 @@ public void setOriginalRevision( String originalRevision )
132121
*
133122
* @return the latest revision of the file
134123
*/
135-
public String getRevision()
136-
{
124+
public String getRevision() {
137125
return revision;
138126
}
139127

@@ -142,18 +130,15 @@ public String getRevision()
142130
*
143131
* @param revision New value of property revision.
144132
*/
145-
public void setRevision( String revision )
146-
{
133+
public void setRevision(String revision) {
147134
this.revision = revision;
148135
}
149136

150-
public ScmFileStatus getAction()
151-
{
137+
public ScmFileStatus getAction() {
152138
return action;
153139
}
154140

155-
public void setAction( ScmFileStatus action )
156-
{
141+
public void setAction(ScmFileStatus action) {
157142
this.action = action;
158143
}
159144

@@ -162,29 +147,24 @@ public void setAction( ScmFileStatus action )
162147
*
163148
* @return a {@link String}made up of the properties of the object
164149
*/
165-
public String toString()
166-
{
167-
StringBuilder buffer = new StringBuilder( );
150+
public String toString() {
151+
StringBuilder buffer = new StringBuilder();
168152

169-
if ( getAction() != null )
170-
{
171-
buffer.append( "[" ).append( getAction() ).append( "]:" );
153+
if (getAction() != null) {
154+
buffer.append("[").append(getAction()).append("]:");
172155
}
173156

174-
buffer.append( getName() );
175-
if ( getRevision() != null )
176-
{
177-
buffer.append( ", " ).append( getRevision() );
157+
buffer.append(getName());
158+
if (getRevision() != null) {
159+
buffer.append(", ").append(getRevision());
178160
}
179161

180-
if ( getOriginalName() != null )
181-
{
182-
buffer.append( ", originalName=" ).append( getOriginalName() );
162+
if (getOriginalName() != null) {
163+
buffer.append(", originalName=").append(getOriginalName());
183164
}
184165

185-
if ( getOriginalRevision() != null )
186-
{
187-
buffer.append( ", originalRevision=" ).append( getOriginalRevision() );
166+
if (getOriginalRevision() != null) {
167+
buffer.append(", originalRevision=").append(getOriginalRevision());
188168
}
189169

190170
return buffer.toString();

0 commit comments

Comments
 (0)