This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
commit bb772f25e3801073a5760d3b95d55e359ef1a4da Author: Michael Osipov <[email protected]> AuthorDate: Sun Mar 31 11:52:31 2019 +0200 [MRESOLVER-70] Upgrade Parent to 33 --- pom.xml | 3 +-- .../java/org/apache/maven/resolver/internal/ant/AntLogger.java | 6 +++--- .../org/apache/maven/resolver/internal/ant/AntModelResolver.java | 8 ++++---- .../apache/maven/resolver/internal/ant/AntRepositoryListener.java | 6 +++--- .../org/apache/maven/resolver/internal/ant/AntSecDispatcher.java | 6 +++--- .../resolver/internal/ant/AntServiceLocatorErrorHandler.java | 6 +++--- .../apache/maven/resolver/internal/ant/AntTransferListener.java | 6 +++--- .../maven/resolver/internal/ant/tasks/DependencyGraphLogger.java | 6 +++--- .../java/org/apache/maven/resolver/internal/ant/tasks/Layout.java | 6 +++--- .../org/apache/maven/resolver/internal/ant/tasks/Resolve.java | 6 +++--- .../maven/resolver/internal/ant/types/ModelValueExtractor.java | 6 +++--- .../maven/resolver/internal/ant/types/PomPropertyHelper.java | 6 +++--- 12 files changed, 35 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 5f5a881..e9aec7b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>30</version> + <version>33</version> </parent> <groupId>org.apache.maven.resolver</groupId> @@ -259,7 +259,6 @@ </plugin> <plugin> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> <executions> <execution> <phase>package</phase> diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntLogger.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntLogger.java index 711d653..f71aecf 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntLogger.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntLogger.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -30,7 +30,7 @@ class AntLogger private Project project; - public AntLogger( Project project ) + AntLogger( Project project ) { this.project = project; } diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java index 43b64f7..8de7957 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -46,7 +46,7 @@ import org.eclipse.aether.resolution.ArtifactResolutionException; /** * A model resolver to assist building of dependency POMs. This resolver gives priority to those repositories that have * been initially specified and repositories discovered in dependency POMs are recessively merged into the search chain. - * + * */ class AntModelResolver implements ModelResolver @@ -64,7 +64,7 @@ class AntModelResolver private final Set<String> repositoryIds; - public AntModelResolver( RepositorySystemSession session, String context, RepositorySystem repoSys, + AntModelResolver( RepositorySystemSession session, String context, RepositorySystem repoSys, RemoteRepositoryManager remoteRepositoryManager, List<RemoteRepository> repositories ) { this.session = session; diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java index f850357..077fc26 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -36,7 +36,7 @@ class AntRepositoryListener private Task task; - public AntRepositoryListener( Task task ) + AntRepositoryListener( Task task ) { this.task = task; } diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java index 0852f86..f4678e5 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,7 +29,7 @@ class AntSecDispatcher extends DefaultSecDispatcher { - public AntSecDispatcher() + AntSecDispatcher() { _configurationFile = "~/.m2/settings-security.xml"; try diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntServiceLocatorErrorHandler.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntServiceLocatorErrorHandler.java index 1621285..e6af28a 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntServiceLocatorErrorHandler.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntServiceLocatorErrorHandler.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -31,7 +31,7 @@ class AntServiceLocatorErrorHandler private Project project; - public AntServiceLocatorErrorHandler( Project project ) + AntServiceLocatorErrorHandler( Project project ) { this.project = project; } diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntTransferListener.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntTransferListener.java index 6844d22..b36e637 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntTransferListener.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntTransferListener.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -39,7 +39,7 @@ class AntTransferListener private Task task; - public AntTransferListener( Task task ) + AntTransferListener( Task task ) { this.task = task; } diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java index c1fff1d..2d78cab 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant.tasks; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,7 +37,7 @@ class DependencyGraphLogger private String indent = ""; - public DependencyGraphLogger( Task task ) + DependencyGraphLogger( Task task ) { this.task = task; } diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java index 995c00f..1060c93 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant.tasks; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -52,7 +52,7 @@ class Layout private String[] tokens; - public Layout( String layout ) + Layout( String layout ) throws BuildException { Collection<String> valid = new HashSet<String>( Arrays.asList( GID, GID_DIRS, AID, VER, BVER, EXT, CLS ) ); diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java index da37563..62b944a 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant.tasks; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -507,7 +507,7 @@ public class Resolve private List<ArtifactRequest> requests = new ArrayList<ArtifactRequest>(); - public Group( String classifier ) + Group( String classifier ) { this.classifier = classifier; } diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/ModelValueExtractor.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/ModelValueExtractor.java index c1ab45c..a5603e8 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/ModelValueExtractor.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/ModelValueExtractor.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant.types; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -36,7 +36,7 @@ class ModelValueExtractor private final Model model; - public ModelValueExtractor( String prefix, Model model, Project project ) + ModelValueExtractor( String prefix, Model model, Project project ) { if ( model == null ) { diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java index 5ec23ec..dc3d44d 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java @@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant.types; * to you under the Apache License, Version 2.0 (the * "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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,7 +37,7 @@ class PomPropertyHelper propertyHelper.setNext( helper ); } - public PomPropertyHelper( ModelValueExtractor extractor ) + PomPropertyHelper( ModelValueExtractor extractor ) { if ( extractor == null ) {
