This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new dd17a96ea9 cleanup Manifest and JSON - LICENSE (#304)
dd17a96ea9 is described below
commit dd17a96ea9e21fbe000848f96aabcd347f938b11
Author: Stefan Bischof <[email protected]>
AuthorDate: Fri Apr 12 06:37:15 2024 +0200
cleanup Manifest and JSON - LICENSE (#304)
* rm Include-Resource from MANIFEST
was:
Include-Resource: META-INF/DEPENDENCIES=target/maven-shared-archive-re
sources/META-INF/DEPENDENCIES,META-INF/LICENSE=target/maven-shared-ar
chive-resources/META-INF/LICENSE,META-INF/NOTICE=target/maven-shared-
archive-resources/META-INF/NOTICE
* [webconsole] rm json part
came in commit a159abb39424f0a6c44586ef7f946378fa39db17
not relevant today
---
http/jetty12/pom.xml | 4 ++--
.../src/main/appended-resources/META-INF/LICENSE | 25 ----------------------
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 3adb09a0d4..6222fdbfc1 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -228,7 +228,7 @@
{maven-resources},${project.build.directory}/serviceloader-resources
</Include-Resource>
<_removeheaders>
- Private-Package,Conditional-Package
+
Private-Package,Conditional-Package,Include-Resource
</_removeheaders>
</instructions>
</configuration>
@@ -311,7 +311,7 @@
{maven-resources}
</Include-Resource>
<_removeheaders>
-
X-Jetty-Version,Private-Package,Conditional-Package
+
X-Jetty-Version,Private-Package,Conditional-Package,Include-Resource
</_removeheaders>
</instructions>
</configuration>
diff --git a/webconsole/src/main/appended-resources/META-INF/LICENSE
b/webconsole/src/main/appended-resources/META-INF/LICENSE
index e790e598f1..cb72821b48 100644
--- a/webconsole/src/main/appended-resources/META-INF/LICENSE
+++ b/webconsole/src/main/appended-resources/META-INF/LICENSE
@@ -404,28 +404,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER
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.
-
-
-For the org.json classes (applies if org.json classes are embedded):
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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.
\ No newline at end of file
