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 2017/06/20 08:53:59 UTC
wicket git commit: WICKET-6402 OSGi-Manifest: wicket does not declare
BSN
Repository: wicket
Updated Branches:
refs/heads/master b310601e7 -> 2e8d465c3
WICKET-6402 OSGi-Manifest: wicket does not declare BSN
Change the packaging type to "bundle"
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2e8d465c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2e8d465c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2e8d465c
Branch: refs/heads/master
Commit: 2e8d465c31cf5024c471e1431042c329a822d2fe
Parents: b310601
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jun 20 10:53:12 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jun 20 10:53:12 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 +
wicket-auth-roles/pom.xml | 2 +-
wicket-bean-validation/pom.xml | 1 +
wicket-cdi-1.1/pom.xml | 2 +-
wicket-cdi/pom.xml | 2 +-
wicket-core/pom.xml | 2 +-
.../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 2 +-
wicket-datetime/pom.xml | 2 +-
wicket-devutils/pom.xml | 2 +-
wicket-experimental/wicket-http2/wicket-http2-core/pom.xml | 2 +-
wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml | 2 +-
wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml | 2 +-
wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml | 2 +-
wicket-experimental/wicket-metrics/pom.xml | 2 +-
wicket-extensions/pom.xml | 2 +-
wicket-guice/pom.xml | 2 +-
wicket-ioc/pom.xml | 2 +-
wicket-jmx/pom.xml | 2 +-
wicket-native-websocket/wicket-native-websocket-core/pom.xml | 2 +-
wicket-native-websocket/wicket-native-websocket-javax/pom.xml | 2 +-
wicket-request/pom.xml | 1 +
wicket-spring/pom.xml | 2 +-
wicket-util/pom.xml | 1 +
wicket-velocity/pom.xml | 2 +-
24 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a95eaaa..4381f66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -727,6 +727,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version>
+ <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-auth-roles/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index 4ee971e..442eb7e 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-auth-roles</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Auth Roles</name>
<description>
Wicket Authorization Integration Based on roles, metadata and
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-bean-validation/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 260bfa2..c9b345b 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -8,6 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-bean-validation</artifactId>
+ <packaging>bundle</packaging>
<name>Wicket Bean Validation</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-cdi-1.1/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
index c05d568..82058a8 100644
--- a/wicket-cdi-1.1/pom.xml
+++ b/wicket-cdi-1.1/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi-1.1</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket CDI 1.1</name>
<description>
Provides integration between Wicket and CDI containers. Enables injection of
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index 7412d49..21d4112 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket CDI Integration</name>
<description>
Provides integration between Wicket and CDI containers. Enables injection of
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index f8bb354..d9386c5 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Core</name>
<description>
Wicket is a Java web application framework that takes simplicity,
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index bb76b01..b7ae6fd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -1210,7 +1210,7 @@
if (scriptWithIdentifierR.test(text)) {
var scripts = [];
var scr;
- while ( (scr = scriptSplitterR.exec(text) ) != null ) {
+ while ( (scr = scriptSplitterR.exec(text) ) !== null ) {
scripts.push(scr[0]);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-datetime/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-datetime/pom.xml b/wicket-datetime/pom.xml
index d873f5e..26330c3 100644
--- a/wicket-datetime/pom.xml
+++ b/wicket-datetime/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-datetime</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Date/Time</name>
<description>Date/Time components and utilities for Wicket</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-devutils/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml
index 50db14b..b5bee39 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-devutils</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Development Utilities</name>
<description>
Wicket development utilities provide helpful features that
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
index 81b88f3..f5c50cd 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-http2-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Http/2 Core</name>
<description>
Wicket’s implementation to use the PushBuilder API
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
index 404a491..00e313e 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-http2-jetty</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Http/2 Jetty 9.3+</name>
<description>
Wicket’s implementation to use the PushBuilder API
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml
index e46c04a..ad6dafd 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-http2-tomcat</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Http/2 Tomcat 8.5+</name>
<description>
Wicket’s implementation to use the PushBuilder API
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
index e8b7afa..402d547 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-http2-undertow</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Http/2 Undertow 2+</name>
<description>
Wicket’s implementation to use the PushBuilder API
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-experimental/wicket-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml
index 783547d..792cc95 100644
--- a/wicket-experimental/wicket-metrics/pom.xml
+++ b/wicket-experimental/wicket-metrics/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>wicket-metrics</artifactId>
<version>0.3-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Metrics</name>
<description>
Wicket’s implementation to show metric information
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index 419f1a4..96508ca 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-extensions</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Extensions</name>
<description>Wicket Extensions is a rich component library for the Wicket framework.</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-guice/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index 9d8d2a8..6f4011a 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-guice</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Guice Integration</name>
<description>
Google Guice integration in your Wicket web applications. See the
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index cb7919f..b1f517d 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-ioc</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket IoC common code</name>
<description>
Wicket IoC common dependencies for injection and proxying. Used by
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index d292a3f..f1ceb0a 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-jmx</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket JMX</name>
<description>Wicket Java Management Extensions</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-native-websocket/wicket-native-websocket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 723222b..6a1e53f 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>wicket-native-websocket-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Native WebSocket Core</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index aabc073..27825f3 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-javax</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Native WebSocket Javax</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-request/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index 5d60da7..b6409d4 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -23,6 +23,7 @@
<version>8.0.0-SNAPSHOT</version>
</parent>
<artifactId>wicket-request</artifactId>
+ <packaging>bundle</packaging>
<name>Wicket Request</name>
<url>http://maven.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-spring/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index 661a4d2..d545bf9 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-spring</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Spring Integration</name>
<description>Integration project to use Spring injection in your Wicket applications. See the wicket-spring-examples for integration patterns.</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 98997d0..b9caec1 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-util</artifactId>
+ <packaging>bundle</packaging>
<name>Wicket Util</name>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e8d465c/wicket-velocity/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml
index ab6baec..c7617ee 100644
--- a/wicket-velocity/pom.xml
+++ b/wicket-velocity/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-velocity</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Velocity</name>
<description>
Provides a specialized panel and some related utilities that enables