Updated Branches: refs/heads/lucene-4.0.0 c7b7f6110 -> ad0095c52
Cleaned up the maven poms Moved to using Apache as the pom parent. Fixed versioning to be -SNAPSHOT suffixed (only release code should not have the -SNAPSHOT suffix) Updated the project specific sub-module dependencies to be based on the project version variable. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ad0095c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ad0095c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ad0095c5 Branch: refs/heads/lucene-4.0.0 Commit: ad0095c52b28d3882fec733900bad2e2642fc397 Parents: c7b7f61 Author: Patrick Hunt <[email protected]> Authored: Tue Oct 23 14:40:31 2012 -0700 Committer: Patrick Hunt <[email protected]> Committed: Tue Oct 23 14:40:31 2012 -0700 ---------------------------------------------------------------------- src/blur-core/pom.xml | 15 ++++++++------- src/blur-gui/pom.xml | 11 ++++++----- src/blur-jdbc/pom.xml | 9 +++++---- src/blur-mapred/pom.xml | 11 ++++++----- src/blur-new-api-prototype/pom.xml | 2 +- src/blur-store/pom.xml | 7 ++++--- src/blur-testsuite/pom.xml | 11 ++++++----- src/blur-thrift/pom.xml | 7 ++++--- src/blur-util/pom.xml | 5 +++-- src/pom.xml | 13 ++++++++++++- 10 files changed, 55 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-core/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-core/pom.xml b/src/blur-core/pom.xml index 3373033..03d9da7 100644 --- a/src/blur-core/pom.xml +++ b/src/blur-core/pom.xml @@ -19,12 +19,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-core</artifactId> <packaging>jar</packaging> @@ -38,28 +39,28 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-store</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-gui</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-gui</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-gui/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-gui/pom.xml b/src/blur-gui/pom.xml index 46629ca..5afe3d4 100644 --- a/src/blur-gui/pom.xml +++ b/src/blur-gui/pom.xml @@ -19,12 +19,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-gui</artifactId> <packaging>war</packaging> @@ -38,17 +39,17 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-store</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/pom.xml b/src/blur-jdbc/pom.xml index db5bff0..d6fed70 100644 --- a/src/blur-jdbc/pom.xml +++ b/src/blur-jdbc/pom.xml @@ -19,12 +19,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-jdbc</artifactId> <packaging>jar</packaging> @@ -34,12 +35,12 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-mapred/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-mapred/pom.xml b/src/blur-mapred/pom.xml index e2f0c8a..0d4250f 100644 --- a/src/blur-mapred/pom.xml +++ b/src/blur-mapred/pom.xml @@ -11,12 +11,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-mapred</artifactId> <packaging>jar</packaging> @@ -32,17 +33,17 @@ <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-core</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-store</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-new-api-prototype/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-new-api-prototype/pom.xml b/src/blur-new-api-prototype/pom.xml index c64c54d..4eb8c8a 100644 --- a/src/blur-new-api-prototype/pom.xml +++ b/src/blur-new-api-prototype/pom.xml @@ -16,7 +16,7 @@ <artifactId>blur-new-api-prototype</artifactId> <packaging>jar</packaging> <name>Blur New API Prototype</name> - <version>0.2</version> + <version>0.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-store/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-store/pom.xml b/src/blur-store/pom.xml index 09b7be2..172082c 100644 --- a/src/blur-store/pom.xml +++ b/src/blur-store/pom.xml @@ -19,12 +19,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-store</artifactId> <packaging>jar</packaging> @@ -34,7 +35,7 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-testsuite/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-testsuite/pom.xml b/src/blur-testsuite/pom.xml index bb2fa4e..43b39e2 100644 --- a/src/blur-testsuite/pom.xml +++ b/src/blur-testsuite/pom.xml @@ -19,12 +19,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-testsuite</artifactId> <packaging>jar</packaging> @@ -34,17 +35,17 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-core</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-mapred</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-thrift/pom.xml b/src/blur-thrift/pom.xml index c55fe03..c57496a 100644 --- a/src/blur-thrift/pom.xml +++ b/src/blur-thrift/pom.xml @@ -19,12 +19,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> <packaging>jar</packaging> @@ -34,7 +35,7 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>0.2.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.thrift</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/blur-util/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-util/pom.xml b/src/blur-util/pom.xml index 2a4900d..5f8fa78 100644 --- a/src/blur-util/pom.xml +++ b/src/blur-util/pom.xml @@ -19,12 +19,13 @@ 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0</version> + <version>0.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ad0095c5/src/pom.xml ---------------------------------------------------------------------- diff --git a/src/pom.xml b/src/pom.xml index ead804a..f407a88 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -20,11 +20,22 @@ 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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>11</version> + </parent> + <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> + <version>0.2.0-SNAPSHOT</version> <packaging>pom</packaging> - <version>0.2.0</version> + <name>Blur</name> + <description>Blur is a search platform capable of searching massive amounts of data in a cloud computing environment.</description> + <url>http://incubator.apache.org/blur/</url> + <inceptionYear>2012</inceptionYear> <modules> <module>blur-core</module>
