[accumulo] branch master updated: Fix MiniAccumuloClusterExistingZooKeepersTest
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new 0027508 Fix MiniAccumuloClusterExistingZooKeepersTest
0027508 is described below
commit 00275086824bbca3fc7711bda14201e9b01e212c
Author: Christopher Tubbs
AuthorDate: Thu Feb 27 19:39:06 2020 -0500
Fix MiniAccumuloClusterExistingZooKeepersTest
* Follow up issue from #1531
* Update curator to latest for zookeeper testing server
* Disable ZK adminServer in test, because it listens on 8080 by default,
which can conflict with other services in the testing environment, and
it is not needed
---
.../accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java | 2 ++
pom.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
index ac24d8f..609dba0 100644
---
a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
+++
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
@@ -63,6 +63,8 @@ public class MiniAccumuloClusterExistingZooKeepersTest {
FileUtils.deleteQuietly(testDir);
assertTrue(testDir.mkdir());
+// disable adminServer, which runs on port 8080 by default and we don't
need
+System.setProperty("zookeeper.admin.enableServer", "false");
zooKeeper = new TestingServer();
MiniAccumuloConfig config = new MiniAccumuloConfig(testDir, SECRET);
diff --git a/pom.xml b/pom.xml
index 5c2a4a1..e4b1d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
1.62
-2.12.0
+4.2.0
${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml
[accumulo] branch master updated (94844b3 -> 08882e4)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 94844b3 Create StoredTabletFile that extends TabletFile. Closes #1507 (#1519) add 3779cf9 Fix #1532 Remove need for Ant on class path add 03deb51 Enable logs for accumulo-maven-plugin's IT new 08882e4 Merge branch '1.9' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 08882e43ff02dc10516c47b159b0d8d5b825954c Merge: 94844b3 03deb51 Author: Christopher Tubbs AuthorDate: Thu Feb 27 14:47:37 2020 -0500 Merge branch '1.9'
[accumulo] branch 1.9 updated: Enable logs for accumulo-maven-plugin's IT
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new 03deb51 Enable logs for accumulo-maven-plugin's IT
03deb51 is described below
commit 03deb513155129f9cdb17e73eaedfa787699075b
Author: Christopher Tubbs
AuthorDate: Thu Feb 27 14:42:22 2020 -0500
Enable logs for accumulo-maven-plugin's IT
---
.../plugin-test/src/test/resources/log4j.properties | 20
1 file changed, 20 insertions(+)
diff --git
a/maven-plugin/src/it/plugin-test/src/test/resources/log4j.properties
b/maven-plugin/src/it/plugin-test/src/test/resources/log4j.properties
new file mode 100644
index 000..0426472
--- /dev/null
+++ b/maven-plugin/src/it/plugin-test/src/test/resources/log4j.properties
@@ -0,0 +1,20 @@
+# 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.
+
+log4j.rootLogger=DEBUG, CA
+log4j.appender.CA=org.apache.log4j.ConsoleAppender
+log4j.appender.CA.layout=org.apache.log4j.PatternLayout
+log4j.appender.CA.layout.ConversionPattern=%d{ISO8601} [%c{2}] %-5p: %m%n
+
[accumulo] branch 1.9 updated: Fix #1532 Remove need for Ant on class path
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new 3779cf9 Fix #1532 Remove need for Ant on class path
3779cf9 is described below
commit 3779cf9de0a286d951f0bd92553edb345f1ada8e
Author: Christopher Tubbs
AuthorDate: Thu Feb 27 14:32:32 2020 -0500
Fix #1532 Remove need for Ant on class path
Make MetricsConfiguration use a MapConfiguration with System.getenv()
rather than EnvironmentConfiguration, to get the environment properties.
EnvironmentConfiguration uses Ant code, which is not available on the
class path (typically) to get the environment, so it should be avoided.
---
.../org/apache/accumulo/server/metrics/MetricsConfiguration.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
index b1f470e..9db36fb 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
@@ -22,7 +22,7 @@ import org.apache.accumulo.core.util.Daemon;
import org.apache.commons.configuration.AbstractFileConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.EnvironmentConfiguration;
+import org.apache.commons.configuration.MapConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.event.ConfigurationEvent;
@@ -44,7 +44,7 @@ public class MetricsConfiguration {
private static SystemConfiguration sysConfig = null;
- private static EnvironmentConfiguration envConfig = null;
+ private static MapConfiguration envConfig = null;
private XMLConfiguration xConfig = null;
@@ -111,7 +111,7 @@ public class MetricsConfiguration {
public Configuration getEnvironmentConfiguration() {
synchronized (MetricsConfiguration.class) {
if (null == envConfig)
-envConfig = new EnvironmentConfiguration();
+envConfig = new MapConfiguration(System.getenv());
return envConfig;
}
}
[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/asf-staging by this push: new 93d8bdd Automatic Site Publish by Buildbot 93d8bdd is described below commit 93d8bdd8ca38406601857ddf3f39841a9dbc6cdb Author: buildbot AuthorDate: Thu Feb 27 15:05:35 2020 + Automatic Site Publish by Buildbot --- output/feed.xml | 4 ++-- output/people/index.html | 5 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/output/feed.xml b/output/feed.xml index 0784d48..1edbecc 100644 --- a/output/feed.xml +++ b/output/feed.xml @@ -6,8 +6,8 @@ https://accumulo.apache.org/ https://accumulo.apache.org/feed.xml"; rel="self" type="application/rss+xml"/> -Wed, 26 Feb 2020 22:25:12 + -Wed, 26 Feb 2020 22:25:12 + +Thu, 27 Feb 2020 15:05:30 + +Thu, 27 Feb 2020 15:05:30 + Jekyll v4.0.0 diff --git a/output/people/index.html b/output/people/index.html index d45d851..25342c5 100644 --- a/output/people/index.html +++ b/output/people/index.html @@ -678,6 +678,11 @@ http://www.timeanddate.com/time/zones/cest";>CEST + Markus Cozowicz + http://www.microsoft.com";>Microsoft + http://www.timeanddate.com/time/zones/cest";>CET + + Matt Dailey
Buildbot success in on jekyll_websites
The Buildbot has detected a passing build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/39 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii Blamelist: asfinfra, commits@accumulo.apache.org Build succeeded! Sincerely, -The Buildbot
[accumulo-website] branch master updated: Update people.md (#222)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/master by this push: new aff53d9 Update people.md (#222) aff53d9 is described below commit aff53d912df83789eaa9ca80b5ce19c9ce7acf9c Author: Markus Cozowicz AuthorDate: Thu Feb 27 16:01:48 2020 +0100 Update people.md (#222) --- pages/people.md | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/people.md b/pages/people.md index 53e323a..1410cdd 100644 --- a/pages/people.md +++ b/pages/people.md @@ -112,6 +112,7 @@ GitHub also has a [contributor list][github-contributors] based on commits. | Luke Brassard | [sqrrl][SQRRL] | [ET][ET] | | Mandar Inamdar | [Microsoft][MICROSOFT] | [PT][PT] | | Mario Pastorelli| [Teralytics AG][TERALYTICS] | [CEST][CEST] | +| Markus Cozowicz | [Microsoft][MICROSOFT] | [CET][CEST] | | Matt Dailey | | | | Matthew Boehm | [Novetta][NOVETTA] | [ET][ET] | | Matthew Dinep | [Anavation, LLC] [ANAVATION] | [ET][ET] |
