Updated Branches: refs/heads/master bc24d1f12 -> 53208acbb
[maven-release-plugin] rollback the release of drill-root-1.0.0-m1 Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/53208acb Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/53208acb Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/53208acb Branch: refs/heads/master Commit: 53208acbb81956246875667d9ca8bf8d7eb2cdf7 Parents: bc24d1f Author: Jacques Nadeau <[email protected]> Authored: Thu Sep 5 16:17:59 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Thu Sep 5 16:17:59 2013 -0700 ---------------------------------------------------------------------- common/pom.xml | 6 ++++-- contrib/pom.xml | 5 +++-- contrib/sqlline/pom.xml | 9 +++++---- contrib/storage-hbase/pom.xml | 5 +++-- distribution/pom.xml | 13 +++++++------ exec/bufferl/pom.xml | 5 +++-- exec/java-exec/pom.xml | 12 ++++++++---- exec/pom.xml | 2 +- exec/ref/pom.xml | 8 +++++--- pom.xml | 16 ++++++++-------- sqlparser/pom.xml | 8 +++++--- 11 files changed, 52 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 9b3df84..cd973e2 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,11 +1,13 @@ <?xml version="1.0"?> -<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";> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/contrib/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/pom.xml b/contrib/pom.xml index ad4f60e..e521ffe 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> -<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";> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill.contrib</groupId> <artifactId>contrib-parent</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/contrib/sqlline/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/sqlline/pom.xml b/contrib/sqlline/pom.xml index 5405619..fa8cc7f 100644 --- a/contrib/sqlline/pom.xml +++ b/contrib/sqlline/pom.xml @@ -1,11 +1,12 @@ <?xml version="1.0"?> -<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";> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>drill-root</artifactId> + <artifactId>prototype-parent</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0.0-m2-SNAPSHOT</version> - <relativePath>../../</relativePath> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>sqlline</artifactId> <name>contrib/sqlline</name> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/contrib/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index b31e0cd..a13b970 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> -<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";> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>contrib-parent</artifactId> <groupId>org.apache.drill.contrib</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>storage-hbase</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 29b78de..579d2cc 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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";> +<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> <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill</groupId> @@ -17,7 +18,7 @@ <dependency> <groupId>org.apache.drill.exec</groupId> <artifactId>java-exec</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> @@ -27,17 +28,17 @@ <dependency> <groupId>org.apache.drill.exec</groupId> <artifactId>ref</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.drill</groupId> <artifactId>common</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.drill</groupId> <artifactId>sqlparser</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>com.google.protobuf</groupId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/exec/bufferl/pom.xml ---------------------------------------------------------------------- diff --git a/exec/bufferl/pom.xml b/exec/bufferl/pom.xml index 850290e..d52cae9 100644 --- a/exec/bufferl/pom.xml +++ b/exec/bufferl/pom.xml @@ -8,14 +8,15 @@ ~ 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";> +<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";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.drill.exec</groupId> <artifactId>exec-parent</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill.exec</groupId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 3a2b0fd..2c25963 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -1,10 +1,12 @@ <?xml version="1.0"?> -<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";> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>exec-parent</artifactId> <groupId>org.apache.drill.exec</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>java-exec</artifactId> <name>exec/Java Execution Engine</name> @@ -283,12 +285,14 @@ <include name="*.proto" /> </fileset> </path> - <pathconvert pathsep=" " property="proto.files" refid="proto.path.files" /> + <pathconvert pathsep=" " property="proto.files" + refid="proto.path.files" /> <exec executable="protoc"> <arg value="--java_out=${target.gen.source.path}" /> <arg value="--proto_path=${proto.cas.path}" /> - <arg value="--proto_path=${project.basedir}/../../common/src/main/protobuf/" /> + <arg + value="--proto_path=${project.basedir}/../../common/src/main/protobuf/" /> <arg line="${proto.files}" /> </exec> </tasks> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/pom.xml b/exec/pom.xml index b2c54ad..75aafb6 100644 --- a/exec/pom.xml +++ b/exec/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill.exec</groupId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/exec/ref/pom.xml ---------------------------------------------------------------------- diff --git a/exec/ref/pom.xml b/exec/ref/pom.xml index c3601e5..a22b8b4 100644 --- a/exec/ref/pom.xml +++ b/exec/ref/pom.xml @@ -1,10 +1,12 @@ <?xml version="1.0"?> -<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";> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>exec-parent</artifactId> <groupId>org.apache.drill.exec</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>ref</artifactId> @@ -16,7 +18,7 @@ <dependency> <groupId>org.apache.drill</groupId> <artifactId>common</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c521fb1..277442f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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";> +<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> @@ -10,7 +11,7 @@ <groupId>org.apache.drill</groupId> <artifactId>drill-root</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Drill Root POM</name> @@ -27,7 +28,6 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-drill.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-drill.git</developerConnection> <url>https://github.com/apache/incubator-drill</url> - <tag>HEAD</tag> </scm> <repositories> @@ -199,7 +199,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore></ignore> </action> </pluginExecution> <pluginExecution> @@ -212,7 +212,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore></ignore> </action> </pluginExecution> <pluginExecution> @@ -226,7 +226,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore></ignore> </action> </pluginExecution> <pluginExecution> @@ -239,7 +239,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore></ignore> </action> </pluginExecution> <pluginExecution> @@ -254,7 +254,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore></ignore> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/53208acb/sqlparser/pom.xml ---------------------------------------------------------------------- diff --git a/sqlparser/pom.xml b/sqlparser/pom.xml index eb1c548..6ae2cb6 100644 --- a/sqlparser/pom.xml +++ b/sqlparser/pom.xml @@ -1,10 +1,12 @@ <?xml version="1.0"?> -<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";> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>sqlparser</artifactId> <name>SQL Parser</name> @@ -18,7 +20,7 @@ <dependency> <groupId>org.apache.drill</groupId> <artifactId>common</artifactId> - <version>1.0.0-m2-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId>
