You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/06/01 12:44:48 UTC

[20/26] asterixdb git commit: [NO ISSUE] Introduce AsterixServerIntegrationUtil

[NO ISSUE] Introduce AsterixServerIntegrationUtil

Add integration util flavor with 'asterix-server' classpath, e.g. includes
asterix-dashboard

Change-Id: I5371a6bb03249ca34f4797713ee6b176a8f8f757
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2667
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <im...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/265919e4
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/265919e4
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/265919e4

Branch: refs/heads/master
Commit: 265919e47096eac7c9869fa3146241840a9b7af9
Parents: 0a7c566
Author: Michael Blow <mb...@apache.org>
Authored: Tue May 29 12:16:36 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Tue May 29 12:26:39 2018 -0700

----------------------------------------------------------------------
 .../resources/licenses/3rdpartylicenses.txt     |  2 +-
 .../server/AsterixServerIntegrationUtil.java    | 24 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/265919e4/asterixdb/asterix-dashboard/src/main/resources/licenses/3rdpartylicenses.txt
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-dashboard/src/main/resources/licenses/3rdpartylicenses.txt b/asterixdb/asterix-dashboard/src/main/resources/licenses/3rdpartylicenses.txt
index 9334697..d552159 100644
--- a/asterixdb/asterix-dashboard/src/main/resources/licenses/3rdpartylicenses.txt
+++ b/asterixdb/asterix-dashboard/src/main/resources/licenses/3rdpartylicenses.txt
@@ -1,4 +1,4 @@
-core-js@2.5.6
+core-js@2.5.7
 MIT
 Copyright (c) 2014-2018 Denis Pushkarev
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/265919e4/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AsterixServerIntegrationUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AsterixServerIntegrationUtil.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AsterixServerIntegrationUtil.java
new file mode 100644
index 0000000..b62dddd
--- /dev/null
+++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AsterixServerIntegrationUtil.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2009-2013 by The Regents of the University of California
+ * Licensed 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 from
+ *
+ *     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.
+ */
+package org.apache.asterix.test.server;
+
+import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil;
+
+public class AsterixServerIntegrationUtil extends AsterixHyracksIntegrationUtil {
+
+    public static void main(String a[]) throws Exception {
+        AsterixHyracksIntegrationUtil.main(a);
+    }
+}