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 2019/03/11 17:41:17 UTC
[asterixdb] branch master updated: [NO ISSUE] Remove nonexistent
source dependency
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new ffe8fe6 [NO ISSUE] Remove nonexistent source dependency
new aa808f1 Merge commit 'ffe8fe6' from 'stabilization-f69489' into 'master'
ffe8fe6 is described below
commit ffe8fe6b8f8fae35ac2619626ed242f4c813d506
Author: Ian Maxon <im...@apache.org>
AuthorDate: Thu Aug 30 18:49:59 2018 -0700
[NO ISSUE] Remove nonexistent source dependency
Change-Id: I0cf543092867a475d031860c7d6192cc005658d8
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3245
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
---
asterixdb/LICENSE | 3 +--
asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE | 2 ++
asterixdb/src/main/licenses/templates/source_licenses.ftl | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE
index 7d7f90a..93e3554 100644
--- a/asterixdb/LICENSE
+++ b/asterixdb/LICENSE
@@ -207,9 +207,8 @@
Portions of the AsterixDB WebUI
located at:
asterix-app/src/main/resources/webui/static/js/jquery.min.js,
- asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js,
and
- asterix-app/src/main/resources/queryui/js/jquery-1.12.4.min.js
+ asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js
are available under an MIT-style license:
---
diff --git a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
index 7e6690d..0620804 100644
--- a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
+++ b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
@@ -6,6 +6,7 @@
Portions of the AsterixDB WebUI
located at:
webui/static/js/jquery.min.js,
+ and
webui/static/js/jquery.autosize-min.js
are available under an MIT-style license:
@@ -470,3 +471,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
---
+=======
diff --git a/asterixdb/src/main/licenses/templates/source_licenses.ftl b/asterixdb/src/main/licenses/templates/source_licenses.ftl
index cc3e767..ed88e9b 100644
--- a/asterixdb/src/main/licenses/templates/source_licenses.ftl
+++ b/asterixdb/src/main/licenses/templates/source_licenses.ftl
@@ -50,7 +50,7 @@
<#assign licenseComponent="AsterixDB WebUI"/>
<#assign licenseLocation="${asterixAppLocation!}"/>
<#assign licenseFilePrefix="${asterixAppResourcesPrefix!}"/>
- <@license files=["webui/static/js/jquery.min.js", "webui/static/js/jquery.autosize-min.js", "queryui/js/jquery-1.12.4.min.js"]
+ <@license files=["webui/static/js/jquery.min.js", "webui/static/js/jquery.autosize-min.js"]
licenseName="an MIT-style license">
Copyright jQuery Foundation and other contributors, https://jquery.org/