You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/18 10:09:44 UTC
[20/21] git commit: Fix build by ignoring JS libraries from licence
checks
Fix build by ignoring JS libraries from licence checks
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1c20477c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1c20477c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1c20477c
Branch: refs/heads/master
Commit: 1c20477c40f28f4b02eec43b282e34ee53c5c051
Parents: 8c1cac5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jun 18 10:08:06 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jun 18 10:08:06 2013 +0200
----------------------------------------------------------------------
wicket-examples/src/main/resources/META-INF/NOTICE | 9 +++++++++
wicket-examples/src/main/webapp/js-test/all.html | 2 +-
.../apache/wicket/util/license/ApacheLicenceHeaderTest.java | 8 ++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1c20477c/wicket-examples/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/resources/META-INF/NOTICE b/wicket-examples/src/main/resources/META-INF/NOTICE
index 6b945da..880ab4b 100644
--- a/wicket-examples/src/main/resources/META-INF/NOTICE
+++ b/wicket-examples/src/main/resources/META-INF/NOTICE
@@ -37,3 +37,12 @@
This product includes jhighlight (https://jhighlight.dev.java.net/)
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
+
+ Contains jquery.js javascript library released under a MIT style license.
+ jQuery Foundation, Inc, http://jquery.org/license
+
+ Contains qunit.js javascript library released under a MIT style license.
+ jQuery Foundation, Inc, http://jquery.org/license
+
+ Contains qunit.css released under a MIT style license.
+ jQuery Foundation, Inc, http://jquery.org/license
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1c20477c/wicket-examples/src/main/webapp/js-test/all.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/js-test/all.html b/wicket-examples/src/main/webapp/js-test/all.html
index 6b52857..5a13582 100644
--- a/wicket-examples/src/main/webapp/js-test/all.html
+++ b/wicket-examples/src/main/webapp/js-test/all.html
@@ -3,7 +3,7 @@
<head>
<title>Wicket Examples's JS tests</title>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" href="lib/qunit.css" type="text/css" media="screen" />
<script type="text/javascript" src="lib/jquery.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/wicket/blob/1c20477c/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
index 02a5d25..ff3451e 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
@@ -65,6 +65,14 @@ public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
*/
javaScriptIgnore.add("src/main/java/org/apache/wicket/examples/preview/dojo.js");
+ /**
+ * QUnit and jQuery used for tests - MIT licence. See NOTICE
+ */
+ javaScriptIgnore.add("src/main/webapp/js-test/lib/qunit.js");
+ javaScriptIgnore.add("src/main/webapp/js-test/lib/jquery.js");
+
+ cssIgnore.add("src/main/webapp/js-test/lib/qunit.css");
+
/*
* Part of an example
*/