You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/01/11 17:45:45 UTC
[01/19] incubator-slider git commit: SLIDER-672 building release
profile
Repository: incubator-slider
Updated Branches:
refs/heads/branches/branch-0.6 [created] 909ab8521
SLIDER-672 building release profile
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e91d1531
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e91d1531
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e91d1531
Branch: refs/heads/branches/branch-0.6
Commit: e91d153156158713acbd4d10766a12a61083690d
Parents: b70d830
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 24 13:37:32 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:24:23 2015 +0000
----------------------------------------------------------------------
pom.xml | 146 +++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 98 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e91d1531/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6cf66ab..a87df7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,8 @@
<maven-doxia-module-markdown.version>1.4</maven-doxia-module-markdown.version>
<maven-enforcer-plugin.version>1.0</maven-enforcer-plugin.version>
<maven-exec-plugin.version>1.2.1</maven-exec-plugin.version>
+ <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
+ <maven-groovydoc-plugin.version>1.3</maven-groovydoc-plugin.version>
<maven-jar-plugin.version>2.3.1</maven-jar-plugin.version>
<maven.javadoc.version>2.8</maven.javadoc.version>
<maven.project.version>2.4</maven.project.version>
@@ -1400,7 +1402,77 @@
</execution>
</executions>
</plugin>
- </plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>com.bluetrainsoftware.maven</groupId>
+ <artifactId>maven-groovydoc-plugin</artifactId>
+ <version>${maven-groovydoc-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>attach-docs</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${maven-gpg-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- We want to deploy the artifact to a staging location for perusal -->
+ <!--
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${maven-deploy-plugin.version}</version>
+ <configuration>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ -->
+ </plugins>
</build>
</profile>
@@ -1462,53 +1534,6 @@
</profile>
<profile>
- <!-- anything for a github release -->
- <!-- see https://github.com/github/maven-plugins-->
- <!-- this doesn't seem to work and is not in active us-->
- <id>github</id>
- <properties>
- <maven-site-plugin.skipDeploy>false</maven-site-plugin.skipDeploy>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.github</groupId>
- <artifactId>site-maven-plugin</artifactId>
- <version>${github.site.plugin.version}</version>
- <inherited>true</inherited>
- <configuration>
- <message>Creating site for ${project.version}</message>
- <dryRun>false</dryRun>
- <repositoryName>slider</repositoryName>
- <repositoryOwner>hortonworks</repositoryOwner>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>site</goal>
- </goals>
- <phase>site-deploy</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>${maven-deploy-plugin.version}</version>
- <configuration>
- <altDeploymentRepository>
- internal.repo::default::file://${project.build.directory}/mvn-repo
- </altDeploymentRepository>
- </configuration>
- </plugin>
-
-
- </plugins>
- </build>
-
- </profile>
-
- <profile>
<id>strict</id>
<!--enable this if you want to get told off about dependency conflict-->
<build>
@@ -1543,6 +1568,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
+ <version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -1579,6 +1605,30 @@
</repository>
</repositories>
</profile>
+
+ <!-- see https://github.com/rvowles/maven-groovydoc-plugin -->
+ <profile>
+ <id>groovydoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.bluetrainsoftware.maven</groupId>
+ <artifactId>maven-groovydoc-plugin</artifactId>
+ <version>${maven-groovydoc-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-docs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-docs</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
[13/19] incubator-slider git commit: SLIDER-655 undo removal of app
packages from parent pom temporarily
Posted by st...@apache.org.
SLIDER-655 undo removal of app packages from parent pom temporarily
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d5dfdcc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d5dfdcc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d5dfdcc8
Branch: refs/heads/branches/branch-0.6
Commit: d5dfdcc8839addfebb37ce02bc8bfd3acfa23d42
Parents: 0692d63
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Thu Dec 4 14:15:11 2014 -0800
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:45:04 2015 +0000
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d5dfdcc8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4c5152..f2fe4cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
<module>slider-providers/hbase/hbase-funtests</module>
<module>slider-providers/accumulo/slider-accumulo-provider</module>
<module>slider-providers/accumulo/accumulo-funtests</module>
+ <module>app-packages</module>
</modules>
<licenses>
[05/19] incubator-slider git commit: SLIDER-671 apache-release
profile working, as does normal one. A full public release has not been tested
Posted by st...@apache.org.
SLIDER-671 apache-release profile working, as does normal one. A full public release has not been tested
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f722d34e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f722d34e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f722d34e
Branch: refs/heads/branches/branch-0.6
Commit: f722d34e278c200c01bda7a6f1a348d6dd14d1b4
Parents: e69a8d8
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 26 15:35:00 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:25:19 2015 +0000
----------------------------------------------------------------------
pom.xml | 78 +++++++++++++++++++++++-------------------------------------
1 file changed, 30 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f722d34e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f51c104..576e4fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
<!-- artifacts used in plugins -->
<apache-resources.version>1.0.4</apache-resources.version>
+ <apache-source-release-assembly-descriptor.version>1.0.4</apache-source-release-assembly-descriptor.version>
<gmavenVersion>1.5</gmavenVersion>
<gmavenProviderSelection>2.0</gmavenProviderSelection>
<groovy-eclipse-compiler.version>2.8.0-01</groovy-eclipse-compiler.version>
@@ -209,7 +210,7 @@
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<maven-groovydoc-plugin.version>1.3</maven-groovydoc-plugin.version>
<maven-jar-plugin.version>2.5</maven-jar-plugin.version>
- <maven.javadoc.version>2.9.1</maven.javadoc.version>
+ <maven.javadoc.version>2.10.1</maven.javadoc.version>
<maven.project.version>2.4</maven.project.version>
<maven.properties.version>1.0-alpha-2</maven.properties.version>
<maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
@@ -319,38 +320,8 @@
</goals>
</execution>
</executions>
-
</plugin>
- <!-- Create a source-release artifact that contains the fully buildable
- project directory source structure. This is the artifact which is
- the official subject of any release vote. -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>${apache-resources.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -393,6 +364,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -1119,18 +1091,6 @@
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-x-discovery</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-x-discovery-server</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
@@ -1426,6 +1386,9 @@
<id>apache-release</id>
<build>
<plugins>
+ <!-- Create a source-release artifact that contains the fully buildable
+ project directory source structure. This is the artifact which is
+ the official subject of any release vote. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -1434,7 +1397,7 @@
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.4</version>
+ <version>${apache-source-release-assembly-descriptor.version}</version>
</dependency>
</dependencies>
<executions>
@@ -1470,10 +1433,10 @@
</executions>
</plugin>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -1483,7 +1446,6 @@
</execution>
</executions>
</plugin>
- -->
<!--
<plugin>
<groupId>com.bluetrainsoftware.maven</groupId>
@@ -1682,8 +1644,28 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>javadoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
</project>
[15/19] incubator-slider git commit: SLIDER-671 cull windows profiles;
enhance release profile to omit app-packages module
Posted by st...@apache.org.
SLIDER-671 cull windows profiles; enhance release profile to omit app-packages module
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4945c665
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4945c665
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4945c665
Branch: refs/heads/branches/branch-0.6
Commit: 4945c66596347a2f7f021c20b942cca54b2ce623
Parents: 8f4574c
Author: Steve Loughran <st...@apache.org>
Authored: Fri Dec 5 14:19:50 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:45:47 2015 +0000
----------------------------------------------------------------------
pom.xml | 49 ++++++++++++++++---------------------------------
1 file changed, 16 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4945c665/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f2fe4cf..55ec026 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1329,36 +1329,6 @@
<profiles>
<profile>
- <id>Non-Windows</id>
- <activation>
- <os>
- <family>!windows</family>
- </os>
- </activation>
- <modules>
-<!--
- <module>app-packages/accumulo</module>
- <module>app-packages/hbase</module>
- <module>app-packages/storm</module>
--->
- </modules>
- </profile>
-
- <profile>
- <id>Windows</id>
- <activation>
- <os>
- <family>windows</family>
- </os>
- </activation>
- <modules>
-<!--
- <module>app-packages/hbase-win</module>
- <module>app-packages/storm-win</module>
--->
- </modules>
- </profile>
- <profile>
<id>rat</id>
<build>
<plugins>
@@ -1394,13 +1364,26 @@
</plugins>
</build>
</profile>
+
<profile>
<id>apache-release</id>
+ <!--
+ Build the release artifacts which become
+ the official subject of any release vote.
+
+ The process explicitly skips the app-packages as they are to be released
+ separately.
+ -->
+ <modules>
+ <module>app-packages/command-logger/application-pkg</module>
+ <module>app-packages/command-logger/slider-pkg</module>
+ <module>slider-core</module>
+ <module>slider-agent</module>
+ <module>slider-assembly</module>
+ <module>slider-funtest</module>
+ </modules>
<build>
<plugins>
- <!-- Create a source-release artifact that contains the fully buildable
- project directory source structure. This is the artifact which is
- the official subject of any release vote. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
[10/19] incubator-slider git commit: SLIDER-655 POM for app-packages:
correct relative path to parent pom.xml
Posted by st...@apache.org.
SLIDER-655 POM for app-packages: correct relative path to parent pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9807480c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9807480c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9807480c
Branch: refs/heads/branches/branch-0.6
Commit: 9807480c924a3573d4c6a66ca51a37085ab53bb8
Parents: 8a4891e
Author: tedyu <yu...@gmail.com>
Authored: Wed Dec 3 10:22:33 2014 -0800
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:39:27 2015 +0000
----------------------------------------------------------------------
app-packages/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9807480c/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index b02b79c..cb45e98 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<version>0.61.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.slider.packages</groupId>
@@ -43,4 +43,4 @@
</dependencies>
</project>
-
\ No newline at end of file
+
[06/19] incubator-slider git commit: SLIDER-671 pom fixup: all
plugins have version references, no modules have explicit JAR versions,
hbase->0.99.0
Posted by st...@apache.org.
SLIDER-671 pom fixup: all plugins have version references, no modules have explicit JAR versions, hbase->0.99.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1f183bf4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1f183bf4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1f183bf4
Branch: refs/heads/branches/branch-0.6
Commit: 1f183bf402cc900b6becaead80f89fd679e7ae81
Parents: f722d34
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 28 18:22:23 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:26:01 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +
.../command-logger/application-pkg/pom.xml | 1 +
app-packages/command-logger/slider-pkg/pom.xml | 1 +
app-packages/hbase-win/pom.xml | 3 +-
app-packages/hbase/pom.xml | 4 ++
app-packages/storm/pom.xml | 3 +-
pom.xml | 13 ++++--
slider-funtest/pom.xml | 48 +++-----------------
8 files changed, 28 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 469ca85..cee1041 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -145,6 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/accumulo.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
@@ -241,6 +242,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index 2c1fd46..75462f4 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -37,6 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/packages/tarball/all.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index f7514dc..180396f 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -38,6 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/command-logger.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 55c4c53..14bbcce 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy</id>
@@ -61,6 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/hbase.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 6caef05..ca54e57 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -98,6 +98,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/hbase.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
@@ -138,6 +139,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<id>run-integration-tests</id>
@@ -164,6 +166,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -181,6 +184,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- can't figure out how to get the surefire plugin not to pick up the ITs, so skip it entirely -->
<skip>true</skip>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 00ec044..b586a73 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy</id>
@@ -60,6 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/storm.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 576e4fe..7849bd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,9 +139,8 @@
-->
<hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
- <hbase.version>0.98.4-hadoop2</hbase.version>
+ <hbase.version>0.99.0</hbase.version>
<accumulo.version>1.6.1</accumulo.version>
-
<!--
artifact versions
-->
@@ -170,6 +169,7 @@
<jsr311-api.version>1.1.1</jsr311-api.version>
<jaxb-api.version>2.2.7</jaxb-api.version>
<jsp.version>2.1</jsp.version>
+ <jsch.version>0.1.51</jsch.version>
<junit.version>4.11</junit.version>
<log4j.version>1.2.17</log4j.version>
<metrics.version>3.0.1</metrics.version>
@@ -180,6 +180,7 @@
<protobuf.version>2.5.0</protobuf.version>
<slf4j.version>1.7.5</slf4j.version>
+ <storm.version>0.9.3</storm.version>
<stringtemplate.version>2.4.1</stringtemplate.version>
<zookeeper.version>3.4.6</zookeeper.version>
@@ -1132,7 +1133,7 @@
<version>${slf4j.version}</version>
</dependency>
- <!-- Used for unit testing -->
+ <!-- Used for testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -1145,6 +1146,12 @@
<version>${protobuf.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>${jsch.version}</version>
+ </dependency>
+
<!-- ======================================================== -->
<!-- Jersey and webapp support -->
<!-- ======================================================== -->
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1f183bf4/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index b5ef62e..deba7ed 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -67,6 +67,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -212,7 +213,6 @@
<artifactId>hbase-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
@@ -227,42 +227,6 @@
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-it</artifactId>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop-compat</artifactId>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop2-compat</artifactId>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
<groupId>org.apache.bigtop.itest</groupId>
<artifactId>itest-common</artifactId>
</dependency>
@@ -284,14 +248,14 @@
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.51</version>
</dependency>
</dependencies>
[18/19] incubator-slider git commit: SLIDER-745 updating release POMs
for 0.61.0
Posted by st...@apache.org.
SLIDER-745 updating release POMs for 0.61.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a651f7a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a651f7a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a651f7a3
Branch: refs/heads/branches/branch-0.6
Commit: a651f7a36e6a5f570b1f244e319707aff386e7fc
Parents: 98ae5d8
Author: Steve Loughran <st...@apache.org>
Authored: Sat Jan 10 17:14:57 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 17:14:57 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/pom.xml | 2 +-
app-packages/storm-win/pom.xml | 2 +-
app-packages/storm/pom.xml | 2 +-
pom.xml | 4 ++--
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 2 +-
slider-providers/accumulo/accumulo-funtests/pom.xml | 2 +-
slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
slider-providers/hbase/slider-hbase-provider/pom.xml | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 2f8ec86..41dd7dd 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index 75462f4..d3662e0 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index 180396f..c57c3e8 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 3c8e554..12a71a7 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 6ddcf0d..b04668d 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index 7550692..6fba23d 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.61.0-SNAPSHOT</version>
+ <version>0.61.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index bea6b2d..3e08bfe 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 822a91e..5c6d87c 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7832eff..d409d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<name>Slider</name>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<packaging>pom</packaging>
<description>
@@ -136,7 +136,7 @@
<!--
core artifacts
-->
- <hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
+ <hadoop.version>2.6.0</hadoop.version>
<hbase.version>0.99.0</hbase.version>
<accumulo.version>1.6.1</accumulo.version>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 332d5d1..7f2fc9f 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index cd4b6e6..47fba0a 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 9c616c3..a28a253 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index deba7ed..e7d3ef8 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
</parent>
<properties>
<work.dir>package-tmp</work.dir>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/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 ec48f59..f294fdd 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/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 99d7b65..fa8186f 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/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 dd55a93..ea4931c 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a651f7a3/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 71c4d27..4cfed3a 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.60.0-incubating</version>
+ <version>0.61.0</version>
<relativePath>../../../</relativePath>
</parent>
[03/19] incubator-slider git commit: SLIDER-672 update the pom with
the conf info from the latest reference ASF pom
Posted by st...@apache.org.
SLIDER-672 update the pom with the conf info from the latest reference ASF pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e61f7854
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e61f7854
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e61f7854
Branch: refs/heads/branches/branch-0.6
Commit: e61f7854fcdbbb05b952541fadda43870fae711e
Parents: 2b8d6e1
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 25 16:21:29 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:24:53 2015 +0000
----------------------------------------------------------------------
pom.xml | 81 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 67 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e61f7854/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91c655e..f51c104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,39 +184,45 @@
<zookeeper.version>3.4.6</zookeeper.version>
- <!-- Plugin versions -->
+ <!-- artifacts used in plugins -->
+ <apache-resources.version>1.0.4</apache-resources.version>
<gmavenVersion>1.5</gmavenVersion>
<gmavenProviderSelection>2.0</gmavenProviderSelection>
<groovy-eclipse-compiler.version>2.8.0-01</groovy-eclipse-compiler.version>
<groovy-eclipse-batch.version>2.1.3-01</groovy-eclipse-batch.version>
<buildnumber-maven-plugin.version>1.2</buildnumber-maven-plugin.version>
-
+
<maven.version.range>[3.0.0,)</maven.version.range>
-
+
+ <!-- Plugin versions -->
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
<maven.cobertura.version>2.5.2</maven.cobertura.version>
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
- <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
+ <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-doxia-module-markdown.version>1.4</maven-doxia-module-markdown.version>
- <maven-enforcer-plugin.version>1.0</maven-enforcer-plugin.version>
+ <maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
<maven-exec-plugin.version>1.2.1</maven-exec-plugin.version>
+ <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<maven-groovydoc-plugin.version>1.3</maven-groovydoc-plugin.version>
- <maven-jar-plugin.version>2.3.1</maven-jar-plugin.version>
- <maven.javadoc.version>2.8</maven.javadoc.version>
+ <maven-jar-plugin.version>2.5</maven-jar-plugin.version>
+ <maven.javadoc.version>2.9.1</maven.javadoc.version>
<maven.project.version>2.4</maven.project.version>
<maven.properties.version>1.0-alpha-2</maven.properties.version>
<maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
+ <maven-release-plugin.version>2.5.1</maven-release-plugin.version>
+ <maven-remote-resources-plugin.version>1.5</maven-remote-resources-plugin.version>
+ <maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<maven-rpm-plugin.version>2.1-alpha-4</maven-rpm-plugin.version>
- <maven-site-plugin.version>3.3</maven-site-plugin.version>
- <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
- <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
- <maven-surefire-report-plugin.version>2.16</maven-surefire-report-plugin.version>
- <maven-failsafe-plugin.version>2.16</maven-failsafe-plugin.version>
- <apache-rat-plugin.version>0.10</apache-rat-plugin.version>
+ <maven-site-plugin.version>3.4</maven-site-plugin.version>
+ <maven-source-plugin.version>2.3</maven-source-plugin.version>
+ <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
+ <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
+ <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
+ <apache-rat-plugin.version>0.11</apache-rat-plugin.version>
<!-- build options-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -313,8 +319,38 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
+ <!-- Create a source-release artifact that contains the fully buildable
+ project directory source structure. This is the artifact which is
+ the official subject of any release vote. -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>${apache-resources.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -353,6 +389,23 @@
</executions>
</plugin>
+ <!-- We want to package up license resources in the JARs produced -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
[14/19] incubator-slider git commit: SLIDER-655 fix rat check
Posted by st...@apache.org.
SLIDER-655 fix rat check
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8f4574c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8f4574c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8f4574c7
Branch: refs/heads/branches/branch-0.6
Commit: 8f4574c786529b4d3842fd3e2f2c2cc316029a0a
Parents: d5dfdcc
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Thu Dec 4 15:35:21 2014 -0800
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:45:36 2015 +0000
----------------------------------------------------------------------
app-packages/pom.xml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8f4574c7/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index 7925cfb..7550692 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -65,6 +65,33 @@
<module>storm-win</module>
</modules>
</profile>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>**/*.json</exclude>
+ <exclude>**/test_password_file</exclude>
+ <exclude>command-logger/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
[04/19] incubator-slider git commit: SLIDER-671 stub java class and
package-info for funtests package,
so that javadocs doesn't fail on that module
Posted by st...@apache.org.
SLIDER-671 stub java class and package-info for funtests package, so that javadocs doesn't fail on that module
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e69a8d8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e69a8d8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e69a8d8c
Branch: refs/heads/branches/branch-0.6
Commit: e69a8d8c7a08884cee4c528e9a0bdca12a2a0598
Parents: e61f785
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 26 15:34:21 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:25:07 2015 +0000
----------------------------------------------------------------------
.../funtest/StubToForceGroovySrcToCompile.java | 2 +-
.../org/apache/slider/funtest/package-info.java | 25 ++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e69a8d8c/slider-funtest/src/main/java/org/apache/slider/funtest/StubToForceGroovySrcToCompile.java
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/java/org/apache/slider/funtest/StubToForceGroovySrcToCompile.java b/slider-funtest/src/main/java/org/apache/slider/funtest/StubToForceGroovySrcToCompile.java
index 4007c0e..5a054ee 100644
--- a/slider-funtest/src/main/java/org/apache/slider/funtest/StubToForceGroovySrcToCompile.java
+++ b/slider-funtest/src/main/java/org/apache/slider/funtest/StubToForceGroovySrcToCompile.java
@@ -18,5 +18,5 @@
package org.apache.slider.funtest;
-class StubToForceGroovySrcToCompile {
+public class StubToForceGroovySrcToCompile {
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e69a8d8c/slider-funtest/src/main/java/org/apache/slider/funtest/package-info.java
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/java/org/apache/slider/funtest/package-info.java b/slider-funtest/src/main/java/org/apache/slider/funtest/package-info.java
new file mode 100644
index 0000000..3060812
--- /dev/null
+++ b/slider-funtest/src/main/java/org/apache/slider/funtest/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * Slider Functional Test Module.
+ * <p>
+ * This module contains slider's functional test runner, which is derived
+ * from the Apache Bigtop Test runner.
+ */
+package org.apache.slider.funtest;
\ No newline at end of file
[12/19] incubator-slider git commit: SLIDER-655 fixup app-package/pom
to select different modules based on platform
Posted by st...@apache.org.
SLIDER-655 fixup app-package/pom to select different modules based on platform
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0692d635
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0692d635
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0692d635
Branch: refs/heads/branches/branch-0.6
Commit: 0692d635f75f67c63826d33dad14ead65d0901de
Parents: 44c471a
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 18:28:13 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:39:47 2015 +0000
----------------------------------------------------------------------
app-packages/pom.xml | 40 +++++++++++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0692d635/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index cb45e98..7925cfb 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -27,20 +27,46 @@
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
<packaging>pom</packaging>
- <name>Slider Storm App Package</name>
- <description>Slider Storm App Packages: Zip files containing applications that slider can deploy</description>
+ <name>Slider App Packages</name>
+ <description>Slider App Packages: Zip files containing applications that slider can deploy</description>
<modules>
- <module>hbase</module>
- <module>accumulo</module>
- <module>storm</module>
+
</modules>
<build>
</build>
- <dependencies>
- </dependencies>
+ <profiles>
+
+ <profile>
+ <id>Non-Windows</id>
+ <activation>
+ <os>
+ <family>!windows</family>
+ </os>
+ </activation>
+ <modules>
+ <module>accumulo</module>
+ <module>hbase</module>
+ <module>storm</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>Windows</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <modules>
+ <module>hbase-win</module>
+ <module>storm-win</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
[07/19] incubator-slider git commit: SLIDER-655 split app packages
out of slider POM for independent releases
Posted by st...@apache.org.
SLIDER-655 split app packages out of slider POM for independent releases
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/90e3d28d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/90e3d28d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/90e3d28d
Branch: refs/heads/branches/branch-0.6
Commit: 90e3d28d9c8c7428ba762209f9febfdd5c20a33e
Parents: 1f183bf
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 15:35:01 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:26:37 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 1 +
app-packages/hbase-win/appConfig-default.json | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/hbase/pom.xml | 1 +
app-packages/storm-win/pom.xml | 1 +
app-packages/storm/appConfig-default.json | 8 ++++----
app-packages/storm/pom.xml | 1 +
8 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index cee1041..2246ecf 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -23,6 +23,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-accumulo-app-package</artifactId>
<packaging>jar</packaging>
<name>Slider Accumulo App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/hbase-win/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json
index 04cb9a9..719a743 100644
--- a/app-packages/hbase-win/appConfig-default.json
+++ b/app-packages/hbase-win/appConfig-default.json
@@ -8,7 +8,7 @@
"java_home": "C:\\java",
"site.global.app_user": "hadoop",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${hbase.version}",
"site.global.hbase_instance_name": "instancename",
"site.global.user_group": "hadoop",
"site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 14bbcce..7e7481f 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -24,11 +24,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package for Windows</name>
<description>Slider HBase App Package for Windows</description>
- <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
<app.package.name>${project.artifactId}-${project.version}</app.package.name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/hbase/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json
index 52587e5..f065185 100644
--- a/app-packages/hbase/appConfig-default.json
+++ b/app-packages/hbase/appConfig-default.json
@@ -9,7 +9,7 @@
"system_configs": "core-site",
"site.global.app_user": "yarn",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${hbase.version}",
"site.global.ganglia_server_host": "${NN_HOST}",
"site.global.ganglia_server_port": "8667",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index ca54e57..7ea39f5 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index 3b4cb9d..e1c0fe3 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/storm/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json
index d7908a3..9fd7130 100644
--- a/app-packages/storm/appConfig-default.json
+++ b/app-packages/storm/appConfig-default.json
@@ -8,7 +8,7 @@
"create.default.zookeeper.node": "true",
"site.global.app_user": "${USER_NAME}",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}",
"site.global.user_group": "hadoop",
"site.global.ganglia_server_host": "${NN_HOST}",
"site.global.ganglia_server_id": "Application2",
@@ -21,10 +21,10 @@
"site.storm-site.storm.local.dir": "${AGENT_WORK_ROOT}/app/tmp/storm",
"site.storm-site.transactional.zookeeper.root": "/transactional",
"site.storm-site.storm.zookeeper.port": "2181",
- "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
- "site.storm-site.supervisor.childopts": "-Xmx256m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
+ "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
+ "site.storm-site.supervisor.childopts": "-Xmx256m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"site.storm-site.ui.childopts": "-Xmx768m",
- "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
+ "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
"site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper",
"site.storm-site.drpc.invocations.port": "0",
"site.storm-site.storm.zookeeper.root": "${DEFAULT_ZK_PATH}",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index b586a73..94904c7 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
[08/19] incubator-slider git commit: SLIDER-655: moving app packages
to new base project;
this still (currently) inherits off /slider.pom so versions are the same.
Posted by st...@apache.org.
SLIDER-655: moving app packages to new base project; this still (currently) inherits off /slider.pom so versions are the same.
Conflicts:
app-packages/accumulo/pom.xml
app-packages/hbase-win/pom.xml
app-packages/hbase/pom.xml
app-packages/storm-win/pom.xml
app-packages/storm/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ef097d82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ef097d82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ef097d82
Branch: refs/heads/branches/branch-0.6
Commit: ef097d82a2a1e453589045127bb5bf3f3052cbf2
Parents: 90e3d28
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 16:28:46 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:36:02 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/README.md | 2 +-
app-packages/accumulo/pom.xml | 8 ++++----
app-packages/hbase-win/pom.xml | 7 +++----
app-packages/hbase/pom.xml | 8 ++++----
app-packages/storm-win/pom.xml | 13 ++++++-------
app-packages/storm/pom.xml | 7 +++----
6 files changed, 21 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ef097d82/app-packages/accumulo/README.md
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/README.md b/app-packages/accumulo/README.md
index 537d769..e44870e 100644
--- a/app-packages/accumulo/README.md
+++ b/app-packages/accumulo/README.md
@@ -53,7 +53,7 @@ applicable for other versions of the app package.
Note also that the sample `appConfig-default.json` provided only works with Accumulo 1.6.
For Accumulo 1.5 the instance.volumes property must be replaced with
-instance.dfs.dir (and it cannot use the provided variable `${DEFAULT_DATA_DIR}`
+`instance.dfs.dir` (and it cannot use the provided variable `${DEFAULT_DATA_DIR}`
which is an HDFS URI).
A less descriptive file name can be specified with
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ef097d82/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 2246ecf..2f8ec86 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -17,13 +17,12 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.60.0-incubating</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-accumulo-app-package</artifactId>
<packaging>jar</packaging>
<name>Slider Accumulo App Package</name>
@@ -74,6 +73,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/accumulo.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ef097d82/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 7e7481f..3c8e554 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -18,13 +18,12 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.60.0-incubating</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package for Windows</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ef097d82/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 7ea39f5..6ddcf0d 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -18,13 +18,12 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.60.0-incubating</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package</name>
@@ -61,6 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/hbase.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ef097d82/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index e1c0fe3..bea6b2d 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -18,18 +18,16 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.60.0-incubating</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
- <description>Slider Storm App Package</description>
- <version>${pkg.version}</version>
+ <description>Slider Storm Windows App Package</description>
<properties>
<work.dir>package-tmp</work.dir>
</properties>
@@ -43,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy</id>
@@ -62,6 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/storm.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ef097d82/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 94904c7..822a91e 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -18,13 +18,12 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.60.0-incubating</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
[19/19] incubator-slider git commit: SLIDER-745 revert hbase version
to 0.98.4-hadoop2 for consistency with 0.60 release
Posted by st...@apache.org.
SLIDER-745 revert hbase version to 0.98.4-hadoop2 for consistency with 0.60 release
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/909ab852
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/909ab852
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/909ab852
Branch: refs/heads/branches/branch-0.6
Commit: 909ab8521405d1f29987f9dddfea6ebe7804f514
Parents: a651f7a
Author: Steve Loughran <st...@apache.org>
Authored: Sat Jan 10 19:33:02 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 19:33:02 2015 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/909ab852/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d409d4e..7a2648a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
-->
<hadoop.version>2.6.0</hadoop.version>
- <hbase.version>0.99.0</hbase.version>
+ <hbase.version>0.98.4-hadoop2</hbase.version>
<accumulo.version>1.6.1</accumulo.version>
<!--
artifact versions
[17/19] incubator-slider git commit: SLIDER-671 mvn release reformats
this (empty) tag, so doing it pre-emptively
Posted by st...@apache.org.
SLIDER-671 mvn release reformats this (empty) tag, so doing it pre-emptively
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/98ae5d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/98ae5d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/98ae5d80
Branch: refs/heads/branches/branch-0.6
Commit: 98ae5d803d99b21f95f4ac2698d399eef29f91cc
Parents: ec26edd
Author: Steve Loughran <st...@apache.org>
Authored: Fri Dec 5 14:56:24 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:47:20 2015 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/98ae5d80/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 38f6a49..7832eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1573,7 +1573,7 @@
<id>enforce</id>
<configuration>
<rules>
- <DependencyConvergence/>
+ <DependencyConvergence />
</rules>
</configuration>
<goals>
[11/19] incubator-slider git commit: SLIDER-655 cull module refs to
app-package entries that the toplevel slider project shouldn't be building
Posted by st...@apache.org.
SLIDER-655 cull module refs to app-package entries that the toplevel slider project shouldn't be building
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/44c471ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/44c471ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/44c471ab
Branch: refs/heads/branches/branch-0.6
Commit: 44c471abde2f48282fc6a276f264a8b54dfa20c1
Parents: 9807480
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 18:24:27 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:39:37 2015 +0000
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/44c471ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7849bd0..a4c5152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1335,9 +1335,11 @@
</os>
</activation>
<modules>
+<!--
<module>app-packages/accumulo</module>
<module>app-packages/hbase</module>
<module>app-packages/storm</module>
+-->
</modules>
</profile>
@@ -1349,8 +1351,10 @@
</os>
</activation>
<modules>
+<!--
<module>app-packages/hbase-win</module>
<module>app-packages/storm-win</module>
+-->
</modules>
</profile>
<profile>
[09/19] incubator-slider git commit: SLIDER-655 POM for app-packages
Posted by st...@apache.org.
SLIDER-655 POM for app-packages
Conflicts:
app-packages/hbase/README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8a4891ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8a4891ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8a4891ed
Branch: refs/heads/branches/branch-0.6
Commit: 8a4891ed265b705e852c73b88d1d31edf6f6962d
Parents: ef097d8
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 18:18:07 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:38:56 2015 +0000
----------------------------------------------------------------------
app-packages/hbase/README.md | 7 +++---
app-packages/pom.xml | 46 +++++++++++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8a4891ed/app-packages/hbase/README.md
----------------------------------------------------------------------
diff --git a/app-packages/hbase/README.md b/app-packages/hbase/README.md
index 2d52fc9..53c1bbe 100644
--- a/app-packages/hbase/README.md
+++ b/app-packages/hbase/README.md
@@ -31,17 +31,18 @@ with appropriate parameters.
Command:
- mvn clean package -Phbase-app-package -Dpkg.version=<version>
+ mvn clean package -Phbase-app-package -Dhbase.version=<version>
-Dpkg.name=<file name of app tarball> -Dpkg.src=<folder location where the pkg is available>
Example:
mvn clean package -Phbase-app-package -Dpkg.version=0.98.5-hadoop2
- -Dpkg.name=hbase-0.98.5-hadoop2-bin.tar.gz
+ -Dhbase.version=hbase-0.98.5-hadoop2-bin.tar.gz
-Dpkg.src=/Users/user1/Downloads/0.98.5-hadoop2
App package can be found in
- app-packages/hbase/target/slider-hbase-app-package-${pkg.version}.zip
+
+ app-packages/hbase/target/slider-hbase-app-package-${slider.version}.zip
## OPTION - II
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8a4891ed/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
new file mode 100644
index 0000000..b02b79c
--- /dev/null
+++ b/app-packages/pom.xml
@@ -0,0 +1,46 @@
+<?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/maven-v4_0_0.xsd">
+ <!--
+ 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.
+-->
+ <parent>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider</artifactId>
+ <version>0.61.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
+ <packaging>pom</packaging>
+ <name>Slider Storm App Package</name>
+ <description>Slider Storm App Packages: Zip files containing applications that slider can deploy</description>
+
+ <modules>
+ <module>hbase</module>
+ <module>accumulo</module>
+ <module>storm</module>
+ </modules>
+
+ <build>
+ </build>
+
+ <dependencies>
+ </dependencies>
+
+ </project>
+
\ No newline at end of file
[16/19] incubator-slider git commit: SLIDER-671 trying to make
app-package module optional
Posted by st...@apache.org.
SLIDER-671 trying to make app-package module optional
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ec26edd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ec26edd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ec26edd5
Branch: refs/heads/branches/branch-0.6
Commit: ec26edd56c74432ad593cfff6d5dd09a3cb2d0a0
Parents: 4945c66
Author: Steve Loughran <st...@apache.org>
Authored: Fri Dec 5 14:50:34 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:46:55 2015 +0000
----------------------------------------------------------------------
pom.xml | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ec26edd5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 55ec026..38f6a49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<module>slider-providers/hbase/hbase-funtests</module>
<module>slider-providers/accumulo/slider-accumulo-provider</module>
<module>slider-providers/accumulo/accumulo-funtests</module>
- <module>app-packages</module>
+ <!-- the app-packages module is added as a profile-->
</modules>
<licenses>
@@ -82,9 +82,7 @@
<name>${distMgmtSnapshotsName}</name>
<url>${distMgmtSnapshotsUrl}</url>
</snapshotRepository>
-
-
-
+
</distributionManagement>
<mailingLists>
@@ -1366,6 +1364,22 @@
</profile>
<profile>
+ <id>all-modules</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>app-packages</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>no-app-packages</id>
+ <modules>
+ </modules>
+ </profile>
+
+ <profile>
<id>apache-release</id>
<!--
Build the release artifacts which become
[02/19] incubator-slider git commit: SLIDER-672 cut out groovydoc as
it has stopped working
Posted by st...@apache.org.
SLIDER-672 cut out groovydoc as it has stopped working
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2b8d6e19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2b8d6e19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2b8d6e19
Branch: refs/heads/branches/branch-0.6
Commit: 2b8d6e1959ccc049bb38e4375405266dfc50b0df
Parents: e91d153
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 24 13:55:05 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:24:39 2015 +0000
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2b8d6e19/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a87df7b..91c655e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1431,6 +1431,7 @@
</executions>
</plugin>
-->
+ <!--
<plugin>
<groupId>com.bluetrainsoftware.maven</groupId>
<artifactId>maven-groovydoc-plugin</artifactId>
@@ -1444,7 +1445,7 @@
</execution>
</executions>
</plugin>
-
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>