Skip to content
Snippets Groups Projects
Commit a52aabd5 authored by Patrick Wendell's avatar Patrick Wendell
Browse files

Revert "[maven-release-plugin] prepare release v1.1.0-rc3" 

This reverts commit b2d0493b.
parent e9bff452
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 29 deletions
assembly/pom.xml
+ 3
− 3
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
...@@ -124,8 +124,8 @@ ...@@ -124,8 +124,8 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<resource>log4j.properties</resource> <resource>log4j.properties</resource>
</transformer> </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
</transformers> </transformers>
</configuration> </configuration>
</execution> </execution>
......
bagel/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
core/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
examples/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
external/flume-sink/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
external/flume/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
external/kafka/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
external/mqtt/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
external/twitter/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
external/zeromq/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
extras/kinesis-asl/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
extras/spark-ganglia-lgpl/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
graphx/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
mllib/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
pom.xml
+ 5
− 4
View file @ a52aabd5
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
~ limitations under the License. ~ 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache</groupId> <groupId>org.apache</groupId>
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
</parent> </parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spark Project Parent POM</name> <name>Spark Project Parent POM</name>
<url>http://spark.apache.org/</url> <url>http://spark.apache.org/</url>
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
<connection>scm:git:git@github.com:apache/spark.git</connection> <connection>scm:git:git@github.com:apache/spark.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/spark.git</developerConnection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/spark.git</developerConnection>
<url>scm:git:git@github.com:apache/spark.git</url> <url>scm:git:git@github.com:apache/spark.git</url>
<tag>v1.1.0-rc3</tag> <tag>HEAD</tag>
</scm> </scm>
<developers> <developers>
<developer> <developer>
...@@ -880,7 +881,7 @@ ...@@ -880,7 +881,7 @@
<junitxml>.</junitxml> <junitxml>.</junitxml>
<filereports>${project.build.directory}/SparkTestSuite.txt</filereports> <filereports>${project.build.directory}/SparkTestSuite.txt</filereports>
<argLine>-Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> <argLine>-Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine>
<stderr /> <stderr/>
<systemProperties> <systemProperties>
<java.awt.headless>true</java.awt.headless> <java.awt.headless>true</java.awt.headless>
<spark.test.home>${session.executionRootDirectory}</spark.test.home> <spark.test.home>${session.executionRootDirectory}</spark.test.home>
......
repl/pom.xml
+ 1
− 1
View file @ a52aabd5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
sql/catalyst/pom.xml
+ 3
− 2
View file @ a52aabd5
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
~ limitations under the License. ~ 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
sql/core/pom.xml
+ 3
− 2
View file @ a52aabd5
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
~ limitations under the License. ~ 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
sql/hive-thriftserver/pom.xml
+ 3
− 2
View file @ a52aabd5
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
~ limitations under the License. ~ 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
sql/hive/pom.xml
+ 3
− 2
View file @ a52aabd5
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
~ limitations under the License. ~ 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>1.1.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment