You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2013/09/05 16:11:40 UTC
git commit: MRQL-14: Add the "-SNAPSHOT" suffix (revised)
Updated Branches:
refs/heads/master 28562c89b -> 9a97788da
MRQL-14: Add the "-SNAPSHOT" suffix (revised)
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/9a97788d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/9a97788d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/9a97788d
Branch: refs/heads/master
Commit: 9a97788da63134539c4404477d0aab4e9a29b6a2
Parents: 28562c8
Author: fegaras <fe...@cse.uta.edu>
Authored: Thu Sep 5 09:11:27 2013 -0500
Committer: fegaras <fe...@cse.uta.edu>
Committed: Thu Sep 5 09:11:27 2013 -0500
----------------------------------------------------------------------
BSP/pom.xml | 2 +-
Gen/pom.xml | 2 +-
MapReduce/pom.xml | 2 +-
Spark/pom.xml | 2 +-
dist/pom.xml | 69 --------------------------------------------------
pom.xml | 48 ++++++++++++-----------------------
6 files changed, 20 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/9a97788d/BSP/pom.xml
----------------------------------------------------------------------
diff --git a/BSP/pom.xml b/BSP/pom.xml
index 39343df..317d3c0 100644
--- a/BSP/pom.xml
+++ b/BSP/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.mrql</groupId>
<artifactId>MRQL</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.9.0-incubating-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/9a97788d/Gen/pom.xml
----------------------------------------------------------------------
diff --git a/Gen/pom.xml b/Gen/pom.xml
index 261a7af..87b109b 100644
--- a/Gen/pom.xml
+++ b/Gen/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.mrql</groupId>
<artifactId>MRQL</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.9.0-incubating-SNAPSHOT</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/9a97788d/MapReduce/pom.xml
----------------------------------------------------------------------
diff --git a/MapReduce/pom.xml b/MapReduce/pom.xml
index bf7c7a9..e46fc5c 100644
--- a/MapReduce/pom.xml
+++ b/MapReduce/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.mrql</groupId>
<artifactId>MRQL</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.9.0-incubating-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/9a97788d/Spark/pom.xml
----------------------------------------------------------------------
diff --git a/Spark/pom.xml b/Spark/pom.xml
index edc4baa..f6a1310 100644
--- a/Spark/pom.xml
+++ b/Spark/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.mrql</groupId>
<artifactId>MRQL</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.9.0-incubating-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/9a97788d/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
deleted file mode 100644
index a9c5656..0000000
--- a/dist/pom.xml
+++ /dev/null
@@ -1,69 +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.
--->
-<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>
-
- <artifactId>mrql-dist</artifactId>
- <packaging>pom</packaging>
-
- <parent>
- <groupId>org.apache.mrql</groupId>
- <artifactId>MRQL</artifactId>
- <version>0.9.0-incubating</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>bin-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>mrql-${project.version}-bin</finalName>
- </configuration>
- </execution>
- <execution>
- <id>src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>mrql-${project.version}-src</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/9a97788d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 80f45f4..448bea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.mrql</groupId>
<artifactId>MRQL</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.9.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>MRQL</name>
<description>MRQL is a query processing and optimization system for large-scale, distributed data analysis, built on top of Apache Hadoop, Hama, and Spark</description>
@@ -54,7 +54,8 @@
<module>MapReduce</module>
<module>BSP</module>
<module>Spark</module>
- <module>dist</module>
+ <module>bin-dist</module>
+ <module>src-dist</module>
</modules>
<dependencies>
@@ -97,6 +98,14 @@
<version>2.1.1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.8</version>
@@ -123,20 +132,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
<configuration>
@@ -179,24 +174,13 @@
</executions>
</plugin>
</plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-6</version>
- </extension>
- </extensions>
</build>
- <distributionManagement>
- <repository>
- <id>apache.website</id>
- <url>scpexe://people.apache.org/www/mrql.apache.org</url>
-<!--
- <url>file://target</url>
--->
- </repository>
- </distributionManagement>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-mrql.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-mrql.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=incubator-mrql.git</url>
+ </scm>
<issueManagement>
<system>JIRA</system>