[
https://issues.apache.org/jira/browse/MARMOTTA-321?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13939316#comment-13939316
]
ASF subversion and git services commented on MARMOTTA-321:
----------------------------------------------------------
Commit 9ff5258513ba95943d549ce8f699eafed8f8ab74 in marmotta's branch
refs/heads/develop from [~rwesten]
[ https://git-wip-us.apache.org/repos/asf?p=marmotta.git;h=9ff5258 ]
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into
develop
# By Jakob Frank (9) and Sebastian Schaffert (8)
# Via Sebastian Schaffert (3) and Jakob Frank (2)
* 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta:
added more commonly used URI prefixes to KiWiIO
added more commonly used URI prefixes to KiWiIO
small bug fix in logging
upgrade slf4j and logback
fixed some warining in the usage of the refpack-maven-plugin
fix kiwi-caching dependencies in parent pom
fix dependencies of marmotta-backend-kiwi
removed zookeeper from the installer
add documentation
moved zookeeper dependency into separate profile
compress cached representation of very long literals
Removed "DISCLAIMER.txt" from assembly and installer, we are not incubating
any more!
MARMOTTA-189: added redistribution LICENSE entry for timeknots (MARMOTTA-321)
MARMOTTA-189: timeknots webjar is now available!
MARMOTTA-189: added timeline for memento using timeknots see
https://github.com/alangrafu/timeknots
MARMOTTA-189: set default encoding in templating to enable url-encoding see
http://freemarker.org/docs/ref_builtins_string.html#ref_builtin_url
MARMOTTA-189: included simple timeline using timeknots.js
> update/cleanup the entries in the LICENSE file for "Apache Marmotta code
> subcomponents"
> ---------------------------------------------------------------------------------------
>
> Key: MARMOTTA-321
> URL: https://issues.apache.org/jira/browse/MARMOTTA-321
> Project: Marmotta
> Issue Type: Task
> Components: Admin Interface
> Affects Versions: 3.1-incubating
> Reporter: Jakob Frank
> Assignee: Sebastian Schaffert
> Priority: Critical
> Labels: webjars
> Fix For: 3.2.0
>
>
> Most of entries in the "Apache Marmotta code subcomponents" are for 3rd-party
> javascripts libraries which have been moved into separate webjars in Marmotta.
> So the paths in the LICENSE file should be updated
> * For some of these custom webjars, there might be an official release so
> they can be removed from Marmotta (and therefor also from the LICENSE)
> * Some 3rd-party source inclusions might require updates in the L&N
> * Some new dependencies might require additions in the L&N
--
This message was sent by Atlassian JIRA
(v6.2#6252)
