This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-9.x by this push:
new 77b60de43b [WICKET-7139] Update OSGi imports for Wicket 9.x (#1071)
77b60de43b is described below
commit 77b60de43b5843ee50107d71e70a623794500fe4
Author: Matt Pavlovich <[email protected]>
AuthorDate: Thu Jan 9 12:19:00 2025 -0600
[WICKET-7139] Update OSGi imports for Wicket 9.x (#1071)
---
.github/workflows/maven.yml | 2 +-
wicket-core/pom.xml | 1 +
wicket-extensions/pom.xml | 45 ++++++++++++++++++++++++-
wicket-jmx/pom.xml | 2 +-
wicket/src/main/filtered-resources/features.xml | 1 +
5 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0fa78c233f..5f006e50d5 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -14,7 +14,7 @@ jobs:
run: sudo apt update
- name: Install Java & Puppeteer's dependencies
- run: sudo apt-get install -y openjdk-11-jdk chromium-browser
fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst
fonts-freefont-ttf gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0
libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1
libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0
libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1
libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrand [...]
+ run: sudo apt-get install -y openjdk-11-jdk chromium-browser
fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst
fonts-freefont-ttf libasound2t64 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2
libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgdk-pixbuf2.0-0
libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6
libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6
libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 l [...]
- name: Cache Maven packages
uses: actions/cache@v3
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 8f60858945..69e249f3d3 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -85,6 +85,7 @@ org.apache.wicket.markup.html.border;-noimport:=true,
org.apache.wicket.markup.html.debug;-noimport:=true,
org.apache.wicket.markup.html.form;-noimport:=true,
org.apache.wicket.markup.html.form.upload;-noimport:=true,
+org.apache.wicket.markup.html.form.upload.resource;-noimport:=true,
org.apache.wicket.markup.html.form.validation;-noimport:=true,
org.apache.wicket.markup.html.image;-noimport:=true,
org.apache.wicket.markup.html.image.resource;-noimport:=true,
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index 42a3c4d13b..5d7ee6b419 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -28,7 +28,50 @@
<name>Wicket Extensions</name>
<description>Wicket Extensions is a rich component library for the
Wicket framework.</description>
<properties>
-
<osgi.export.package>org.apache.wicket.extensions*;-noimport:=true</osgi.export.package>
+ <osgi.export.package>
+org.apache.wicket.extensions;-noimport:=true,
+org.apache.wicket.extensions.ajax;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.autocomplete;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.form.upload;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.modal;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.modal.theme;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.repeater;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.repeater.data.table;-noimport:=true,
+org.apache.wicket.extensions.ajax.markup.html.tabs;-noimport:=true,
+org.apache.wicket.extensions.breadcrumb;-noimport:=true,
+org.apache.wicket.extensions.breadcrumb.panel;-noimport:=true,
+org.apache.wicket.extensions.captcha.kittens;-noimport:=true,
+org.apache.wicket.extensions.markup.html.basic;-noimport:=true,
+org.apache.wicket.extensions.markup.html.captcha;-noimport:=true,
+org.apache.wicket.extensions.markup.html.form;-noimport:=true,
+org.apache.wicket.extensions.markup.html.form.datetime;-noimport:=true,
+org.apache.wicket.extensions.markup.html.form.palette;-noimport:=true,
+org.apache.wicket.extensions.markup.html.form.palette.component;-noimport:=true,
+org.apache.wicket.extensions.markup.html.form.palette.theme;-noimport:=true,
+org.apache.wicket.extensions.markup.html.form.select;-noimport:=true,
+org.apache.wicket.extensions.markup.html.image.resource;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.data.grid;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.data.sort;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.data.table;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.data.table.export;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.data.table.filter;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.tree;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.tree.content;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.tree.nested;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.tree.table;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.tree.theme;-noimport:=true,
+org.apache.wicket.extensions.markup.html.repeater.util;-noimport:=true,
+org.apache.wicket.extensions.markup.html.tabs;-noimport:=true,
+org.apache.wicket.extensions.model;-noimport:=true,
+org.apache.wicket.extensions.rating;-noimport:=true,
+org.apache.wicket.extensions.requestlogger;-noimport:=true,
+org.apache.wicket.extensions.util.encoding;-noimport:=true,
+org.apache.wicket.extensions.validation.validator;-noimport:=true,
+org.apache.wicket.extensions.wizard;-noimport:=true,
+org.apache.wicket.extensions.wizard.dynamic;-noimport:=true
+ </osgi.export.package>
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
</properties>
<dependencies>
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index f7575ef9a9..0c318fc45d 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -29,7 +29,7 @@
<description>Wicket Java Management Extensions</description>
<properties>
<osgi.export.package>org.apache.wicket.jmx*;-noimport:=true</osgi.export.package>
-
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
+
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",javax.management,*</osgi.import.package>
</properties>
<dependencies>
<dependency>
diff --git a/wicket/src/main/filtered-resources/features.xml
b/wicket/src/main/filtered-resources/features.xml
index 8ae5fcf4a3..a661010eae 100644
--- a/wicket/src/main/filtered-resources/features.xml
+++ b/wicket/src/main/filtered-resources/features.xml
@@ -20,6 +20,7 @@
<bundle>mvn:org.apache.wicket/wicket-devutils/${project.version}</bundle>
<bundle>mvn:org.apache.wicket/wicket-extensions/${project.version}</bundle>
<bundle>mvn:org.apache.wicket/wicket-jmx/${project.version}</bundle>
+
<bundle>mvn:org.apache.wicket/wicket-objectsizeof-agent/${project.version}</bundle>
<capability>wicket;provider:=apache-wicket</capability>
</feature>
</features>
