You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2019/04/16 14:22:40 UTC
[jena] branch master updated (9a9e97e -> f16cc35)

This is an automated email from the ASF dual-hosted git repository.

andy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git.


    from 9a9e97e  Merge pull request #556 from afs/dependency-mgt
     new fce4f4f  JENA-1703: Combined artifacts NOTICE files
     new ca55db9  JENA-1703: war file META-INF/NOTICE
     new f16cc35  Merge pull request #555 from afs/combined-notice

The 7770 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:
 jena-fuseki2/DEPENDENCIES                          |  24 --
 jena-fuseki2/NOTICE                                |  16 --
 .../src/main/resources/META-INF/DEPENDENCIES       |  24 --
 .../src/main/resources/META-INF/LICENSE            | 253 ---------------------
 .../src/main/resources/META-INF/NOTICE             |  16 --
 .../src/main/resources/META-INF/NOTICE             | 215 +++++++++++++++++
 .../src/main/resources/META-INF/NOTICE             | 144 ++++++++++++
 jena-fuseki2/jena-fuseki-war/pom.xml               |   9 +-
 .../jena-fuseki-war/war-inclusions/META-INF/NOTICE | 218 ++++++++++++++++++
 jena-fuseki2/jena-fuseki-war/war-inclusions/NOTICE |  97 ++++++++
 .../src/main/resources/META-INF/DEPENDENCIES       |  24 --
 .../src/main/resources/META-INF/LICENSE            | 253 ---------------------
 .../src/main/resources/META-INF/NOTICE             |  82 ++++++-
 13 files changed, 758 insertions(+), 617 deletions(-)
 delete mode 100644 jena-fuseki2/DEPENDENCIES
 delete mode 100644 jena-fuseki2/NOTICE
 delete mode 100644 jena-fuseki2/jena-fuseki-core/src/main/resources/META-INF/DEPENDENCIES
 delete mode 100644 jena-fuseki2/jena-fuseki-core/src/main/resources/META-INF/LICENSE
 delete mode 100644 jena-fuseki2/jena-fuseki-core/src/main/resources/META-INF/NOTICE
 create mode 100644 jena-fuseki2/jena-fuseki-fulljar/src/main/resources/META-INF/NOTICE
 create mode 100644 jena-fuseki2/jena-fuseki-server/src/main/resources/META-INF/NOTICE
 create mode 100644 jena-fuseki2/jena-fuseki-war/war-inclusions/META-INF/NOTICE
 create mode 100644 jena-fuseki2/jena-fuseki-war/war-inclusions/NOTICE
 delete mode 100644 jena-fuseki2/jena-fuseki-webapp/src/main/resources/META-INF/DEPENDENCIES
 delete mode 100644 jena-fuseki2/jena-fuseki-webapp/src/main/resources/META-INF/LICENSE