You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/04 07:55:33 UTC
[1/5] git commit: SLIDER-374 Potential resource leak in
accumulo/CertUtil.java due to unclosed streams (Thomas Liu)
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports 2051dd641 -> 4d2133fc3
SLIDER-374 Potential resource leak in accumulo/CertUtil.java due to unclosed streams (Thomas Liu)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fef98cd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fef98cd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fef98cd6
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: fef98cd64a73b7e4e215e810f18c99c4b942afee
Parents: 2051dd6
Author: tedyu <yu...@gmail.com>
Authored: Fri Oct 3 11:22:30 2014 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Fri Oct 3 11:22:30 2014 -0700
----------------------------------------------------------------------
.../slider/funtest/accumulo/CertUtil.java | 50 ++++++++++++++++++--
1 file changed, 45 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fef98cd6/app-packages/accumulo/src/test/java/org/apache/slider/funtest/accumulo/CertUtil.java
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/src/test/java/org/apache/slider/funtest/accumulo/CertUtil.java b/app-packages/accumulo/src/test/java/org/apache/slider/funtest/accumulo/CertUtil.java
index 4aba31f..8bac58f 100644
--- a/app-packages/accumulo/src/test/java/org/apache/slider/funtest/accumulo/CertUtil.java
+++ b/app-packages/accumulo/src/test/java/org/apache/slider/funtest/accumulo/CertUtil.java
@@ -97,13 +97,29 @@ public class CertUtil {
IOException, CertificateException, NoSuchAlgorithmException {
KeyStore signerKeystore = KeyStore.getInstance(keystoreType);
char[] signerPasswordArray = rootKeystorePassword;
- signerKeystore.load(new FileInputStream(rootKeystorePath), signerPasswordArray);
+ FileInputStream rootKeystoreInputStream = null;
+ try{
+ rootKeystoreInputStream = new FileInputStream(rootKeystorePath);
+ signerKeystore.load(rootKeystoreInputStream, signerPasswordArray);
+ } finally {
+ if(rootKeystoreInputStream != null) {
+ rootKeystoreInputStream.close();
+ }
+ }
Certificate rootCert = findCert(signerKeystore);
KeyStore keystore = KeyStore.getInstance(keystoreType);
keystore.load(null, null);
keystore.setCertificateEntry(keyName + "Cert", rootCert);
- keystore.store(new FileOutputStream(targetKeystoreFile), truststorePassword);
+ FileOutputStream targetKeystoreOutputStream = null;
+ try{
+ targetKeystoreOutputStream = new FileOutputStream(targetKeystoreFile);
+ keystore.store(targetKeystoreOutputStream, truststorePassword);
+ } finally {
+ if(targetKeystoreOutputStream != null) {
+ targetKeystoreOutputStream.close();
+ }
+ }
}
public static void createSignedCert(String targetKeystoreFile,
@@ -112,7 +128,15 @@ public class CertUtil {
throws Exception {
KeyStore signerKeystore = KeyStore.getInstance(keystoreType);
char[] signerPasswordArray = signerKeystorePassword;
- signerKeystore.load(new FileInputStream(signerKeystorePath), signerPasswordArray);
+ FileInputStream signerKeystoreInputStream = null;
+ try{
+ signerKeystoreInputStream = new FileInputStream(signerKeystorePath);
+ signerKeystore.load(signerKeystoreInputStream, signerPasswordArray);
+ } finally {
+ if (signerKeystoreInputStream != null) {
+ signerKeystoreInputStream.close();
+ }
+ }
Certificate signerCert = findCert(signerKeystore);
PrivateKey signerKey = findPrivateKey(signerKeystore, signerPasswordArray);
@@ -125,7 +149,15 @@ public class CertUtil {
keystore.load(null, null);
keystore.setCertificateEntry(keyName + "Cert", cert);
keystore.setKeyEntry(keyName + "Key", kp.getPrivate(), password, new Certificate[] {cert, signerCert});
- keystore.store(new FileOutputStream(targetKeystoreFile), password);
+ FileOutputStream targetKeystoreOutputStream = null;
+ try{
+ targetKeystoreOutputStream = new FileOutputStream(targetKeystoreFile);
+ keystore.store(targetKeystoreOutputStream, password);
+ } finally {
+ if (targetKeystoreOutputStream != null){
+ targetKeystoreOutputStream.close();
+ }
+ }
}
public static void createSelfSignedCert(String targetKeystoreFileName,
@@ -148,7 +180,15 @@ public class CertUtil {
keystore.load(null, null);
keystore.setCertificateEntry(keyName + "Cert", cert);
keystore.setKeyEntry(keyName + "Key", kp.getPrivate(), password, new Certificate[] {cert});
- keystore.store(new FileOutputStream(targetKeystoreFile), password);
+ FileOutputStream targetKeystoreOutputStream = null;
+ try{
+ targetKeystoreOutputStream = new FileOutputStream(targetKeystoreFile);
+ keystore.store(targetKeystoreOutputStream, password);
+ } finally {
+ if (targetKeystoreOutputStream != null) {
+ targetKeystoreOutputStream.close();
+ }
+ }
}
private static KeyPair generateKeyPair() throws NoSuchAlgorithmException {
[4/5] git commit: SLIDER-366. Cleanup application packages
SLIDER-485. Slider should not set the default queue to value default. It
should rely on YARN to pick the default queue
Posted by sm...@apache.org.
SLIDER-366. Cleanup application packages
SLIDER-485. Slider should not set the default queue to value default. It should rely on YARN to pick the default queue
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0143c210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0143c210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0143c210
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: 0143c210da401225ac257c26c10ce4c38529d889
Parents: fa0acf1
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Oct 3 18:33:31 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Oct 3 18:33:35 2014 -0700
----------------------------------------------------------------------
app-packages/app-pkg-template/appConfig-default.json | 2 +-
app-packages/command-logger/slider-pkg/appConfig.json | 2 +-
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/memcached/appConfig-default.json | 2 +-
app-packages/storm/appConfig-default.json | 2 +-
.../src/main/java/org/apache/slider/client/SliderClient.java | 5 ++++-
.../main/java/org/apache/slider/common/SliderXmlConfKeys.java | 4 ++--
.../apache/slider/providers/agent/ComponentInstanceState.java | 2 +-
8 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/app-pkg-template/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/app-pkg-template/appConfig-default.json b/app-packages/app-pkg-template/appConfig-default.json
index 3908030..457e013 100644
--- a/app-packages/app-pkg-template/appConfig-default.json
+++ b/app-packages/app-pkg-template/appConfig-default.json
@@ -4,7 +4,7 @@
},
"global": {
"application.def": "myapp-1.0.0.zip",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
"site.global.app_user": "yarn",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/myapp-1.0.0",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/command-logger/slider-pkg/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json
index 73bc7fa..c8bb237 100644
--- a/app-packages/command-logger/slider-pkg/appConfig.json
+++ b/app-packages/command-logger/slider-pkg/appConfig.json
@@ -4,7 +4,7 @@
},
"global": {
"application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
"site.global.app_user": "yarn",
"site.global.application_id": "CommandLogger",
"site.global.app_log_dir": "${AGENT_LOG_ROOT}/app/log",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/hbase/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json
index c7952df..658d727 100644
--- a/app-packages/hbase/appConfig-default.json
+++ b/app-packages/hbase/appConfig-default.json
@@ -5,7 +5,7 @@
"global": {
"application.def": ".slider/package/HBASE/slider-hbase-app-package-${bld.version}.zip",
"create.default.zookeeper.node": "true",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
"system_configs": "core-site",
"site.global.app_user": "yarn",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/memcached/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/memcached/appConfig-default.json b/app-packages/memcached/appConfig-default.json
index 7b4aa97..b8b4bf1 100644
--- a/app-packages/memcached/appConfig-default.json
+++ b/app-packages/memcached/appConfig-default.json
@@ -4,7 +4,7 @@
},
"global": {
"application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
"site.global.app_user": "yarn",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/jmemcached-1.0.0",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/storm/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json
index 2b0eea0..e01ceda 100644
--- a/app-packages/storm/appConfig-default.json
+++ b/app-packages/storm/appConfig-default.json
@@ -4,7 +4,7 @@
},
"global": {
"application.def": ".slider/package/STORM/slider-storm-app-package-${pkg.version}.zip",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
"create.default.zookeeper.node": "true",
"system_configs": "core-site",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index dc81f98..e9333db 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1285,7 +1285,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
amQueue = suppliedQueue;
log.info("Using queue {} for the application instance.", amQueue);
}
- amLauncher.setQueue(amQueue);
+
+ if (amQueue != null) {
+ amLauncher.setQueue(amQueue);
+ }
// Submit the application to the applications manager
// SubmitApplicationResponse submitResp = applicationsManager.submitApplication(appRequest);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
index 1bbe9ae..243dd95 100644
--- a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java
@@ -84,10 +84,10 @@ public interface SliderXmlConfKeys {
String KEY_AM_RESTART_LIMIT = "slider.yarn.restart.limit";
/**
- * queue name
+ * queue name, by default let YARN pick the queue
*/
String KEY_YARN_QUEUE = "slider.yarn.queue";
- String DEFAULT_YARN_QUEUE = YarnConfiguration.DEFAULT_QUEUE_NAME;
+ String DEFAULT_YARN_QUEUE = null;
/**
* default priority
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java
index f7f8bf4..8f7d0f7 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java
@@ -30,7 +30,7 @@ public class ComponentInstanceState {
LoggerFactory.getLogger(ComponentInstanceState.class);
private static int MAX_FAILURE_TOLERATED = 3;
private static String INVALID_TRANSITION_ERROR =
- "Result {0} for command {1} is not expected for component {2} in state {3}.";
+ "Result %s for command %s is not expected for component %s in state %s.";
private final String componentName;
private final ContainerId containerId;
[5/5] git commit: SLIDER-181. Remove REST service from Storm package
Posted by sm...@apache.org.
SLIDER-181. Remove REST service from Storm package
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4d2133fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4d2133fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4d2133fc
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: 4d2133fc3ae240c33b01d47bd414785b81803d5d
Parents: 0143c21
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Oct 3 18:34:52 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Oct 3 18:34:52 2014 -0700
----------------------------------------------------------------------
app-packages/storm/appConfig-default.json | 2 --
app-packages/storm/metainfo.xml | 23 +++--------------------
app-packages/storm/package/scripts/params.py | 2 --
app-packages/storm/resources-default.json | 4 ----
4 files changed, 3 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d2133fc/app-packages/storm/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json
index e01ceda..dc07ee3 100644
--- a/app-packages/storm/appConfig-default.json
+++ b/app-packages/storm/appConfig-default.json
@@ -16,8 +16,6 @@
"site.global.ganglia_server_id": "Application2",
"site.global.ganglia_enabled":"true",
"site.global.ganglia_server_port": "8668",
- "site.global.rest_api_port": "${STORM_REST_API.ALLOCATED_PORT}",
- "site.global.rest_api_admin_port": "${STORM_REST_API.ALLOCATED_PORT}",
"site.storm-site.storm.log.dir" : "${AGENT_LOG_ROOT}",
"site.storm-site.storm.zookeeper.servers": "['${ZK_HOST}']",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d2133fc/app-packages/storm/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/metainfo.xml b/app-packages/storm/metainfo.xml
index bbb9db6..3d1b048 100644
--- a/app-packages/storm/metainfo.xml
+++ b/app-packages/storm/metainfo.xml
@@ -30,7 +30,7 @@
<exports>
<export>
<name>org.apache.slider.jmx</name>
- <value>http://${STORM_REST_API_HOST}:${site.global.rest_api_port}/api/cluster/summary</value>
+ <value>http://${STORM_UI_SERVER_HOST}:${site.storm-site.ui.port}/api/cluster/summary</value>
</export>
<export>
<name>org.apache.slider.monitor</name>
@@ -55,8 +55,7 @@
<commandOrders>
<commandOrder>
<command>NIMBUS-START</command>
- <requires>SUPERVISOR-INSTALLED,STORM_UI_SERVER-INSTALLED,DRPC_SERVER-INSTALLED,STORM_REST_API-INSTALLED
- </requires>
+ <requires>SUPERVISOR-INSTALLED,STORM_UI_SERVER-INSTALLED,DRPC_SERVER-INSTALLED</requires>
</commandOrder>
<commandOrder>
<command>SUPERVISOR-START</command>
@@ -70,10 +69,6 @@
<command>STORM_UI_SERVER-START</command>
<requires>NIMBUS-STARTED</requires>
</commandOrder>
- <commandOrder>
- <command>STORM_REST_API-START</command>
- <requires>NIMBUS-STARTED,DRPC_SERVER-STARTED,STORM_UI_SERVER-STARTED</requires>
- </commandOrder>
</commandOrders>
<components>
@@ -111,7 +106,7 @@
<name>STORM_UI_SERVER</name>
<category>MASTER</category>
<publishConfig>true</publishConfig>
- <appExports>QuickLinks-org.apache.slider.monitor</appExports>
+ <appExports>QuickLinks-org.apache.slider.monitor,QuickLinks-org.apache.slider.jmx</appExports>
<autoStartOnFailure>true</autoStartOnFailure>
<commandScript>
<script>scripts/ui_server.py</script>
@@ -130,18 +125,6 @@
<timeout>600</timeout>
</commandScript>
</component>
-
- <component>
- <name>STORM_REST_API</name>
- <category>MASTER</category>
- <autoStartOnFailure>true</autoStartOnFailure>
- <appExports>QuickLinks-org.apache.slider.jmx</appExports>
- <commandScript>
- <script>scripts/rest_api.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>600</timeout>
- </commandScript>
- </component>
</components>
<osSpecifics>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d2133fc/app-packages/storm/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/params.py b/app-packages/storm/package/scripts/params.py
index 1332b9f..1ccba5e 100644
--- a/app-packages/storm/package/scripts/params.py
+++ b/app-packages/storm/package/scripts/params.py
@@ -34,8 +34,6 @@ user_group = config['configurations']['global']['user_group']
java64_home = config['hostLevelParams']['java_home']
nimbus_host = config['configurations']['storm-site']['nimbus.host']
nimbus_port = config['configurations']['storm-site']['nimbus.thrift.port']
-rest_api_port = config['configurations']['global']['rest_api_port']
-rest_api_admin_port = config['configurations']['global']['rest_api_admin_port']
rest_api_conf_file = format("{conf_dir}/config.yaml")
rest_lib_dir = format("{app_root}/external/storm-rest")
storm_bin = format("{app_root}/bin/storm.py")
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d2133fc/app-packages/storm/resources-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/resources-default.json b/app-packages/storm/resources-default.json
index acecd91..31b445e 100644
--- a/app-packages/storm/resources-default.json
+++ b/app-packages/storm/resources-default.json
@@ -25,10 +25,6 @@
"SUPERVISOR": {
"yarn.role.priority": "4",
"yarn.component.instances": "1"
- },
- "STORM_REST_API": {
- "yarn.role.priority": "5",
- "yarn.component.instances": "0"
}
}
}
[3/5] git commit: SLIDER-482 accumulo funtest to include registry
retrieval
Posted by sm...@apache.org.
SLIDER-482 accumulo funtest to include registry retrieval
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fa0acf1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fa0acf1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fa0acf1f
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: fa0acf1f69a43119fd650b16b80c51cb0974975c
Parents: e631a13
Author: Steve Loughran <st...@apache.org>
Authored: Fri Oct 3 15:22:33 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Oct 3 15:22:33 2014 -0700
----------------------------------------------------------------------
.../org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fa0acf1f/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy
index 12c0655..5ebce0a 100644
--- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy
+++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy
@@ -167,6 +167,7 @@ class AccumuloBasicIT extends AccumuloAgentCommandTestBase {
public static String getMonitorUrl(SliderClient sliderClient, String clusterName) {
int tries = 5
+ Exception caught;
while (true) {
try {
CuratorServiceInstance<ServiceInstanceData> instance =
@@ -181,6 +182,7 @@ class AccumuloBasicIT extends AccumuloAgentCommandTestBase {
assertNotNull monitorUrl
return monitorUrl
} catch (Exception e) {
+ caught = e;
log.info("Got exception trying to read quicklinks")
if (tries-- == 0) {
break
@@ -188,7 +190,7 @@ class AccumuloBasicIT extends AccumuloAgentCommandTestBase {
sleep(20000)
}
}
- fail("Couldn't retrieve quicklinks")
+ throw caught;
}
public static void checkMonitorPage(String monitorUrl) {
[2/5] git commit: SLIDER-484 app-package/hbase not in slider base pom
Posted by sm...@apache.org.
SLIDER-484 app-package/hbase not in slider base 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/e631a132
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e631a132
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e631a132
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: e631a13233af331803f50f64fd30272affe6f47c
Parents: fef98cd
Author: Steve Loughran <st...@apache.org>
Authored: Fri Oct 3 15:21:00 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Oct 3 15:21:00 2014 -0700
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
pom.xml | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e631a132/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index bc4b591..f2f1a35 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -74,7 +74,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>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e631a132/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 519d7c1..be1b858 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -45,7 +45,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>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e631a132/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b31d476..6d35407 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
<module>slider-core</module>
<module>slider-agent</module>
<module>app-packages/accumulo</module>
+ <module>app-packages/hbase</module>
<module>slider-assembly</module>
<module>slider-funtest</module>
<module>slider-providers/hbase/slider-hbase-provider</module>
@@ -193,6 +194,7 @@
<maven.version.range>[3.0.0,)</maven.version.range>
+ <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>