Repository: maven Updated Branches: refs/heads/master 9d98b5c15 -> df2150931
Fix violations reported by checkstyle Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/df215093 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/df215093 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/df215093 Branch: refs/heads/master Commit: df21509310fd68a1578b6d9a92fd8a9b8d4cb230 Parents: 9d98b5c Author: Robert Scholte <rfscho...@codehaus.org> Authored: Tue Dec 23 16:49:26 2014 +0100 Committer: Robert Scholte <rfscho...@codehaus.org> Committed: Tue Dec 23 16:49:26 2014 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/maven/model/building/ModelSource.java | 5 ++--- .../java/org/apache/maven/model/building/StringModelSource.java | 5 ++--- .../java/org/apache/maven/model/building/UrlModelSource.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/df215093/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java index acb4651..5db8edb 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java @@ -1,7 +1,5 @@ package org.apache.maven.model.building; -import org.apache.maven.building.Source; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,6 +19,7 @@ import org.apache.maven.building.Source; * under the License. */ +import org.apache.maven.building.Source; /** * Provides access to the contents of a POM independently of the backing store (e.g. file system, database, memory). @@ -33,7 +32,7 @@ import org.apache.maven.building.Source; * @deprecated instead use {@link Source} */ @Deprecated -public interface ModelSource extends org.apache.maven.building.Source +public interface ModelSource extends Source { } http://git-wip-us.apache.org/repos/asf/maven/blob/df215093/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java index 1d8406f..cf9c4ce 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java @@ -1,7 +1,5 @@ package org.apache.maven.model.building; -import org.apache.maven.building.StringSource; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,6 +19,7 @@ import org.apache.maven.building.StringSource; * under the License. */ +import org.apache.maven.building.StringSource; /** * Wraps an ordinary {@link CharSequence} as a model source. @@ -30,7 +29,7 @@ import org.apache.maven.building.StringSource; * @deprecated instead use {@link StringSource} */ @Deprecated -public class StringModelSource extends org.apache.maven.building.StringSource +public class StringModelSource extends StringSource implements ModelSource { http://git-wip-us.apache.org/repos/asf/maven/blob/df215093/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java index 6ed25ed..e41d74b 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java @@ -31,7 +31,7 @@ import org.apache.maven.building.UrlSource; * @deprecated instead use {@link UrlSource} */ @Deprecated -public class UrlModelSource extends org.apache.maven.building.UrlSource +public class UrlModelSource extends UrlSource implements ModelSource { /**