fix some dependencies declaration to be able to release it (clean verify failed during release:prepare)
move regexp:regexp version declaration in dependencyManagement section
git-svn-id: https://svn.apache.org/repos/asf/maven/scm/trunk@684866 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-scm-managers/maven-scm-manager-plexus/pom.xml b/maven-scm-managers/maven-scm-manager-plexus/pom.xml
index ec65f0c..1f18058 100644
--- a/maven-scm-managers/maven-scm-manager-plexus/pom.xml
+++ b/maven-scm-managers/maven-scm-manager-plexus/pom.xml
@@ -33,6 +33,10 @@
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/maven-scm-managers/pom.xml b/maven-scm-managers/pom.xml
index 0a1b5e7..f826aaf 100644
--- a/maven-scm-managers/pom.xml
+++ b/maven-scm-managers/pom.xml
@@ -31,11 +31,13 @@
<modules>
<module>maven-scm-manager-plexus</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-api</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/pom.xml b/maven-scm-providers/maven-scm-provider-bazaar/pom.xml
index 13423c9..97c7eff 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-bazaar/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
</dependency>
</dependencies>
<build>
diff --git a/maven-scm-providers/maven-scm-provider-hg/pom.xml b/maven-scm-providers/maven-scm-provider-hg/pom.xml
index 2777d10..eb89f6e 100644
--- a/maven-scm-providers/maven-scm-provider-hg/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-hg/pom.xml
@@ -18,52 +18,51 @@
-->
<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-scm-providers</artifactId>
- <groupId>org.apache.maven.scm</groupId>
- <version>1.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>maven-scm-provider-hg</artifactId>
- <name>Maven SCM Mercurial (Hg) Provider</name>
+ <parent>
+ <artifactId>maven-scm-providers</artifactId>
+ <groupId>org.apache.maven.scm</groupId>
<version>1.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-scm-provider-hg</artifactId>
+ <name>Maven SCM Mercurial (Hg) Provider</name>
+ <version>1.1-SNAPSHOT</version>
- <contributors>
- <contributor>
- <name>Thurner Rupert</name>
- <email>thurner.rupert@ymono.net</email>
- </contributor>
- <contributor>
- <name>Alain Hoang</name>
- <email>hoanga@alum.rpi.edu</email>
- </contributor>
- <contributor>
- <name>Ryan Daum</name>
- <email>ryan@darksleep.com</email>
- </contributor>
- </contributors>
+ <contributors>
+ <contributor>
+ <name>Thurner Rupert</name>
+ <email>thurner.rupert@ymono.net</email>
+ </contributor>
+ <contributor>
+ <name>Alain Hoang</name>
+ <email>hoanga@alum.rpi.edu</email>
+ </contributor>
+ <contributor>
+ <name>Ryan Daum</name>
+ <email>ryan@darksleep.com</email>
+ </contributor>
+ </contributors>
- <dependencies>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/maven-scm-providers/maven-scm-provider-perforce/pom.xml b/maven-scm-providers/maven-scm-provider-perforce/pom.xml
index 5dbb07a..e112179 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-perforce/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
</dependency>
</dependencies>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
index 626533b..409738d 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
</dependency>
</dependencies>
<build>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
index ecf100e..6765990 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
</dependency>
</dependencies>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
index d0ad30a..169d76c 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-test</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
index 2b3a988..3b19938 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
</dependency>
</dependencies>
diff --git a/maven-scm-providers/pom.xml b/maven-scm-providers/pom.xml
index dd0b2b2..64fa39d 100644
--- a/maven-scm-providers/pom.xml
+++ b/maven-scm-providers/pom.xml
@@ -42,6 +42,15 @@
<module>maven-scm-provider-synergy</module>
<module>maven-scm-provider-vss</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
diff --git a/pom.xml b/pom.xml
index 9fca80b..8e8ee30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,11 @@
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-7</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.4</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
