Author: krosenvold
Date: Sun Jun 14 09:40:45 2015
New Revision: 1685372
URL: http://svn.apache.org/r1685372
Log:
Removed windows-style line endings
Modified:
maven/shared/trunk/maven-artifact-transfer/pom.xml
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven302RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/EclipseAetherFilterTransformer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/SonatypeAetherFilterTransformer.java
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManagerTest.java
Modified: maven/shared/trunk/maven-artifact-transfer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/pom.xml?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-transfer/pom.xml Sun Jun 14 09:40:45 2015
@@ -1,223 +1,223 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- 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.
--->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-components</artifactId>
- <version>20</version>
- <relativePath>../maven-shared-components/pom.xml</relativePath>
- </parent>
-
- <artifactId>maven-artifact-transfer</artifactId>
- <version>3.0-SNAPSHOT</version>
-
- <name>Apache Maven Artifact Transfer</name>
- <description>An API to install, deploy and resolving artifacts with
Maven3</description>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-artifact-transfer</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-artifact-transfer
- </developerConnection>
-
<url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/MSHARED/component/12327114</url>
- </issueManagement>
- <distributionManagement>
- <site>
- <id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
- </site>
- </distributionManagement>
-
- <properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>org.eclipse.aether:aether-util</include>
- </includes>
- </artifactSet>
- <!-- to prevent java.lang.ClassNotFoundException:
org.eclipse.aether.util.artifact.SubArtifact (M3.1.1 - M3.3.3) -->
- <filters>
- <filter>
- <artifact>org.eclipse.aether:aether-util</artifact>
- <includes>
-
<include>org/eclipse/aether/util/artifact/SubArtifact.class</include>
- </includes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>dependency-reduced-pom.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.14</version>
- <executions>
- <execution>
- <id>sniff</id>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.1</version>
- </signature>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.6</maxJdkVersion>
- </enforceBytecodeVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>3.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <version>1.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-common-artifact-filters</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Maven 3.0.x -->
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>1.7</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-impl</artifactId>
- <version>1.7</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>1.7</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Maven 3.1.x and above -->
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>0.9.0.M2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-impl</artifactId>
- <version>0.9.0.M2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>0.9.0.M2</version>
- <!-- will be shaded -->
- </dependency>
-
- <!-- TEST -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ 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.
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-components</artifactId>
+ <version>20</version>
+ <relativePath>../maven-shared-components/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>maven-artifact-transfer</artifactId>
+ <version>3.0-SNAPSHOT</version>
+
+ <name>Apache Maven Artifact Transfer</name>
+ <description>An API to install, deploy and resolving artifacts with
Maven3</description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-artifact-transfer</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-artifact-transfer
+ </developerConnection>
+
<url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/MSHARED/component/12327114</url>
+ </issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.eclipse.aether:aether-util</include>
+ </includes>
+ </artifactSet>
+ <!-- to prevent java.lang.ClassNotFoundException:
org.eclipse.aether.util.artifact.SubArtifact (M3.1.1 - M3.3.3) -->
+ <filters>
+ <filter>
+ <artifact>org.eclipse.aether:aether-util</artifact>
+ <includes>
+
<include>org/eclipse/aether/util/artifact/SubArtifact.class</include>
+ </includes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>dependency-reduced-pom.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.14</version>
+ <executions>
+ <execution>
+ <id>sniff</id>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java16</artifactId>
+ <version>1.1</version>
+ </signature>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>1.6</maxJdkVersion>
+ </enforceBytecodeVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-common-artifact-filters</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Maven 3.0.x -->
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>1.7</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ <version>1.7</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ <version>1.7</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Maven 3.1.x and above -->
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>0.9.0.M2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ <version>0.9.0.M2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ <version>0.9.0.M2</version>
+ <!-- will be shaded -->
+ </dependency>
+
+ <!-- TEST -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
Sun Jun 14 09:40:45 2015
@@ -1,35 +1,35 @@
-package org.apache.maven.shared.artifact.deploy;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.ProjectBuildingRequest;
-
-/**
- *
- */
-public interface ArtifactDeployer
-{
-
- void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
- throws ArtifactDeployerException;
-}
+package org.apache.maven.shared.artifact.deploy;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.ProjectBuildingRequest;
+
+/**
+ *
+ */
+public interface ArtifactDeployer
+{
+
+ void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
+ throws ArtifactDeployerException;
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
Sun Jun 14 09:40:45 2015
@@ -1,34 +1,34 @@
-package org.apache.maven.shared.artifact.deploy;
-
-/*
- * 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 class ArtifactDeployerException
- extends Exception
-{
-
- public ArtifactDeployerException( String message, Exception e )
- {
- super( message, e );
- }
-
-}
+package org.apache.maven.shared.artifact.deploy;
+
+/*
+ * 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 class ArtifactDeployerException
+ extends Exception
+{
+
+ public ArtifactDeployerException( String message, Exception e )
+ {
+ super( message, e );
+ }
+
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
Sun Jun 14 09:40:45 2015
@@ -1,96 +1,96 @@
-package org.apache.maven.shared.artifact.deploy.internal;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.annotations.Component;
-import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-
-/**
- *
- */
-@Component( role = ArtifactDeployer.class )
-public class DefaultArtifactDeployer
- implements ArtifactDeployer, Contextualizable
-{
-
- private PlexusContainer container;
-
- public void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
- throws ArtifactDeployerException
- {
- try
- {
- String hint = isMaven31() ? "maven31" : "maven3";
-
- ArtifactDeployer effectiveArtifactDeployer = container.lookup(
ArtifactDeployer.class, hint );
-
- effectiveArtifactDeployer.deploy( request, mavenArtifacts );
- }
- catch ( ComponentLookupException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- }
-
- /**
- * @return true if the current Maven version is Maven 3.1.
- */
- protected static boolean isMaven31()
- {
- return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); //
Maven 3.1 specific
- }
-
- private static boolean canFindCoreClass( String className )
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass(
className );
-
- return true;
- }
- catch ( ClassNotFoundException e )
- {
- return false;
- }
- }
-
- /**
- * Injects the Plexus content.
- *
- * @param context Plexus context to inject.
- * @throws ContextException if the PlexusContainer could not be located.
- */
- public void contextualize( Context context )
- throws ContextException
- {
- container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
- }
-}
+package org.apache.maven.shared.artifact.deploy.internal;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+
+/**
+ *
+ */
+@Component( role = ArtifactDeployer.class )
+public class DefaultArtifactDeployer
+ implements ArtifactDeployer, Contextualizable
+{
+
+ private PlexusContainer container;
+
+ public void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
+ throws ArtifactDeployerException
+ {
+ try
+ {
+ String hint = isMaven31() ? "maven31" : "maven3";
+
+ ArtifactDeployer effectiveArtifactDeployer = container.lookup(
ArtifactDeployer.class, hint );
+
+ effectiveArtifactDeployer.deploy( request, mavenArtifacts );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new ArtifactDeployerException( e.getMessage(), e );
+ }
+ }
+
+ /**
+ * @return true if the current Maven version is Maven 3.1.
+ */
+ protected static boolean isMaven31()
+ {
+ return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); //
Maven 3.1 specific
+ }
+
+ private static boolean canFindCoreClass( String className )
+ {
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass(
className );
+
+ return true;
+ }
+ catch ( ClassNotFoundException e )
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Injects the Plexus content.
+ *
+ * @param context Plexus context to inject.
+ * @throws ContextException if the PlexusContainer could not be located.
+ */
+ public void contextualize( Context context )
+ throws ContextException
+ {
+ container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
+ }
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
Sun Jun 14 09:40:45 2015
@@ -1,106 +1,106 @@
-package org.apache.maven.shared.artifact.deploy.internal;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.deployment.DeployRequest;
-import org.sonatype.aether.deployment.DeploymentException;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.util.artifact.SubArtifact;
-
-/**
- *
- */
-@Component( role = ArtifactDeployer.class, hint = "maven3" )
-public class Maven30ArtifactDeployer
- implements ArtifactDeployer
-{
-
- @Requirement
- private RepositorySystem repositorySystem;
-
- public void deploy( ProjectBuildingRequest buildingRequest,
- Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
- throws ArtifactDeployerException
- {
- // prepare request
- DeployRequest request = new DeployRequest();
-
- // transform artifacts
- for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
- {
- Artifact aetherArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class,
"toArtifact",
-
org.apache.maven.artifact.Artifact.class, mavenArtifact );
- request.addArtifact( aetherArtifact );
-
- RemoteRepository aetherRepository =
- (RemoteRepository) Invoker.invoke( RepositoryUtils.class,
"toRepo",
-
org.apache.maven.artifact.repository.ArtifactRepository.class,
-
mavenArtifact.getRepository() );
- request.setRepository( aetherRepository );
-
- for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
- {
- if ( metadata instanceof ProjectArtifactMetadata )
- {
- Artifact pomArtifact = new SubArtifact( aetherArtifact,
"", "pom" );
- pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
- request.addArtifact( pomArtifact );
- }
- else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
- metadata instanceof ArtifactRepositoryMetadata )
- {
- // eaten, handled by repo system
- }
- else
- {
- // request.addMetadata( new MetadataBridge( metadata ) );
- }
- }
- }
-
- RepositorySystemSession session =
- (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
-
- // deploy
- try
- {
- repositorySystem.deploy( session, request );
- }
- catch ( DeploymentException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- }
-}
+package org.apache.maven.shared.artifact.deploy.internal;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+import org.sonatype.aether.RepositorySystem;
+import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.artifact.Artifact;
+import org.sonatype.aether.deployment.DeployRequest;
+import org.sonatype.aether.deployment.DeploymentException;
+import org.sonatype.aether.repository.RemoteRepository;
+import org.sonatype.aether.util.artifact.SubArtifact;
+
+/**
+ *
+ */
+@Component( role = ArtifactDeployer.class, hint = "maven3" )
+public class Maven30ArtifactDeployer
+ implements ArtifactDeployer
+{
+
+ @Requirement
+ private RepositorySystem repositorySystem;
+
+ public void deploy( ProjectBuildingRequest buildingRequest,
+ Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
+ throws ArtifactDeployerException
+ {
+ // prepare request
+ DeployRequest request = new DeployRequest();
+
+ // transform artifacts
+ for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
+ {
+ Artifact aetherArtifact =
+ (Artifact) Invoker.invoke( RepositoryUtils.class,
"toArtifact",
+
org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ request.addArtifact( aetherArtifact );
+
+ RemoteRepository aetherRepository =
+ (RemoteRepository) Invoker.invoke( RepositoryUtils.class,
"toRepo",
+
org.apache.maven.artifact.repository.ArtifactRepository.class,
+
mavenArtifact.getRepository() );
+ request.setRepository( aetherRepository );
+
+ for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
+ {
+ if ( metadata instanceof ProjectArtifactMetadata )
+ {
+ Artifact pomArtifact = new SubArtifact( aetherArtifact,
"", "pom" );
+ pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
+ request.addArtifact( pomArtifact );
+ }
+ else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
+ metadata instanceof ArtifactRepositoryMetadata )
+ {
+ // eaten, handled by repo system
+ }
+ else
+ {
+ // request.addMetadata( new MetadataBridge( metadata ) );
+ }
+ }
+ }
+
+ RepositorySystemSession session =
+ (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
+
+ // deploy
+ try
+ {
+ repositorySystem.deploy( session, request );
+ }
+ catch ( DeploymentException e )
+ {
+ throw new ArtifactDeployerException( e.getMessage(), e );
+ }
+ }
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
Sun Jun 14 09:40:45 2015
@@ -1,106 +1,106 @@
-package org.apache.maven.shared.artifact.deploy.internal;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.deployment.DeployRequest;
-import org.eclipse.aether.deployment.DeploymentException;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.util.artifact.SubArtifact;
-
-/**
- *
- */
-@Component( role = ArtifactDeployer.class, hint = "maven31" )
-public class Maven31ArtifactDeployer implements ArtifactDeployer
-{
-
- @Requirement
- private RepositorySystem repositorySystem;
-
- public void deploy( ProjectBuildingRequest buildingRequest,
- Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
- throws ArtifactDeployerException
- {
- // prepare request
- DeployRequest request = new DeployRequest();
-
- // transform artifacts
- for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
- {
- Artifact aetherArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class,
"toArtifact",
-
org.apache.maven.artifact.Artifact.class, mavenArtifact );
- request.addArtifact( aetherArtifact );
-
- RemoteRepository aetherRepository =
- (RemoteRepository) Invoker.invoke(
RepositoryUtils.class, "toRepo",
-
ArtifactRepository.class,
-
mavenArtifact.getRepository() );
- request.setRepository( aetherRepository );
-
- for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
- {
- if ( metadata instanceof ProjectArtifactMetadata )
- {
- Artifact pomArtifact = new SubArtifact( aetherArtifact,
"", "pom" );
- pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
- request.addArtifact( pomArtifact );
- }
- else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
- metadata instanceof ArtifactRepositoryMetadata )
- {
- // eaten, handled by repo system
- }
- else
- {
- // request.addMetadata( new MetadataBridge( metadata ) );
- }
- }
- }
-
- RepositorySystemSession session =
- (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
-
- // deploy
- try
- {
- repositorySystem.deploy( session, request );
- }
- catch ( DeploymentException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- }
-}
+package org.apache.maven.shared.artifact.deploy.internal;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.deployment.DeployRequest;
+import org.eclipse.aether.deployment.DeploymentException;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.util.artifact.SubArtifact;
+
+/**
+ *
+ */
+@Component( role = ArtifactDeployer.class, hint = "maven31" )
+public class Maven31ArtifactDeployer implements ArtifactDeployer
+{
+
+ @Requirement
+ private RepositorySystem repositorySystem;
+
+ public void deploy( ProjectBuildingRequest buildingRequest,
+ Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
+ throws ArtifactDeployerException
+ {
+ // prepare request
+ DeployRequest request = new DeployRequest();
+
+ // transform artifacts
+ for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
+ {
+ Artifact aetherArtifact =
+ (Artifact) Invoker.invoke( RepositoryUtils.class,
"toArtifact",
+
org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ request.addArtifact( aetherArtifact );
+
+ RemoteRepository aetherRepository =
+ (RemoteRepository) Invoker.invoke(
RepositoryUtils.class, "toRepo",
+
ArtifactRepository.class,
+
mavenArtifact.getRepository() );
+ request.setRepository( aetherRepository );
+
+ for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
+ {
+ if ( metadata instanceof ProjectArtifactMetadata )
+ {
+ Artifact pomArtifact = new SubArtifact( aetherArtifact,
"", "pom" );
+ pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
+ request.addArtifact( pomArtifact );
+ }
+ else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
+ metadata instanceof ArtifactRepositoryMetadata )
+ {
+ // eaten, handled by repo system
+ }
+ else
+ {
+ // request.addMetadata( new MetadataBridge( metadata ) );
+ }
+ }
+ }
+
+ RepositorySystemSession session =
+ (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
+
+ // deploy
+ try
+ {
+ repositorySystem.deploy( session, request );
+ }
+ catch ( DeploymentException e )
+ {
+ throw new ArtifactDeployerException( e.getMessage(), e );
+ }
+ }
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
Sun Jun 14 09:40:45 2015
@@ -1,35 +1,35 @@
-package org.apache.maven.shared.artifact.install;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.ProjectBuildingRequest;
-
-/**
- *
- */
-public interface ArtifactInstaller
-{
-
- void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
- throws ArtifactInstallerException;
-}
+package org.apache.maven.shared.artifact.install;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.ProjectBuildingRequest;
+
+/**
+ *
+ */
+public interface ArtifactInstaller
+{
+
+ void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
+ throws ArtifactInstallerException;
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
Sun Jun 14 09:40:45 2015
@@ -1,34 +1,34 @@
-package org.apache.maven.shared.artifact.install;
-
-/*
- * 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 class ArtifactInstallerException
- extends Exception
-{
-
- public ArtifactInstallerException( String message, Exception e )
- {
- super( message, e );
- }
-
-}
+package org.apache.maven.shared.artifact.install;
+
+/*
+ * 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 class ArtifactInstallerException
+ extends Exception
+{
+
+ public ArtifactInstallerException( String message, Exception e )
+ {
+ super( message, e );
+ }
+
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
Sun Jun 14 09:40:45 2015
@@ -1,96 +1,96 @@
-package org.apache.maven.shared.artifact.install.internal;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.annotations.Component;
-import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-
-/**
- *
- */
-@Component( role = ArtifactInstaller.class )
-public class DefaultArtifactInstaller
- implements ArtifactInstaller, Contextualizable
-{
-
- private PlexusContainer container;
-
- public void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
- throws ArtifactInstallerException
- {
- try
- {
- String hint = isMaven31() ? "maven31" : "maven3";
-
- ArtifactInstaller effectiveArtifactInstaller = container.lookup(
ArtifactInstaller.class, hint );
-
- effectiveArtifactInstaller.install( request, mavenArtifacts );
- }
- catch ( ComponentLookupException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- }
-
- /**
- * @return true if the current Maven version is Maven 3.1.
- */
- protected static boolean isMaven31()
- {
- return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); //
Maven 3.1 specific
- }
-
- private static boolean canFindCoreClass( String className )
- {
- try
- {
- Thread.currentThread().getContextClassLoader().loadClass(
className );
-
- return true;
- }
- catch ( ClassNotFoundException e )
- {
- return false;
- }
- }
-
- /**
- * Injects the Plexus content.
- *
- * @param context Plexus context to inject.
- * @throws ContextException if the PlexusContainer could not be located.
- */
- public void contextualize( Context context )
- throws ContextException
- {
- container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
- }
-}
+package org.apache.maven.shared.artifact.install.internal;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+
+/**
+ *
+ */
+@Component( role = ArtifactInstaller.class )
+public class DefaultArtifactInstaller
+ implements ArtifactInstaller, Contextualizable
+{
+
+ private PlexusContainer container;
+
+ public void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
+ throws ArtifactInstallerException
+ {
+ try
+ {
+ String hint = isMaven31() ? "maven31" : "maven3";
+
+ ArtifactInstaller effectiveArtifactInstaller = container.lookup(
ArtifactInstaller.class, hint );
+
+ effectiveArtifactInstaller.install( request, mavenArtifacts );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new ArtifactInstallerException( e.getMessage(), e );
+ }
+ }
+
+ /**
+ * @return true if the current Maven version is Maven 3.1.
+ */
+ protected static boolean isMaven31()
+ {
+ return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); //
Maven 3.1 specific
+ }
+
+ private static boolean canFindCoreClass( String className )
+ {
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass(
className );
+
+ return true;
+ }
+ catch ( ClassNotFoundException e )
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Injects the Plexus content.
+ *
+ * @param context Plexus context to inject.
+ * @throws ContextException if the PlexusContainer could not be located.
+ */
+ public void contextualize( Context context )
+ throws ContextException
+ {
+ container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
+ }
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
Sun Jun 14 09:40:45 2015
@@ -1,98 +1,98 @@
-package org.apache.maven.shared.artifact.install.internal;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.installation.InstallRequest;
-import org.sonatype.aether.installation.InstallationException;
-import org.sonatype.aether.util.artifact.SubArtifact;
-
-/**
- *
- */
-@Component( role = ArtifactInstaller.class, hint = "maven3" )
-public class Maven30ArtifactInstaller
- implements ArtifactInstaller
-{
- @Requirement
- private RepositorySystem repositorySystem;
-
- public void install( ProjectBuildingRequest buildingRequest,
- Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
- throws ArtifactInstallerException
- {
- // prepare installRequest
- InstallRequest request = new InstallRequest();
-
- // transform artifacts
- for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
- {
- Artifact mainArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
-
org.apache.maven.artifact.Artifact.class, mavenArtifact );
- request.addArtifact( mainArtifact );
-
- for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
- {
- if ( metadata instanceof ProjectArtifactMetadata )
- {
- Artifact pomArtifact = new SubArtifact( mainArtifact, "",
"pom" );
- pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
- request.addArtifact( pomArtifact );
- }
- else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
- metadata instanceof ArtifactRepositoryMetadata )
- {
- // eaten, handled by repo system
- }
- else
- {
- // request.addMetadata( new MetadataBridge( metadata ) );
- }
- }
- }
-
- RepositorySystemSession session =
- (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
-
- // install
- try
- {
- repositorySystem.install( session, request );
- }
- catch ( InstallationException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- }
-}
+package org.apache.maven.shared.artifact.install.internal;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
+import org.apache.maven.shared.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+import org.sonatype.aether.RepositorySystem;
+import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.artifact.Artifact;
+import org.sonatype.aether.installation.InstallRequest;
+import org.sonatype.aether.installation.InstallationException;
+import org.sonatype.aether.util.artifact.SubArtifact;
+
+/**
+ *
+ */
+@Component( role = ArtifactInstaller.class, hint = "maven3" )
+public class Maven30ArtifactInstaller
+ implements ArtifactInstaller
+{
+ @Requirement
+ private RepositorySystem repositorySystem;
+
+ public void install( ProjectBuildingRequest buildingRequest,
+ Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
+ throws ArtifactInstallerException
+ {
+ // prepare installRequest
+ InstallRequest request = new InstallRequest();
+
+ // transform artifacts
+ for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
+ {
+ Artifact mainArtifact =
+ (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+
org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ request.addArtifact( mainArtifact );
+
+ for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
+ {
+ if ( metadata instanceof ProjectArtifactMetadata )
+ {
+ Artifact pomArtifact = new SubArtifact( mainArtifact, "",
"pom" );
+ pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
+ request.addArtifact( pomArtifact );
+ }
+ else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
+ metadata instanceof ArtifactRepositoryMetadata )
+ {
+ // eaten, handled by repo system
+ }
+ else
+ {
+ // request.addMetadata( new MetadataBridge( metadata ) );
+ }
+ }
+ }
+
+ RepositorySystemSession session =
+ (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
+
+ // install
+ try
+ {
+ repositorySystem.install( session, request );
+ }
+ catch ( InstallationException e )
+ {
+ throw new ArtifactInstallerException( e.getMessage(), e );
+ }
+ }
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
Sun Jun 14 09:40:45 2015
@@ -1,98 +1,98 @@
-package org.apache.maven.shared.artifact.install.internal;
-
-/*
- * 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.util.Collection;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.installation.InstallRequest;
-import org.eclipse.aether.installation.InstallationException;
-import org.eclipse.aether.util.artifact.SubArtifact;
-
-/**
- *
- */
-@Component( role = ArtifactInstaller.class, hint = "maven31" )
-public class Maven31ArtifactInstaller implements ArtifactInstaller
-{
-
- @Requirement
- private RepositorySystem repositorySystem;
-
- public void install( ProjectBuildingRequest buildingRequest,
- Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
- throws ArtifactInstallerException
- {
- // prepare installRequest
- InstallRequest request = new InstallRequest();
-
- // transform artifacts
- for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
- {
- Artifact mainArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
-
org.apache.maven.artifact.Artifact.class, mavenArtifact );
- request.addArtifact( mainArtifact );
-
- for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
- {
- if ( metadata instanceof ProjectArtifactMetadata )
- {
- Artifact pomArtifact = new SubArtifact( mainArtifact, "",
"pom" );
- pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
- request.addArtifact( pomArtifact );
- }
- else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
- metadata instanceof ArtifactRepositoryMetadata )
- {
- // eaten, handled by repo system
- }
- else
- {
- // request.addMetadata( new MetadataBridge( metadata ) );
- }
- }
- }
-
- RepositorySystemSession session =
- (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
-
- // install
- try
- {
- repositorySystem.install( session, request );
- }
- catch ( InstallationException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- }
-}
+package org.apache.maven.shared.artifact.install.internal;
+
+/*
+ * 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.util.Collection;
+
+import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
+import org.apache.maven.shared.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.installation.InstallRequest;
+import org.eclipse.aether.installation.InstallationException;
+import org.eclipse.aether.util.artifact.SubArtifact;
+
+/**
+ *
+ */
+@Component( role = ArtifactInstaller.class, hint = "maven31" )
+public class Maven31ArtifactInstaller implements ArtifactInstaller
+{
+
+ @Requirement
+ private RepositorySystem repositorySystem;
+
+ public void install( ProjectBuildingRequest buildingRequest,
+ Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
+ throws ArtifactInstallerException
+ {
+ // prepare installRequest
+ InstallRequest request = new InstallRequest();
+
+ // transform artifacts
+ for ( org.apache.maven.artifact.Artifact mavenArtifact :
mavenArtifacts )
+ {
+ Artifact mainArtifact =
+ (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+
org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ request.addArtifact( mainArtifact );
+
+ for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
+ {
+ if ( metadata instanceof ProjectArtifactMetadata )
+ {
+ Artifact pomArtifact = new SubArtifact( mainArtifact, "",
"pom" );
+ pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
+ request.addArtifact( pomArtifact );
+ }
+ else if ( // metadata instanceof
SnapshotArtifactRepositoryMetadata ||
+ metadata instanceof ArtifactRepositoryMetadata )
+ {
+ // eaten, handled by repo system
+ }
+ else
+ {
+ // request.addMetadata( new MetadataBridge( metadata ) );
+ }
+ }
+ }
+
+ RepositorySystemSession session =
+ (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
+
+ // install
+ try
+ {
+ repositorySystem.install( session, request );
+ }
+ catch ( InstallationException e )
+ {
+ throw new ArtifactInstallerException( e.getMessage(), e );
+ }
+ }
+}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java?rev=1685372&r1=1685371&r2=1685372&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
Sun Jun 14 09:40:45 2015
@@ -1,51 +1,51 @@
-package org.apache.maven.shared.artifact.repository;
-
-/*
- * 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.File;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.ProjectBuildingRequest;
-
-/**
- *
- */
-public interface RepositoryManager
-{
-
- String getPathForLocalArtifact( ProjectBuildingRequest buildingRequest,
Artifact artifact );
-
- /**
- * Create a new {@code ProjectBuildingRequest} with an adjusted repository
session.
- *
- * @param request the project building request
- * @param basedir the base directory of the local repository
- * @return a new project building request
- */
- ProjectBuildingRequest setLocalRepositoryBasedir( ProjectBuildingRequest
request, File basedir );
-
- /**
- * Get the localRepositryBasedir as specified in the repository session of
the request
- *
- * @param request the build request
- * @return the local repository base directory
- */
- File getLocalRepositoryBasedir( ProjectBuildingRequest request );
-}
+package org.apache.maven.shared.artifact.repository;
+
+/*
+ * 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.File;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.ProjectBuildingRequest;
+
+/**
+ *
+ */
+public interface RepositoryManager
+{
+
+ String getPathForLocalArtifact( ProjectBuildingRequest buildingRequest,
Artifact artifact );
+
+ /**
+ * Create a new {@code ProjectBuildingRequest} with an adjusted repository
session.
+ *
+ * @param request the project building request
+ * @param basedir the base directory of the local repository
+ * @return a new project building request
+ */
+ ProjectBuildingRequest setLocalRepositoryBasedir( ProjectBuildingRequest
request, File basedir );
+
+ /**
+ * Get the localRepositryBasedir as specified in the repository session of
the request
+ *
+ * @param request the build request
+ * @return the local repository base directory
+ */
+ File getLocalRepositoryBasedir( ProjectBuildingRequest request );
+}
