felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1763342 - in /felix/trunk/http: bridge/ bridge/src/main/appended-resources/ bridge/src/main/appended-resources/META-INF/ jetty/ jetty/src/main/appended-resources/ jetty/src/main/appended-resources/META-INF/
Date Wed, 05 Oct 2016 06:37:32 GMT
Author: cziegeler
Date: Wed Oct  5 06:37:32 2016
New Revision: 1763342

URL: http://svn.apache.org/viewvc?rev=1763342&view=rev
Log:
Correct NOTICE, DEPENDENCIES, and LICENSE
http.bridge contains OSGi code, licensed under Apache 2.9
http.jetty contains code from OSGi and Eclipse, licensed under Apache 2.0

Added:
    felix/trunk/http/bridge/src/main/appended-resources/
    felix/trunk/http/bridge/src/main/appended-resources/META-INF/
    felix/trunk/http/bridge/src/main/appended-resources/META-INF/DEPENDENCIES
    felix/trunk/http/jetty/src/main/appended-resources/
    felix/trunk/http/jetty/src/main/appended-resources/META-INF/
    felix/trunk/http/jetty/src/main/appended-resources/META-INF/DEPENDENCIES
      - copied, changed from r1763341, felix/trunk/http/jetty/DEPENDENCIES
Removed:
    felix/trunk/http/bridge/DEPENDENCIES
    felix/trunk/http/bridge/LICENSE
    felix/trunk/http/bridge/NOTICE
    felix/trunk/http/jetty/DEPENDENCIES
    felix/trunk/http/jetty/LICENSE
    felix/trunk/http/jetty/NOTICE

Added: felix/trunk/http/bridge/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/http/bridge/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1763342&view=auto
==============================================================================
--- felix/trunk/http/bridge/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/http/bridge/src/main/appended-resources/META-INF/DEPENDENCIES Wed Oct  5 06:37:32
2016
@@ -0,0 +1,16 @@
+I. Included Third-Party Software
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2016).
+Licensed under the Apache License 2.0.
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2016).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0

Copied: felix/trunk/http/jetty/src/main/appended-resources/META-INF/DEPENDENCIES (from r1763341,
felix/trunk/http/jetty/DEPENDENCIES)
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/http/jetty/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/http/jetty/DEPENDENCIES&r1=1763341&r2=1763342&rev=1763342&view=diff
==============================================================================
--- felix/trunk/http/jetty/DEPENDENCIES (original)
+++ felix/trunk/http/jetty/src/main/appended-resources/META-INF/DEPENDENCIES Wed Oct  5 06:37:32
2016
@@ -1,26 +1,19 @@
-Apache Felix HTTP Service Jetty
-Copyright 2011 The Apache Software Foundation
-
-This software was developed at the Apache Software Foundation
-(http://www.apache.org) and may have dependencies on other
-Apache software licensed under Apache License 2.0.
-
 I. Included Third-Party Software
 
 This product includes software developed by
-Mortbay (http://mortbay.org)
+Eclipse (http://www.eclipse.org/jetty/)
 Licensed under the Apache License 2.0.
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
+Copyright (c) OSGi Alliance (2000, 2016).
 Licensed under the Apache License 2.0.
 
 II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2009).
+Copyright (c) OSGi Alliance (2000, 2016).
 Licensed under the Apache License 2.0.
 
 III. License Summary



Mime
View raw message