[maven-release-plugin] copy for tag commons-vfs2-project-2.0
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs/tags/commons-vfs2-project-2.0@1158402 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/pom.xml b/core/pom.xml
index 9e9b997..3185c97 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -98,13 +98,7 @@
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>${vfs.parent.dir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
+ <include>LICENSE.txt</include>
</includes>
</resource>
</resources>
@@ -119,17 +113,10 @@
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
- </includes>
- </testResource>
- <testResource>
- <directory>${vfs.parent.dir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
<include>LICENSE.txt</include>
</includes>
</testResource>
</testResources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 69928eb..33c4d85 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -41,79 +41,81 @@
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs</artifactId>
+ <artifactId>commons-vfs2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs</artifactId>
+ <artifactId>commons-vfs2</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs</artifactId>
+ <artifactId>commons-vfs2</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs</artifactId>
+ <artifactId>commons-vfs2</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs</artifactId>
+ <artifactId>commons-vfs2</artifactId>
<version>${project.version}</version>
<classifier>test-sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-examples</artifactId>
+ <artifactId>commons-vfs2-examples</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-examples</artifactId>
+ <artifactId>commons-vfs2-examples</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-examples</artifactId>
+ <artifactId>commons-vfs2-examples</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-sandbox</artifactId>
+ <artifactId>commons-vfs2-sandbox</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-sandbox</artifactId>
+ <artifactId>commons-vfs2-sandbox</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-sandbox</artifactId>
+ <artifactId>commons-vfs2-sandbox</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-sandbox</artifactId>
+ <artifactId>commons-vfs2-sandbox</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs-sandbox</artifactId>
+ <artifactId>commons-vfs2-sandbox</artifactId>
<version>${project.version}</version>
<classifier>test-sources</classifier>
</dependency>
diff --git a/dist/src/assembly/bin.xml b/dist/src/assembly/bin.xml
index b9d2280..f3b814d 100644
--- a/dist/src/assembly/bin.xml
+++ b/dist/src/assembly/bin.xml
@@ -29,10 +29,10 @@
<dependencySets>
<dependencySet>
<includes>
- <include>org.apache.commons:commons-vfs*</include>
+ <include>org.apache.commons:commons-vfs2*</include>
</includes>
<excludes>
- <exclude>org.apache.commons:commons-vfs-distribution</exclude>
+ <exclude>org.apache.commons:commons-vfs2-distribution</exclude>
</excludes>
<outputDirectory></outputDirectory>
<unpack>false</unpack>
diff --git a/examples/pom.xml b/examples/pom.xml
index c2f4280..ad85d90 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -75,16 +75,10 @@
<build>
<resources>
<resource>
- <directory>..</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
<include>LICENSE.txt</include>
</includes>
</resource>
diff --git a/pom.xml b/pom.xml
index 6ba1ffc..dcd0d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>jar-manifest</id>
+ <id>vfs-jar-manifest</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
@@ -165,16 +165,6 @@
</target>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- - Copy LICENSE.txt and NOTICE.txt so that they are included
- - in the -javadoc jar file for the component.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
<execution>
<id>javadoc.resources</id>
<phase>generate-sources</phase>
@@ -390,12 +380,6 @@
<enabled>false</enabled>
</releases>
</repository>
- <repository>
- <id>apache.m1</id>
- <name>Apache Maven 1 Repository</name>
- <url>http://people.apache.org/repo/m1-snapshot-repository/</url>
- <layout>legacy</layout>
- </repository>
</repositories>
<distributionManagement>
@@ -478,5 +462,6 @@
<build>
</build>
</profile>
+
</profiles>
</project>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 6eca08e..5b16fa3 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -78,26 +78,25 @@
<build>
<resources>
<resource>
- <directory>..</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
<include>LICENSE.txt</include>
</includes>
</resource>
</resources>
+ <!-- include NOTICE/LICENSE in generated test jar -->
+ <testResources>
+ <testResource>
+ <directory>${vfs.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
