You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bi...@apache.org on 2014/06/05 20:42:07 UTC
git commit: SLIDER-114 added apache-release maven profile,
appended -incubating to release version
Repository: incubator-slider
Updated Branches:
refs/heads/develop 23e01c796 -> 09612768e
SLIDER-114 added apache-release maven profile, appended -incubating to release version
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/09612768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/09612768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/09612768
Branch: refs/heads/develop
Commit: 09612768e5eb00b155f2107868df6367da57fa5c
Parents: 23e01c7
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Thu Jun 5 11:41:56 2014 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Thu Jun 5 11:41:56 2014 -0700
----------------------------------------------------------------------
pom.xml | 38 +++++++++++++++++++-
slider-agent/pom.xml | 4 +--
slider-agent/src/main/python/setup.py | 2 +-
slider-agent/src/packages/tarball/all.xml | 3 +-
slider-assembly/pom.xml | 3 +-
slider-core/pom.xml | 3 +-
slider-funtest/pom.xml | 3 +-
.../accumulo/accumulo-funtests/pom.xml | 3 +-
.../accumulo/slider-accumulo-provider/pom.xml | 3 +-
slider-providers/hbase/hbase-funtests/pom.xml | 3 +-
.../hbase/slider-hbase-provider/pom.xml | 3 +-
11 files changed, 49 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 54fca26..384283f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<name>Slider</name>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
@@ -1283,6 +1283,42 @@
<profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <finalName>apache-slider-${project.version}</finalName>
+ <descriptorRefs>
+ <descriptorRef>source-release-zip-tar</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<!-- local builds of everything -->
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index dfdf0ce..f508fdf 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,12 +19,11 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
<packaging>pom</packaging>
- <version>0.31.0-SNAPSHOT</version>
<name>Slider Agent</name>
<description>Slider Agent</description>
<properties>
@@ -44,6 +43,7 @@
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/packages/tarball/all.xml</descriptor>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-agent/src/main/python/setup.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/main/python/setup.py b/slider-agent/src/main/python/setup.py
index f3ff99b..421b5f9 100644
--- a/slider-agent/src/main/python/setup.py
+++ b/slider-agent/src/main/python/setup.py
@@ -17,7 +17,7 @@ from setuptools import setup
setup(
name = "slider-agent",
- version = "0.31.0-SNAPSHOT",
+ version = "0.31.0-incubating-SNAPSHOT",
packages = ['agent'],
# metadata for upload to PyPI
author = "Apache Software Foundation",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-agent/src/packages/tarball/all.xml
----------------------------------------------------------------------
diff --git a/slider-agent/src/packages/tarball/all.xml b/slider-agent/src/packages/tarball/all.xml
index a5b6ba0..72afb75 100644
--- a/slider-agent/src/packages/tarball/all.xml
+++ b/slider-agent/src/packages/tarball/all.xml
@@ -18,9 +18,10 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <!--This 'all' id is not appended to the produced bundle because we do this:
+ <!--This 'agent-all' id is not appended to the produced bundle because we do this:
http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
-->
+ <id>agent-all</id>
<formats>
<format>tar</format>
<format>tar.gz</format>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index d5fc777..6f5c40c 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -17,7 +17,6 @@
<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>
<artifactId>slider-assembly</artifactId>
- <version>0.31.0-SNAPSHOT</version>
<name>Slider Assembly</name>
<packaging>pom</packaging>
<description>
@@ -28,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index d1b4149..9ab95e8 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -18,13 +18,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-core</artifactId>
<name>Slider Core</name>
- <version>0.31.0-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Core Slider Module</description>
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 79e90cf..e56b19d 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -17,7 +17,6 @@
<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>
<artifactId>slider-funtest</artifactId>
- <version>0.31.0-SNAPSHOT</version>
<name>Slider Functional Tests</name>
<packaging>jar</packaging>
<description>
@@ -26,7 +25,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index c2d7ca9..4376a64 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -18,7 +18,6 @@
<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>
<artifactId>accumulo-funtests</artifactId>
- <version>0.31.0-SNAPSHOT</version>
<name>Slider Accumulo Provider Functional Tests</name>
<packaging>jar</packaging>
<description>
@@ -28,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-providers/accumulo/slider-accumulo-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/pom.xml b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
index 330f318..00d2cce 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -18,7 +18,6 @@
<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>
<artifactId>slider-accumulo-provider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
<name>Slider Accumulo Provider</name>
<packaging>jar</packaging>
<description>
@@ -29,7 +28,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index 30013a4..64a2991 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -18,7 +18,6 @@
<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>
<artifactId>hbase-funtests</artifactId>
- <version>0.31.0-SNAPSHOT</version>
<name>Slider HBase Provider Functional Tests</name>
<packaging>jar</packaging>
<description>
@@ -28,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/09612768/slider-providers/hbase/slider-hbase-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/pom.xml b/slider-providers/hbase/slider-hbase-provider/pom.xml
index f1b27f0..c8e17ce 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -18,7 +18,6 @@
<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>
<artifactId>slider-hbase-provider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
<name>Slider HBase Provider</name>
<packaging>jar</packaging>
<description>
@@ -30,7 +29,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-SNAPSHOT</version>
+ <version>0.31.0-incubating-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>