You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/03/17 09:51:22 UTC
[maven] branch mvn4 updated (e2d9c53 -> a036f07)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git.
from e2d9c53 Fix checkstyle
new d1f968d Add a few methods on Session and use @see references
new 8113c51 Do not use non released api for annotations
new a036f07 Add support for reading/writing xml models
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-core-api/pom.xml | 6 +-
.../main/java/org/apache/maven/api/Artifact.java | 5 +-
.../main/java/org/apache/maven/api/Dependency.java | 6 +-
.../src/main/java/org/apache/maven/api/Event.java | 2 +-
.../main/java/org/apache/maven/api/Exclusion.java | 2 +-
.../main/java/org/apache/maven/api/Listener.java | 2 +-
.../java/org/apache/maven/api/MojoExecution.java | 2 +-
.../src/main/java/org/apache/maven/api/Node.java | 2 +-
.../java/org/apache/maven/api/NodeVisitor.java | 6 +-
.../main/java/org/apache/maven/api/Project.java | 2 +-
.../org/apache/maven/api/RemoteRepository.java | 2 +-
.../main/java/org/apache/maven/api/Repository.java | 2 +-
.../main/java/org/apache/maven/api/Session.java | 92 ++++++++-
.../java/org/apache/maven/api/SessionData.java | 6 +-
.../{Listener.java => annotations/Immutable.java} | 15 +-
.../org/apache/maven/api/annotations/Nonnull.java | 24 +--
.../{Listener.java => annotations/Nullable.java} | 15 +-
.../{Listener.java => annotations/ThreadSafe.java} | 15 +-
.../api/services/ArtifactDeployerRequest.java | 2 +-
.../maven/api/services/ArtifactFactoryRequest.java | 2 +-
.../api/services/ArtifactInstallerRequest.java | 4 +-
.../apache/maven/api/services/ArtifactManager.java | 2 +-
.../api/services/ArtifactResolverRequest.java | 2 +-
.../org/apache/maven/api/services/BaseRequest.java | 2 +-
.../maven/api/services/DependencyCollector.java | 2 +-
.../api/services/DependencyCollectorRequest.java | 2 +-
.../api/services/DependencyFactoryRequest.java | 2 +-
.../api/services/DependencyResolverRequest.java | 4 +-
.../apache/maven/api/services/ProjectBuilder.java | 2 +-
.../maven/api/services/ProjectBuilderRequest.java | 4 +-
.../maven/api/services/ProjectBuilderResult.java | 2 +-
.../apache/maven/api/services/ProjectManager.java | 2 +-
.../org/apache/maven/api/services/Service.java | 2 +-
.../ToolchainFactory.java} | 8 +-
.../xml/ModelXmlFactory.java} | 8 +-
.../xml/SettingsXmlFactory.java} | 8 +-
.../xml/ToolchainsXmlFactory.java} | 8 +-
.../apache/maven/api/services/xml/XmlFactory.java | 72 +++++++
.../XmlReaderException.java} | 12 +-
.../maven/api/services/xml/XmlReaderRequest.java | 222 +++++++++++++++++++++
.../XmlWriterException.java} | 12 +-
.../maven/api/services/xml/XmlWriterRequest.java | 100 ++++++++++
.../maven/internal/impl/DefaultArtifact.java | 2 +-
.../internal/impl/DefaultArtifactDeployer.java | 2 +-
.../internal/impl/DefaultArtifactInstaller.java | 2 +-
.../internal/impl/DefaultArtifactManager.java | 2 +-
.../internal/impl/DefaultArtifactResolver.java | 2 +-
.../maven/internal/impl/DefaultDependency.java | 4 +-
.../internal/impl/DefaultDependencyCollector.java | 2 +-
.../internal/impl/DefaultLocalRepository.java | 2 +-
.../internal/impl/DefaultModelXmlFactory.java | 115 +++++++++++
.../apache/maven/internal/impl/DefaultProject.java | 4 +-
.../maven/internal/impl/DefaultProjectBuilder.java | 2 +-
.../maven/internal/impl/DefaultProjectManager.java | 2 +-
.../internal/impl/DefaultRemoteRepository.java | 2 +-
.../apache/maven/internal/impl/DefaultSession.java | 19 +-
.../internal/impl/DefaultSettingsXmlFactory.java | 105 ++++++++++
.../internal/impl/DefaultToolchainsXmlFactory.java | 105 ++++++++++
58 files changed, 936 insertions(+), 128 deletions(-)
copy maven-core-api/src/main/java/org/apache/maven/api/{Listener.java => annotations/Immutable.java} (77%)
copy maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java => maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java (64%)
copy maven-core-api/src/main/java/org/apache/maven/api/{Listener.java => annotations/Nullable.java} (77%)
copy maven-core-api/src/main/java/org/apache/maven/api/{Listener.java => annotations/ThreadSafe.java} (77%)
copy maven-core-api/src/main/java/org/apache/maven/api/{JavaToolchain.java => services/ToolchainFactory.java} (87%)
copy maven-core-api/src/main/java/org/apache/maven/api/{JavaToolchain.java => services/xml/ModelXmlFactory.java} (85%)
copy maven-core-api/src/main/java/org/apache/maven/api/{JavaToolchain.java => services/xml/SettingsXmlFactory.java} (84%)
copy maven-core-api/src/main/java/org/apache/maven/api/{JavaToolchain.java => services/xml/ToolchainsXmlFactory.java} (81%)
create mode 100644 maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java
copy maven-core-api/src/main/java/org/apache/maven/api/services/{ArtifactResolverException.java => xml/XmlReaderException.java} (80%)
create mode 100644 maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java
copy maven-core-api/src/main/java/org/apache/maven/api/services/{ArtifactResolverException.java => xml/XmlWriterException.java} (80%)
create mode 100644 maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java
[maven] 01/03: Add a few methods on Session and use @see references
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d1f968dd35090032b37defe0e7f8558621475cdb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 15 11:20:40 2022 +0100
Add a few methods on Session and use @see references
---
.../main/java/org/apache/maven/api/Artifact.java | 1 +
.../main/java/org/apache/maven/api/Session.java | 88 ++++++++++++++++++++--
2 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
index 9dcaaa2..e00a74a 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
@@ -85,6 +85,7 @@ public interface Artifact
* Determines whether this artifact uses a snapshot version.
*
* @return {@code true} if the artifact is a snapshot, {@code false} otherwise.
+ * @see org.apache.maven.api.Session#isVersionSnapshot(String)
*/
boolean isSnapshot();
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Session.java b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
index d568b47..bf484da 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Session.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
@@ -27,7 +27,9 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Optional;
import java.util.Properties;
+import java.util.function.Predicate;
import org.apache.maven.api.services.ArtifactDeployer;
import org.apache.maven.api.services.ArtifactDeployerException;
@@ -35,6 +37,7 @@ import org.apache.maven.api.services.ArtifactFactory;
import org.apache.maven.api.services.ArtifactFactoryException;
import org.apache.maven.api.services.ArtifactInstaller;
import org.apache.maven.api.services.ArtifactInstallerException;
+import org.apache.maven.api.services.ArtifactManager;
import org.apache.maven.api.services.ArtifactResolver;
import org.apache.maven.api.services.ArtifactResolverException;
import org.apache.maven.api.services.ArtifactResolverResult;
@@ -48,6 +51,7 @@ import org.apache.maven.api.services.DependencyResolverResult;
import org.apache.maven.api.services.LocalRepositoryManager;
import org.apache.maven.api.services.RepositoryFactory;
import org.apache.maven.api.services.Service;
+import org.apache.maven.model.Repository;
import org.apache.maven.settings.Settings;
/**
@@ -125,6 +129,7 @@ public interface Session
/**
* Shortcut for <code>getService(RepositoryFactory.class).createLocal(...)</code>
+ * @see RepositoryFactory#createLocal(Path)
*/
default LocalRepository createLocalRepository( Path path )
throws ArtifactFactoryException, IllegalArgumentException
@@ -133,7 +138,30 @@ public interface Session
}
/**
+ * Shortcut for <code>getService(RepositoryFactory.class).createRemote(...)</code>
+ * @see RepositoryFactory#createRemote(String, String)
+ */
+ @Nonnull
+ default RemoteRepository createRemoteRepository( @Nonnull String id, @Nonnull String url )
+ {
+ return getService( RepositoryFactory.class )
+ .createRemote( id, url );
+ }
+
+ /**
+ * Shortcut for <code>getService(RepositoryFactory.class).createRemote(...)</code>
+ * @see RepositoryFactory#createRemote(Repository)
+ */
+ @Nonnull
+ default RemoteRepository createRemoteRepository( @Nonnull Repository repository )
+ {
+ return getService( RepositoryFactory.class )
+ .createRemote( repository );
+ }
+
+ /**
* Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
+ * @see ArtifactFactory#create(Session, String, String, String, String)
*/
default Artifact createArtifact( String groupId, String artifactId, String version, String extension )
throws ArtifactFactoryException, IllegalArgumentException
@@ -144,6 +172,7 @@ public interface Session
/**
* Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
+ * @see ArtifactFactory#create(Session, String, String, String, String, String, String)
*/
default Artifact createArtifact( String groupId, String artifactId, String version, String classifier,
String extension, String type )
@@ -155,6 +184,7 @@ public interface Session
/**
* Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
+ * @see ArtifactResolver#resolve(Session, Artifact)
*/
default ArtifactResolverResult resolveArtifact( Artifact artifact )
throws ArtifactResolverException, IllegalArgumentException
@@ -164,17 +194,29 @@ public interface Session
}
/**
- * Shortcut for <code>getService(ArtifactResolver.class).install(...)</code>
+ * Shortcut for <code>getService(ArtifactInstaller.class).install(...)</code>
+ * @see ArtifactInstaller#install(Session, Collection)
+ */
+ default void installArtifacts( Artifact... artifacts )
+ throws ArtifactInstallerException, IllegalArgumentException
+ {
+ installArtifacts( Arrays.asList( artifacts ) );
+ }
+
+ /**
+ * Shortcut for <code>getService(ArtifactInstaller.class).install(...)</code>
+ * @see ArtifactInstaller#install(Session, Collection)
*/
- default void installArtifact( Artifact... artifacts )
- throws ArtifactInstallerException, IllegalArgumentException
+ default void installArtifacts( Collection<Artifact> artifacts )
+ throws ArtifactInstallerException, IllegalArgumentException
{
getService( ArtifactInstaller.class )
- .install( this, Arrays.asList( artifacts ) );
+ .install( this, artifacts );
}
/**
- * Shortcut for <code>getService(ArtifactResolver.class).deploy(...)</code>
+ * Shortcut for <code>getService(ArtifactDeployer.class).deploy(...)</code>
+ * @see ArtifactDeployer#deploy(Session, RemoteRepository, Collection)
*/
default void deployArtifact( RemoteRepository repository, Artifact... artifacts )
throws ArtifactDeployerException, IllegalArgumentException
@@ -184,7 +226,39 @@ public interface Session
}
/**
+ * Shortcut for <code>getService(ArtifactManager.class).setPath(...)</code>
+ * @see ArtifactManager#setPath(Artifact, Path)
+ */
+ default void setArtifactPath( @Nonnull Artifact artifact, Path path )
+ {
+ getService( ArtifactManager.class )
+ .setPath( artifact, path );
+ }
+
+ /**
+ * Shortcut for <code>getService(ArtifactManager.class).getPath(...)</code>
+ * @see ArtifactManager#getPath(Artifact)
+ */
+ @Nonnull
+ default Optional<Path> getArtifactPath( @Nonnull Artifact artifact )
+ {
+ return getService( ArtifactManager.class )
+ .getPath( artifact );
+ }
+
+ /**
+ * Shortcut for <code>getService(ArtifactManager.class).isSnapshot(...)</code>
+ * @see ArtifactManager#isSnapshot(String)
+ */
+ default boolean isVersionSnapshot( @Nonnull String version )
+ {
+ return getService( ArtifactManager.class )
+ .isSnapshot( version );
+ }
+
+ /**
* Shortcut for <code>getService(DependencyFactory.class).create(...)</code>
+ * @see DependencyFactory#create(Session, Artifact)
*/
default Dependency createDependency( Artifact artifact )
{
@@ -194,6 +268,7 @@ public interface Session
/**
* Shortcut for <code>getService(DependencyCollector.class).collect(...)</code>
+ * @see DependencyCollector#collect(Session, Artifact)
*/
default DependencyCollectorResult collectDependencies( Artifact artifact )
throws DependencyCollectorException, IllegalArgumentException
@@ -204,6 +279,7 @@ public interface Session
/**
* Shortcut for <code>getService(DependencyCollector.class).collect(...)</code>
+ * @see DependencyCollector#collect(Session, Project)
*/
default DependencyCollectorResult collectDependencies( Project project )
throws DependencyCollectorException, IllegalArgumentException
@@ -214,6 +290,7 @@ public interface Session
/**
* Shortcut for <code>getService(DependencyCollector.class).collect(...)</code>
+ * @see DependencyCollector#collect(Session, Dependency)
*/
default DependencyCollectorResult collectDependencies( Dependency dependency )
throws DependencyCollectorException, IllegalArgumentException
@@ -224,6 +301,7 @@ public interface Session
/**
* Shortcut for <code>getService(DependencyResolver.class).resolve(...)</code>
+ * @see DependencyResolver#resolve(Session, Dependency, Predicate)
*/
default DependencyResolverResult resolveDependencies( Dependency dependency )
throws DependencyResolverException, IllegalArgumentException
[maven] 03/03: Add support for reading/writing xml models
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a036f07a6578543145c702038ff6811c4243ccc7
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 15 11:30:23 2022 +0100
Add support for reading/writing xml models
---
maven-core-api/pom.xml | 4 +
.../maven/api/services/ToolchainFactory.java | 25 +++
.../maven/api/services/xml/ModelXmlFactory.java | 27 +++
.../maven/api/services/xml/SettingsXmlFactory.java | 27 +++
.../api/services/xml/ToolchainsXmlFactory.java | 27 +++
.../apache/maven/api/services/xml/XmlFactory.java | 72 +++++++
.../maven/api/services/xml/XmlReaderException.java | 40 ++++
.../maven/api/services/xml/XmlReaderRequest.java | 222 +++++++++++++++++++++
.../maven/api/services/xml/XmlWriterException.java | 40 ++++
.../maven/api/services/xml/XmlWriterRequest.java | 100 ++++++++++
.../internal/impl/DefaultModelXmlFactory.java | 115 +++++++++++
.../apache/maven/internal/impl/DefaultSession.java | 15 ++
.../internal/impl/DefaultSettingsXmlFactory.java | 105 ++++++++++
.../internal/impl/DefaultToolchainsXmlFactory.java | 105 ++++++++++
14 files changed, 924 insertions(+)
diff --git a/maven-core-api/pom.xml b/maven-core-api/pom.xml
index 46af6de..77a9e51 100644
--- a/maven-core-api/pom.xml
+++ b/maven-core-api/pom.xml
@@ -38,6 +38,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain-model</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ToolchainFactory.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
new file mode 100644
index 0000000..97db209
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
@@ -0,0 +1,25 @@
+package org.apache.maven.api.services;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public interface ToolchainFactory
+{
+ // TODO: implement ToolchainFactory
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
new file mode 100644
index 0000000..2fa88f5
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
@@ -0,0 +1,27 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.model.Model;
+
+public interface ModelXmlFactory extends XmlFactory<Model>
+{
+
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
new file mode 100644
index 0000000..a981588
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
@@ -0,0 +1,27 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.settings.Settings;
+
+public interface SettingsXmlFactory extends XmlFactory<Settings>
+{
+
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java
new file mode 100644
index 0000000..a465ade
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java
@@ -0,0 +1,27 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.toolchain.model.PersistedToolchains;
+
+public interface ToolchainsXmlFactory extends XmlFactory<PersistedToolchains>
+{
+
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java
new file mode 100644
index 0000000..a466533
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java
@@ -0,0 +1,72 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.services.Service;
+
+public interface XmlFactory<T> extends Service
+{
+
+ @Nonnull
+ default T read( @Nonnull InputStream input ) throws XmlReaderException
+ {
+ return read( input, true );
+ }
+
+ @Nonnull
+ default T read( @Nonnull InputStream input, boolean strict ) throws XmlReaderException
+ {
+ return read( XmlReaderRequest.builder().inputStream( input ).strict( strict ).build() );
+ }
+
+ @Nonnull
+ default T read( @Nonnull Reader reader ) throws XmlReaderException
+ {
+ return read( reader, true );
+ }
+
+ @Nonnull
+ default T read( @Nonnull Reader reader, boolean strict ) throws XmlReaderException
+ {
+ return read( XmlReaderRequest.builder().reader( reader ).strict( strict ).build() );
+ }
+
+ @Nonnull
+ T read( @Nonnull XmlReaderRequest request ) throws XmlReaderException;
+
+ default void write( @Nonnull T content, @Nonnull OutputStream outputStream ) throws XmlWriterException
+ {
+ write( XmlWriterRequest.<T>builder().content( content ).outputStream( outputStream ).build() );
+ }
+
+ default void write( @Nonnull T content, @Nonnull Writer writer ) throws XmlWriterException
+ {
+ write( XmlWriterRequest.<T>builder().content( content ).writer( writer ).build() );
+ }
+
+ void write( @Nonnull XmlWriterRequest<T> request ) throws XmlWriterException;
+
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java
new file mode 100644
index 0000000..b5cd94c
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java
@@ -0,0 +1,40 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.api.services.MavenException;
+
+/**
+ *
+ */
+public class XmlReaderException
+ extends MavenException
+{
+
+ /**
+ * @param message The message for the exception.
+ * @param e The exception itself.
+ */
+ public XmlReaderException( String message, Exception e )
+ {
+ super( message, e );
+ }
+
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java
new file mode 100644
index 0000000..31a3068
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java
@@ -0,0 +1,222 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URL;
+import java.nio.file.Path;
+
+public interface XmlReaderRequest
+{
+
+ Path getPath();
+
+ URL getURL();
+
+ InputStream getInputStream();
+
+ Reader getReader();
+
+ Transformer getTransformer();
+
+ boolean isStrict();
+
+ String getModelId();
+
+ String getLocation();
+
+ boolean isAddDefaultEntities();
+
+ interface Transformer
+ {
+ /**
+ * Interpolate the value read from the xml document
+ *
+ * @param source The source value
+ * @param fieldName A description of the field being interpolated. The implementation may use this to
+ * log stuff.
+ * @return The interpolated value.
+ */
+ String transform( String source, String fieldName );
+ }
+
+ static XmlReaderRequestBuilder builder()
+ {
+ return new XmlReaderRequestBuilder();
+ }
+
+ class XmlReaderRequestBuilder
+ {
+ Path path;
+ URL url;
+ InputStream inputStream;
+ Reader reader;
+ Transformer transformer;
+ boolean strict;
+ String modelId;
+ String location;
+ boolean addDefaultEntities = true;
+
+ public XmlReaderRequestBuilder path( Path path )
+ {
+ this.path = path;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder url( URL url )
+ {
+ this.url = url;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder inputStream( InputStream inputStream )
+ {
+ this.inputStream = inputStream;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder reader( Reader reader )
+ {
+ this.reader = reader;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder transformer( Transformer transformer )
+ {
+ this.transformer = transformer;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder strict( boolean strict )
+ {
+ this.strict = strict;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder modelId( String modelId )
+ {
+ this.modelId = modelId;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder location( String location )
+ {
+ this.location = location;
+ return this;
+ }
+
+ public XmlReaderRequestBuilder addDefaultEntities( boolean addDefaultEntities )
+ {
+ this.addDefaultEntities = addDefaultEntities;
+ return this;
+ }
+
+ public XmlReaderRequest build()
+ {
+ return new DefaultXmlReaderRequest( path, url, inputStream, reader, transformer, strict,
+ modelId, location, addDefaultEntities );
+ }
+
+ private static class DefaultXmlReaderRequest implements XmlReaderRequest
+ {
+ final Path path;
+ final URL url;
+ final InputStream inputStream;
+ final Reader reader;
+ final Transformer transformer;
+ final boolean strict;
+ final String modelId;
+ final String location;
+ final boolean addDefaultEntities;
+
+ @SuppressWarnings( "checkstyle:ParameterNumber" )
+ DefaultXmlReaderRequest( Path path, URL url, InputStream inputStream, Reader reader,
+ Transformer transformer, boolean strict,
+ String modelId, String location,
+ boolean addDefaultEntities )
+ {
+ this.path = path;
+ this.url = url;
+ this.inputStream = inputStream;
+ this.reader = reader;
+ this.transformer = transformer;
+ this.strict = strict;
+ this.modelId = modelId;
+ this.location = location;
+ this.addDefaultEntities = addDefaultEntities;
+ }
+
+ @Override
+ public Path getPath()
+ {
+ return path;
+ }
+
+ @Override
+ public URL getURL()
+ {
+ return null;
+ }
+
+ @Override
+ public InputStream getInputStream()
+ {
+ return inputStream;
+ }
+
+ public Reader getReader()
+ {
+ return reader;
+ }
+
+ @Override
+ public Transformer getTransformer()
+ {
+ return transformer;
+ }
+
+ @Override
+ public boolean isStrict()
+ {
+ return strict;
+ }
+
+ @Override
+ public String getModelId()
+ {
+ return modelId;
+ }
+
+ @Override
+ public String getLocation()
+ {
+ return location;
+ }
+
+ @Override
+ public boolean isAddDefaultEntities()
+ {
+ return addDefaultEntities;
+ }
+ }
+ }
+
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java
new file mode 100644
index 0000000..6ac5f4c
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java
@@ -0,0 +1,40 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.api.services.MavenException;
+
+/**
+ *
+ */
+public class XmlWriterException
+ extends MavenException
+{
+
+ /**
+ * @param message The message for the exception.
+ * @param e The exception itself.
+ */
+ public XmlWriterException( String message, Exception e )
+ {
+ super( message, e );
+ }
+
+}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java
new file mode 100644
index 0000000..d504f44
--- /dev/null
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java
@@ -0,0 +1,100 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.OutputStream;
+import java.io.Writer;
+
+public interface XmlWriterRequest<T>
+{
+
+ OutputStream getOutputStream();
+
+ Writer getWriter();
+
+ T getContent();
+
+ static <T> XmlWriterRequestBuilder<T> builder()
+ {
+ return new XmlWriterRequestBuilder<>();
+ }
+
+ class XmlWriterRequestBuilder<T>
+ {
+ OutputStream outputStream;
+ Writer writer;
+ T content;
+
+ public XmlWriterRequestBuilder<T> outputStream( OutputStream outputStream )
+ {
+ this.outputStream = outputStream;
+ return this;
+ }
+
+ public XmlWriterRequestBuilder<T> writer( Writer writer )
+ {
+ this.writer = writer;
+ return this;
+ }
+
+ public XmlWriterRequestBuilder<T> content( T content )
+ {
+ this.content = content;
+ return this;
+ }
+
+ public XmlWriterRequest<T> build()
+ {
+ return new DefaultXmlWriterRequest<>( outputStream, writer, content );
+ }
+
+ private static class DefaultXmlWriterRequest<T> implements XmlWriterRequest<T>
+ {
+ final OutputStream outputStream;
+ final Writer writer;
+ final T content;
+
+ DefaultXmlWriterRequest( OutputStream outputStream, Writer writer, T content )
+ {
+ this.outputStream = outputStream;
+ this.writer = writer;
+ this.content = content;
+ }
+
+ @Override
+ public OutputStream getOutputStream()
+ {
+ return outputStream;
+ }
+
+ @Override
+ public Writer getWriter()
+ {
+ return writer;
+ }
+
+ @Override
+ public T getContent()
+ {
+ return content;
+ }
+ }
+ }
+}
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java
new file mode 100644
index 0000000..5dd8cdb
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java
@@ -0,0 +1,115 @@
+package org.apache.maven.internal.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.Objects;
+
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.services.xml.ModelXmlFactory;
+import org.apache.maven.api.services.xml.XmlReaderException;
+import org.apache.maven.api.services.xml.XmlReaderRequest;
+import org.apache.maven.api.services.xml.XmlWriterException;
+import org.apache.maven.api.services.xml.XmlWriterRequest;
+import org.apache.maven.model.InputSource;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3ReaderEx;
+import org.apache.maven.model.io.xpp3.MavenXpp3WriterEx;
+import org.codehaus.plexus.util.ReaderFactory;
+
+public class DefaultModelXmlFactory
+ implements ModelXmlFactory
+{
+ @Override
+ public Model read( @Nonnull XmlReaderRequest request ) throws XmlReaderException
+ {
+ Objects.requireNonNull( request, "request can not be null" );
+ Path path = request.getPath();
+ URL url = request.getURL();
+ Reader reader = request.getReader();
+ InputStream inputStream = request.getInputStream();
+ if ( path == null && url == null && reader == null && inputStream == null )
+ {
+ throw new IllegalArgumentException( "path, url, reader or inputStream must be non null" );
+ }
+ try
+ {
+ InputSource source = null;
+ if ( request.getModelId() != null || request.getLocation() != null )
+ {
+ source = new InputSource();
+ source.setModelId( request.getModelId() );
+ source.setLocation( request.getLocation() );
+ }
+ MavenXpp3ReaderEx xml = new MavenXpp3ReaderEx();
+ xml.setAddDefaultEntities( request.isAddDefaultEntities() );
+ if ( path != null )
+ {
+ reader = ReaderFactory.newXmlReader( path.toFile() );
+ }
+ else if ( url != null )
+ {
+ reader = ReaderFactory.newXmlReader( url );
+ }
+ else if ( inputStream != null )
+ {
+ reader = ReaderFactory.newXmlReader( inputStream );
+ }
+ return xml.read( reader, request.isStrict(), source );
+ }
+ catch ( Exception e )
+ {
+ throw new XmlReaderException( "Unable to read model", e );
+ }
+ }
+
+ @Override
+ public void write( XmlWriterRequest<Model> request ) throws XmlWriterException
+ {
+ Objects.requireNonNull( request, "request can not be null" );
+ Model content = Objects.requireNonNull( request.getContent(), "content can not be null" );
+ OutputStream outputStream = request.getOutputStream();
+ Writer writer = request.getWriter();
+ if ( writer == null && outputStream == null )
+ {
+ throw new IllegalArgumentException( "writer or outputStream must be non null" );
+ }
+ try
+ {
+ if ( writer != null )
+ {
+ new MavenXpp3WriterEx().write( writer, content );
+ }
+ else
+ {
+ new MavenXpp3WriterEx().write( outputStream, content );
+ }
+ }
+ catch ( Exception e )
+ {
+ throw new XmlWriterException( "Unable to write model", e );
+ }
+ }
+}
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
index 588f3f9..96f8a9a 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
@@ -53,6 +53,9 @@ import org.apache.maven.api.Project;
import org.apache.maven.api.LocalRepository;
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.services.ToolchainManager;
+import org.apache.maven.api.services.xml.ModelXmlFactory;
+import org.apache.maven.api.services.xml.SettingsXmlFactory;
+import org.apache.maven.api.services.xml.ToolchainsXmlFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.execution.MavenSession;
@@ -275,6 +278,18 @@ public class DefaultSession implements Session
{
return (T) new DefaultToolchainManager( toolchainManagerPrivate );
}
+ else if ( clazz == ModelXmlFactory.class )
+ {
+ return (T) new DefaultModelXmlFactory();
+ }
+ else if ( clazz == SettingsXmlFactory.class )
+ {
+ return (T) new DefaultSettingsXmlFactory();
+ }
+ else if ( clazz == ToolchainsXmlFactory.class )
+ {
+ return (T) new DefaultToolchainsXmlFactory();
+ }
throw new NoSuchElementException( clazz.getName() );
}
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java
new file mode 100644
index 0000000..d103ed3
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java
@@ -0,0 +1,105 @@
+package org.apache.maven.internal.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Objects;
+
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.services.xml.SettingsXmlFactory;
+import org.apache.maven.api.services.xml.XmlReaderException;
+import org.apache.maven.api.services.xml.XmlReaderRequest;
+import org.apache.maven.api.services.xml.XmlWriterException;
+import org.apache.maven.api.services.xml.XmlWriterRequest;
+import org.apache.maven.model.InputSource;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
+import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
+
+public class DefaultSettingsXmlFactory
+ implements SettingsXmlFactory
+{
+ @Override
+ public Settings read( @Nonnull XmlReaderRequest request ) throws XmlReaderException
+ {
+ Objects.requireNonNull( request, "request can not be null" );
+ Reader reader = request.getReader();
+ InputStream inputStream = request.getInputStream();
+ if ( reader == null && inputStream == null )
+ {
+ throw new IllegalArgumentException( "reader or inputStream must be non null" );
+ }
+ try
+ {
+ InputSource source = null;
+ if ( request.getModelId() != null || request.getLocation() != null )
+ {
+ source = new InputSource();
+ source.setModelId( request.getModelId() );
+ source.setLocation( request.getLocation() );
+ }
+ SettingsXpp3Reader xml = new SettingsXpp3Reader();
+ xml.setAddDefaultEntities( request.isAddDefaultEntities() );
+ if ( reader != null )
+ {
+ return xml.read( reader, request.isStrict() );
+ }
+ else
+ {
+ return xml.read( inputStream, request.isStrict() );
+ }
+ }
+ catch ( Exception e )
+ {
+ throw new XmlReaderException( "Unable to read settings", e );
+ }
+ }
+
+ @Override
+ public void write( XmlWriterRequest<Settings> request ) throws XmlWriterException
+ {
+ Objects.requireNonNull( request, "request can not be null" );
+ Settings content = Objects.requireNonNull( request.getContent(), "content can not be null" );
+ OutputStream outputStream = request.getOutputStream();
+ Writer writer = request.getWriter();
+ if ( writer == null && outputStream == null )
+ {
+ throw new IllegalArgumentException( "writer or outputStream must be non null" );
+ }
+ try
+ {
+ if ( writer != null )
+ {
+ new SettingsXpp3Writer().write( writer, content );
+ }
+ else
+ {
+ new SettingsXpp3Writer().write( outputStream, content );
+ }
+ }
+ catch ( Exception e )
+ {
+ throw new XmlWriterException( "Unable to write settings", e );
+ }
+ }
+}
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java
new file mode 100644
index 0000000..b837c6a
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java
@@ -0,0 +1,105 @@
+package org.apache.maven.internal.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Objects;
+
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.services.xml.ToolchainsXmlFactory;
+import org.apache.maven.api.services.xml.XmlReaderException;
+import org.apache.maven.api.services.xml.XmlReaderRequest;
+import org.apache.maven.api.services.xml.XmlWriterException;
+import org.apache.maven.api.services.xml.XmlWriterRequest;
+import org.apache.maven.model.InputSource;
+import org.apache.maven.toolchain.model.PersistedToolchains;
+import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
+import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Writer;
+
+public class DefaultToolchainsXmlFactory
+ implements ToolchainsXmlFactory
+{
+ @Override
+ public PersistedToolchains read( @Nonnull XmlReaderRequest request ) throws XmlReaderException
+ {
+ Objects.requireNonNull( request, "request can not be null" );
+ Reader reader = request.getReader();
+ InputStream inputStream = request.getInputStream();
+ if ( reader == null && inputStream == null )
+ {
+ throw new IllegalArgumentException( "reader or inputStream must be non null" );
+ }
+ try
+ {
+ InputSource source = null;
+ if ( request.getModelId() != null || request.getLocation() != null )
+ {
+ source = new InputSource();
+ source.setModelId( request.getModelId() );
+ source.setLocation( request.getLocation() );
+ }
+ MavenToolchainsXpp3Reader xml = new MavenToolchainsXpp3Reader();
+ xml.setAddDefaultEntities( request.isAddDefaultEntities() );
+ if ( reader != null )
+ {
+ return xml.read( reader, request.isStrict() );
+ }
+ else
+ {
+ return xml.read( inputStream, request.isStrict() );
+ }
+ }
+ catch ( Exception e )
+ {
+ throw new XmlReaderException( "Unable to read toolchains", e );
+ }
+ }
+
+ @Override
+ public void write( XmlWriterRequest<PersistedToolchains> request ) throws XmlWriterException
+ {
+ Objects.requireNonNull( request, "request can not be null" );
+ PersistedToolchains content = Objects.requireNonNull( request.getContent(), "content can not be null" );
+ OutputStream outputStream = request.getOutputStream();
+ Writer writer = request.getWriter();
+ if ( writer == null && outputStream == null )
+ {
+ throw new IllegalArgumentException( "writer or outputStream must be non null" );
+ }
+ try
+ {
+ if ( writer != null )
+ {
+ new MavenToolchainsXpp3Writer().write( writer, content );
+ }
+ else
+ {
+ new MavenToolchainsXpp3Writer().write( outputStream, content );
+ }
+ }
+ catch ( Exception e )
+ {
+ throw new XmlWriterException( "Unable to write toolchains", e );
+ }
+ }
+}
[maven] 02/03: Do not use non released api for annotations
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8113c5139eed8a8b5f9883b5e105f820868d13f0
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 15 11:27:22 2022 +0100
Do not use non released api for annotations
---
maven-core-api/pom.xml | 6 ------
.../src/main/java/org/apache/maven/api/Artifact.java | 4 ++--
.../src/main/java/org/apache/maven/api/Dependency.java | 6 +++---
.../src/main/java/org/apache/maven/api/Event.java | 2 +-
.../src/main/java/org/apache/maven/api/Exclusion.java | 2 +-
.../src/main/java/org/apache/maven/api/Listener.java | 2 +-
.../main/java/org/apache/maven/api/MojoExecution.java | 2 +-
.../src/main/java/org/apache/maven/api/Node.java | 2 +-
.../main/java/org/apache/maven/api/NodeVisitor.java | 6 ++++--
.../src/main/java/org/apache/maven/api/Project.java | 2 +-
.../java/org/apache/maven/api/RemoteRepository.java | 2 +-
.../src/main/java/org/apache/maven/api/Repository.java | 2 +-
.../src/main/java/org/apache/maven/api/Session.java | 4 ++--
.../main/java/org/apache/maven/api/SessionData.java | 6 +++---
.../api/{Listener.java => annotations/Immutable.java} | 15 +++++++--------
.../api/{Listener.java => annotations/Nonnull.java} | 18 ++++++++++++------
.../api/{Listener.java => annotations/Nullable.java} | 15 +++++++--------
.../api/{Listener.java => annotations/ThreadSafe.java} | 15 +++++++--------
.../maven/api/services/ArtifactDeployerRequest.java | 2 +-
.../maven/api/services/ArtifactFactoryRequest.java | 2 +-
.../maven/api/services/ArtifactInstallerRequest.java | 4 ++--
.../org/apache/maven/api/services/ArtifactManager.java | 2 +-
.../maven/api/services/ArtifactResolverRequest.java | 2 +-
.../org/apache/maven/api/services/BaseRequest.java | 2 +-
.../apache/maven/api/services/DependencyCollector.java | 2 +-
.../maven/api/services/DependencyCollectorRequest.java | 2 +-
.../maven/api/services/DependencyFactoryRequest.java | 2 +-
.../maven/api/services/DependencyResolverRequest.java | 4 ++--
.../org/apache/maven/api/services/ProjectBuilder.java | 2 +-
.../maven/api/services/ProjectBuilderRequest.java | 4 ++--
.../maven/api/services/ProjectBuilderResult.java | 2 +-
.../org/apache/maven/api/services/ProjectManager.java | 2 +-
.../java/org/apache/maven/api/services/Service.java | 2 +-
.../apache/maven/internal/impl/DefaultArtifact.java | 2 +-
.../maven/internal/impl/DefaultArtifactDeployer.java | 2 +-
.../maven/internal/impl/DefaultArtifactInstaller.java | 2 +-
.../maven/internal/impl/DefaultArtifactManager.java | 2 +-
.../maven/internal/impl/DefaultArtifactResolver.java | 2 +-
.../apache/maven/internal/impl/DefaultDependency.java | 4 ++--
.../internal/impl/DefaultDependencyCollector.java | 2 +-
.../maven/internal/impl/DefaultLocalRepository.java | 2 +-
.../org/apache/maven/internal/impl/DefaultProject.java | 4 ++--
.../maven/internal/impl/DefaultProjectBuilder.java | 2 +-
.../maven/internal/impl/DefaultProjectManager.java | 2 +-
.../maven/internal/impl/DefaultRemoteRepository.java | 2 +-
.../org/apache/maven/internal/impl/DefaultSession.java | 4 ++--
46 files changed, 89 insertions(+), 90 deletions(-)
diff --git a/maven-core-api/pom.xml b/maven-core-api/pom.xml
index e70bbca..46af6de 100644
--- a/maven-core-api/pom.xml
+++ b/maven-core-api/pom.xml
@@ -38,12 +38,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
index e00a74a..98ed400 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
@@ -19,8 +19,8 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Immutable;
import java.nio.file.Path;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java b/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
index d0a966d..ea208bf 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
@@ -19,9 +19,9 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
+import org.apache.maven.api.annotations.Immutable;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Event.java b/maven-core-api/src/main/java/org/apache/maven/api/Event.java
index 77c30ae..37da3d5 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Event.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Event.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java b/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java
index c87b99b..11922c4 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nullable;
public interface Exclusion
{
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java b/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
index 3d83a88..11ff825 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
/**
* A listener for session events.
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java b/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java
index cc0d621..1761ab9 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.model.Plugin;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Node.java b/maven-core-api/src/main/java/org/apache/maven/api/Node.java
index e475268..3c4ae40 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Node.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Node.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Immutable;
import java.util.List;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java b/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java
index 102c13c..2f245ae 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java
@@ -20,6 +20,8 @@ package org.apache.maven.api;
*/
+import org.apache.maven.api.annotations.Nonnull;
+
/**
* Defines a hierarchical visitor for collecting dependency node trees.
*
@@ -35,7 +37,7 @@ public interface NodeVisitor
* @return <code>true</code> to visit the specified dependency node's children, <code>false</code> to skip the
* specified dependency node's children and proceed to its next sibling
*/
- boolean enter( Node node );
+ boolean enter( @Nonnull Node node );
/**
* Ends the visit to the specified dependency node.
@@ -44,5 +46,5 @@ public interface NodeVisitor
* @return <code>true</code> to visit the specified dependency node's next sibling, <code>false</code> to skip the
* specified dependency node's next siblings and proceed to its parent
*/
- boolean leave( Node node );
+ boolean leave( @Nonnull Node node );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Project.java b/maven-core-api/src/main/java/org/apache/maven/api/Project.java
index 386dda4..844d6b3 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Project.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Project.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.List;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java b/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java
index 1790b98..399c6d8 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
public interface RemoteRepository extends Repository
{
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Repository.java b/maven-core-api/src/main/java/org/apache/maven/api/Repository.java
index dd7ac92..2f2d651 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Repository.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Repository.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
public interface Repository
{
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Session.java b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
index bf484da..03955e5 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Session.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
@@ -19,8 +19,8 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.ThreadSafe;
import java.nio.file.Path;
import java.util.Arrays;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java b/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java
index bc4d688..7b1b9c3 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java
@@ -19,9 +19,9 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
+import org.apache.maven.api.annotations.ThreadSafe;
import java.util.function.Supplier;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Immutable.java
similarity index 77%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to maven-core-api/src/main/java/org/apache/maven/api/annotations/Immutable.java
index 3d83a88..865f8d0 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Immutable.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,12 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
-/**
- * A listener for session events.
- */
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface Immutable
{
- void onEvent( @Nonnull Event event );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java
similarity index 64%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java
index 3d83a88..7b536e1 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,19 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
/**
- * A listener for session events.
+ * The annotated element must not be null.
+ * <p>
+ * Annotated fields must not be null after construction has completed.
+ * <p>
+ * When this annotation is applied to a method it applies to the method return value.
*/
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface Nonnull
{
- void onEvent( @Nonnull Event event );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nullable.java
similarity index 77%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to maven-core-api/src/main/java/org/apache/maven/api/annotations/Nullable.java
index 3d83a88..e50dc3d 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nullable.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,12 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
-/**
- * A listener for session events.
- */
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface Nullable
{
- void onEvent( @Nonnull Event event );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java b/maven-core-api/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
similarity index 77%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to maven-core-api/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
index 3d83a88..4cad589 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,12 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
-/**
- * A listener for session events.
- */
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface ThreadSafe
{
- void onEvent( @Nonnull Event event );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
index f3d865b..84a78a5 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
index 2a0c0c6..82cc44a 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.Session;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
index dd6874e..9a62a22 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
@@ -19,8 +19,8 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.util.Collection;
import java.util.Collections;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java
index 48488a5..cf9e211 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
index b902d56..16bfee8 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Objects;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java
index c5eb047..515257a 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java
index 8c8cc53..2d222b7 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.Session;
import org.apache.maven.api.Artifact;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
index d3e2aaa..b2ff8d1 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java
index 85b079d..eafac2e 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
index 0f8c67c..e20e857 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
@@ -19,8 +19,8 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
index 58d479c..78d10b0 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
index 2c36c56..e5f7299 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
@@ -19,8 +19,8 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.nio.file.Path;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
index 6476a85..ea88e02 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java
index 3904281..f667322 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java b/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java
index d43da3a..fcf8d87 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.concurrent.ThreadSafe;
+import org.apache.maven.api.annotations.ThreadSafe;
@ThreadSafe
public interface Service
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
index f2532f9..5ff2ff4 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.io.File;
import java.nio.file.Path;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
index 9dde305..39df5f1 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
index 592e495..06a0cc4 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Collection;
import java.util.List;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
index d007f93..5b4ee5d 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
index a084055..bc5b58b 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import java.util.Objects;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
index 190ab9e..c3dccd6 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
@@ -19,8 +19,8 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.util.Collection;
import java.util.Objects;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
index 74045d6..1a5efb2 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
index 2207bb9..9372576 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import java.nio.file.Path;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
index 8aaf7a1..bbcc62e 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
@@ -19,8 +19,8 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.io.File;
import java.nio.file.Path;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
index 819d35d..98841c8 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import java.io.File;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
index 079d181..78ddff4 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java
index 68bc32d..e56d542 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
index 08c296d..588f3f9 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
@@ -19,8 +19,8 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.io.File;
import java.nio.file.Path;