Closed rju closed 1 week ago
author Jan Waller -- Mon, 22 Jul 2013 16:11:05 +0200
check whether we included additional jars.
If we did not, WONTIFX
author André van Hoorn -- Mon, 29 Jul 2013 17:10:17 +0200
Add licenses for the files copied-in for binary release (Kieker, Sigar, ...)
author André van Hoorn -- Mon, 2 Sep 2013 11:47:19 +0200
(version according to webapps/jpetstore/META-INF/maven/org.mybatis/jpetstore/pom.xml)
~/git_work/kieker/examples/JavaEEServletContainerExample/jetty-hightide-jpetstore <master>* $ find -name "*.jar" | sort | uniq > /tmp/jars.src ~/git_work/kieker <master>* $ unzip -l dist/release/kieker-1.8-SNAPSHOT_binaries.zip | grep jetty | grep jar | grep -o "/jetty.*" | sed s/"^\/jetty-hightide-jpetstore\/"/".\/"/g | sort | uniq > /tmp/jars.bin ~/git_work/kieker/examples/JavaEEServletContainerExample/jetty-hightide-jpetstore <master>* $ diff /tmp/jars.* 46d45 < ./webapps/jpetstore/WEB-INF/lib/kieker-1.8-SNAPSHOT_aspectj.jar
Changes implemented in changeset:1cfda0dbdff280629ee4a7c2d97d2ea9f13cf9ca/kieker-git
2. Added a .jar.LICENSE file for the afore-mentioned Kieker jar to the binary release archives:
~/git_work/kieker <master>* $ unzip -l dist/release/kieker-1.8-SNAPSHOT_binaries.zip | grep jetty | grep jar | grep -o "/jetty.*" | sed s/"^\/jetty-hightide-jpetstore\/"/".\/"/g | grep LICENSE ./webapps/jpetstore/WEB-INF/lib/kieker-1.8-SNAPSHOT_aspectj.jar.LICENSE ~/git_work/kieker <master>* $ tar -tzf dist/release/kieker-1.8-SNAPSHOT_binaries.tar.gz | grep jetty | grep jar | grep -o "/jetty.*" | sed s/"^\/jetty-hightide-jpetstore\/"/".\/"/g | grep LICENSE ./webapps/jpetstore/WEB-INF/lib/kieker-1.8-SNAPSHOT_aspectj.jar.LICENSE
3. Adjusted the release check script
4. Added some license information to the file LICENSE file:
~/git_work/kieker <master>* $ git diff examples/JavaEEServletContainerExample/LICENSE diff --git a/examples/JavaEEServletContainerExample/LICENSE b/examples/JavaEEServletContainerExample/LICENSE index 52b5274..ba1fc44 100644 --- a/examples/JavaEEServletContainerExample/LICENSE +++ b/examples/JavaEEServletContainerExample/LICENSE -1,3 +1,28 +As for Kieker in general, this example is licensed under Apache License 2.0 +(license text to be found below). The example includes external software, +for which other license conditions apply: + +1. Jetty - Servlet Engine and Http Server (http://www.eclipse.org/jetty/) + The directory `jetty-hightide-jpetstore/` contains an uncompressed Jetty + version, which is licensed under Apache License 2.0 and Eclipse Public + License 1.0. Both licenses are included in the `jetty-hightide-jpetstore/` + directory. We included a subset of the external libraries contained in the + Jetty release to be found in the `lib/` directory as-is without additional + license information. For additional libraries added to the directory by us + as part of this Kieker example, we included a `*.jar.LICENSE` file. + +2. MyBatis JPetStore (http://code.google.com/p/mybatis/) + The directory `jetty-hightide-jpetstore/webapps/jpetstore/` contains a + JPetStore version, which is licensed under the Apache License 2.0 license. + The license is included in that directory. We included a subset of the + external libraries contained in the JPetStore release to be found in the + `WEB-INF/lib/` directory as-is without additional license information. + For additional libraries added to the directory by us as part of this Kieker + example, we included a `*.jar.LICENSE` file. For additional modifications + to the example by us as part of this Kieker example see the README file + contained in the `jpetstore/` directory. + +=== Apache License Version 2.0, January 2004
JIRA Issue: KIEKER-1004 Missing library license information for jetty and jPetStore Original Reporter: Jan Waller
Several libraries are missing information on their respective licenses.
Namely in the following folders: