Skip to content

Commit

Permalink
[SCM-1005] Upgrade Parent to 39
Browse files Browse the repository at this point in the history
This closes #165
  • Loading branch information
michael-o committed Mar 12, 2023
1 parent 26ed440 commit 219811b
Show file tree
Hide file tree
Showing 446 changed files with 15,020 additions and 20,899 deletions.
2 changes: 0 additions & 2 deletions maven-scm-api/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
Expand All @@ -18,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->

<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">
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
package org.apache.maven.scm;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Expand All @@ -9,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
Expand All @@ -18,47 +16,41 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.scm;

import java.io.Serializable;

/**
* @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
*
*/
public abstract class AbstractScmVersion
implements ScmVersion, Serializable
{
public abstract class AbstractScmVersion implements ScmVersion, Serializable {
private static final long serialVersionUID = -3388495744009098066L;

private String name;

/**
* @param name could be null
*/
public AbstractScmVersion( String name )
{
setName( name );
public AbstractScmVersion(String name) {
setName(name);
}

/** {@inheritDoc} */
public String getName()
{
public String getName() {
return name;
}

/** {@inheritDoc} */
public void setName( String name )
{
if ( name != null )
{
public void setName(String name) {
if (name != null) {
name = name.trim();
}
this.name = name;
}

/** {@inheritDoc} */
public String toString()
{
public String toString() {
return getName();
}
}
78 changes: 29 additions & 49 deletions maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
package org.apache.maven.scm;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Expand All @@ -9,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
Expand All @@ -18,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.scm;

import java.io.Serializable;

Expand All @@ -29,9 +28,7 @@
* @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
*
*/
public class ChangeFile
implements Serializable
{
public class ChangeFile implements Serializable {
private static final long serialVersionUID = 6294855290542668753L;

/**
Expand Down Expand Up @@ -68,9 +65,8 @@ public class ChangeFile
*
* @param name file name
*/
public ChangeFile( String name )
{
setName( name );
public ChangeFile(String name) {
setName(name);
}

/**
Expand All @@ -79,20 +75,18 @@ public ChangeFile( String name )
* @param name file name
* @param rev latest revision of the file
*/
public ChangeFile( String name, String rev )
{
setName( name );
public ChangeFile(String name, String rev) {
setName(name);

setRevision( rev );
setRevision(rev);
}

/**
* Gets the name attribute of the ChangeLogFile object.
*
* @return the file name
*/
public String getName()
{
public String getName() {
return name;
}

Expand All @@ -101,29 +95,24 @@ public String getName()
*
* @param name New value of property name.
*/
public void setName( String name )
{
public void setName(String name) {
this.name = name;
}

public String getOriginalName()
{
public String getOriginalName() {
return originalName;
}

public void setOriginalName( String originalName )
{
public void setOriginalName(String originalName) {

this.originalName = originalName;
}

public String getOriginalRevision()
{
public String getOriginalRevision() {
return originalRevision;
}

public void setOriginalRevision( String originalRevision )
{
public void setOriginalRevision(String originalRevision) {
this.originalRevision = originalRevision;
}

Expand All @@ -132,8 +121,7 @@ public void setOriginalRevision( String originalRevision )
*
* @return the latest revision of the file
*/
public String getRevision()
{
public String getRevision() {
return revision;
}

Expand All @@ -142,18 +130,15 @@ public String getRevision()
*
* @param revision New value of property revision.
*/
public void setRevision( String revision )
{
public void setRevision(String revision) {
this.revision = revision;
}

public ScmFileStatus getAction()
{
public ScmFileStatus getAction() {
return action;
}

public void setAction( ScmFileStatus action )
{
public void setAction(ScmFileStatus action) {
this.action = action;
}

Expand All @@ -162,29 +147,24 @@ public void setAction( ScmFileStatus action )
*
* @return a {@link String}made up of the properties of the object
*/
public String toString()
{
StringBuilder buffer = new StringBuilder( );
public String toString() {
StringBuilder buffer = new StringBuilder();

if ( getAction() != null )
{
buffer.append( "[" ).append( getAction() ).append( "]:" );
if (getAction() != null) {
buffer.append("[").append(getAction()).append("]:");
}

buffer.append( getName() );
if ( getRevision() != null )
{
buffer.append( ", " ).append( getRevision() );
buffer.append(getName());
if (getRevision() != null) {
buffer.append(", ").append(getRevision());
}

if ( getOriginalName() != null )
{
buffer.append( ", originalName=" ).append( getOriginalName() );
if (getOriginalName() != null) {
buffer.append(", originalName=").append(getOriginalName());
}

if ( getOriginalRevision() != null )
{
buffer.append( ", originalRevision=" ).append( getOriginalRevision() );
if (getOriginalRevision() != null) {
buffer.append(", originalRevision=").append(getOriginalRevision());
}

return buffer.toString();
Expand Down
Loading

0 comments on commit 219811b

Please sign in to comment.