mirror of https://github.com/apache/maven.git
o remove maven-artifact-test, not used anywhere
o fix shade plugin so the new uber is produced o allow plexus-utils back into the mix o take out the dep.xml assembly descriptor as shade is making the uber jar now git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531259 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl
parent
ed1901ff97
commit
05986fc6f2
|
|
@ -1,59 +0,0 @@
|
||||||
<?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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>maven</artifactId>
|
|
||||||
<groupId>org.apache.maven</groupId>
|
|
||||||
<version>2.1-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>maven-artifact-test</artifactId>
|
|
||||||
<name>Maven Artifact Test Helper Library</name>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
<version>3.8.1</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.maven</groupId>
|
|
||||||
<artifactId>maven-settings</artifactId>
|
|
||||||
<version>2.1-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.maven</groupId>
|
|
||||||
<artifactId>maven-artifact-manager</artifactId>
|
|
||||||
<version>2.1-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.maven</groupId>
|
|
||||||
<artifactId>maven-artifact</artifactId>
|
|
||||||
<version>2.1-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.plexus</groupId>
|
|
||||||
<artifactId>plexus-container-default</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
package org.apache.maven.artifact.test;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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.artifact.Artifact;
|
|
||||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
|
||||||
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
|
|
||||||
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
|
|
||||||
import org.apache.maven.settings.Settings;
|
|
||||||
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
|
|
||||||
import org.codehaus.plexus.PlexusTestCase;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileReader;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test case that builds standard artifact stuff like repositories.
|
|
||||||
*
|
|
||||||
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
|
|
||||||
* @version $Id$
|
|
||||||
*/
|
|
||||||
public abstract class ArtifactTestCase
|
|
||||||
extends PlexusTestCase
|
|
||||||
{
|
|
||||||
private ArtifactRepository localRepository;
|
|
||||||
|
|
||||||
protected File getLocalArtifactPath( Artifact artifact )
|
|
||||||
{
|
|
||||||
return new File( localRepository.getBasedir(), localRepository.pathOf( artifact ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void setUp()
|
|
||||||
throws Exception
|
|
||||||
{
|
|
||||||
super.setUp();
|
|
||||||
|
|
||||||
File settingsFile = new File( System.getProperty( "user.home" ), ".m2/settings.xml" );
|
|
||||||
String localRepo = null;
|
|
||||||
if ( settingsFile.exists() )
|
|
||||||
{
|
|
||||||
Settings settings = new SettingsXpp3Reader().read( new FileReader( settingsFile ) );
|
|
||||||
localRepo = settings.getLocalRepository();
|
|
||||||
}
|
|
||||||
if ( localRepo == null )
|
|
||||||
{
|
|
||||||
localRepo = System.getProperty( "user.home" ) + "/.m2/repository";
|
|
||||||
}
|
|
||||||
|
|
||||||
ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) container.lookup(
|
|
||||||
ArtifactRepositoryLayout.ROLE, "default" );
|
|
||||||
|
|
||||||
localRepository = new DefaultArtifactRepository( "local", "file://" + localRepo, repositoryLayout );
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -54,7 +54,6 @@ public class DefaultArtifactFilterManager implements ArtifactFilterManager
|
||||||
artifacts.add( "maven-plugin-api" );
|
artifacts.add( "maven-plugin-api" );
|
||||||
artifacts.add( "maven-plugin-descriptor" );
|
artifacts.add( "maven-plugin-descriptor" );
|
||||||
artifacts.add( "maven-plugin-parameter-documenter" );
|
artifacts.add( "maven-plugin-parameter-documenter" );
|
||||||
artifacts.add( "maven-plugin-registry" );
|
|
||||||
artifacts.add( "maven-profile" );
|
artifacts.add( "maven-profile" );
|
||||||
artifacts.add( "maven-project" );
|
artifacts.add( "maven-project" );
|
||||||
artifacts.add( "maven-reporting-api" );
|
artifacts.add( "maven-reporting-api" );
|
||||||
|
|
@ -63,7 +62,6 @@ public class DefaultArtifactFilterManager implements ArtifactFilterManager
|
||||||
artifacts.add( "plexus-container-default" );
|
artifacts.add( "plexus-container-default" );
|
||||||
artifacts.add( "plexus-component-api" );
|
artifacts.add( "plexus-component-api" );
|
||||||
artifacts.add( "plexus-interactivity-api" );
|
artifacts.add( "plexus-interactivity-api" );
|
||||||
artifacts.add( "plexus-utils" );
|
|
||||||
artifacts.add( "wagon-provider-api" );
|
artifacts.add( "wagon-provider-api" );
|
||||||
artifacts.add( "wagon-file" );
|
artifacts.add( "wagon-file" );
|
||||||
artifacts.add( "wagon-http-lightweight" );
|
artifacts.add( "wagon-http-lightweight" );
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ under the License.
|
||||||
<directory>target</directory>
|
<directory>target</directory>
|
||||||
<outputDirectory>lib</outputDirectory>
|
<outputDirectory>lib</outputDirectory>
|
||||||
<includes>
|
<includes>
|
||||||
<include>maven-embedder-*ueber.jar</include>
|
<include>maven-embedder-*uber.jar</include>
|
||||||
</includes>
|
</includes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
</fileSets>
|
</fileSets>
|
||||||
|
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
<!--
|
|
||||||
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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<assembly>
|
|
||||||
<!-- TODO: a jarjar format would be better -->
|
|
||||||
<id>dep</id>
|
|
||||||
<formats>
|
|
||||||
<format>jar</format>
|
|
||||||
</formats>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<fileSets>
|
|
||||||
<fileSet>
|
|
||||||
<directory>target/classes</directory>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
</fileSets>
|
|
||||||
<dependencySets>
|
|
||||||
<dependencySet>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<unpack>true</unpack>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
<excludes>
|
|
||||||
<exclude>junit:junit</exclude>
|
|
||||||
<exclude>commons-lang:commons-lang</exclude>
|
|
||||||
<exclude>commons-logging:commons-logging</exclude>
|
|
||||||
<exclude>commons-cli:commons-cli</exclude>
|
|
||||||
<!-- TODO: can probably be removed now -->
|
|
||||||
<exclude>plexus:plexus-container-default</exclude>
|
|
||||||
</excludes>
|
|
||||||
</dependencySet>
|
|
||||||
</dependencySets>
|
|
||||||
</assembly>
|
|
||||||
|
|
@ -37,12 +37,6 @@ under the License.
|
||||||
<artifactId>maven-build-context</artifactId>
|
<artifactId>maven-build-context</artifactId>
|
||||||
<version>2.1-SNAPSHOT</version>
|
<version>2.1-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.maven</groupId>
|
|
||||||
<artifactId>maven-artifact-test</artifactId>
|
|
||||||
<version>2.1-SNAPSHOT</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.maven</groupId>
|
<groupId>org.apache.maven</groupId>
|
||||||
<artifactId>maven-profile</artifactId>
|
<artifactId>maven-profile</artifactId>
|
||||||
|
|
|
||||||
1
pom.xml
1
pom.xml
|
|
@ -118,7 +118,6 @@ under the License.
|
||||||
<modules>
|
<modules>
|
||||||
<module>maven-artifact</module>
|
<module>maven-artifact</module>
|
||||||
<module>maven-artifact-manager</module>
|
<module>maven-artifact-manager</module>
|
||||||
<module>maven-artifact-test</module>
|
|
||||||
<module>maven-build-context</module>
|
<module>maven-build-context</module>
|
||||||
<module>maven-core</module>
|
<module>maven-core</module>
|
||||||
<module>maven-error-diagnostics</module>
|
<module>maven-error-diagnostics</module>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue