You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/08/15 19:34:15 UTC
[commons-fileupload] branch master updated: Generate some OSGi metadata.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
The following commit(s) were added to refs/heads/master by this push:
new 4cf5fba5 Generate some OSGi metadata.
4cf5fba5 is described below
commit 4cf5fba54c3e48f48684ad6e5171ae70f2a1a1ed
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 15 15:34:11 2023 -0400
Generate some OSGi metadata.
See also PR #233
---
commons-fileupload2-jakarta-servlet5/pom.xml | 6 ++++++
commons-fileupload2-jakarta-servlet6/pom.xml | 8 +++++++-
commons-fileupload2-javax/pom.xml | 4 ++++
commons-fileupload2-portlet/pom.xml | 4 ++++
src/changes/changes.xml | 1 +
5 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/commons-fileupload2-jakarta-servlet5/pom.xml b/commons-fileupload2-jakarta-servlet5/pom.xml
index 6b63386a..a561c1d0 100644
--- a/commons-fileupload2-jakarta-servlet5/pom.xml
+++ b/commons-fileupload2-jakarta-servlet5/pom.xml
@@ -36,6 +36,12 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
<commons.module.name>org.apache.commons.fileupload2.jakarta.servlet5</commons.module.name>
+
+ <!-- Override properties for the OSGi maven-bundle-plugin to generate proper manifest -->
+ <commons.osgi.requireCapability>osgi.contract;filter:="(&(osgi.contract=JakartaServlet)(version=5.0))"</commons.osgi.requireCapability>
+
+ <!-- Override link to Jakarta EE -->
+ <commons.javadoc.javaee.link>https://jakarta.ee/specifications/platform/9.1/apidocs/</commons.javadoc.javaee.link>
</properties>
<dependencies>
diff --git a/commons-fileupload2-jakarta-servlet6/pom.xml b/commons-fileupload2-jakarta-servlet6/pom.xml
index e820b3d7..df3e456e 100644
--- a/commons-fileupload2-jakarta-servlet6/pom.xml
+++ b/commons-fileupload2-jakarta-servlet6/pom.xml
@@ -35,7 +35,13 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
- <commons.module.name>org.apache.commons.fileupload2.jakarta.servlet6.servlet6.servlet6</commons.module.name>
+ <commons.module.name>org.apache.commons.fileupload2.jakarta.servlet6</commons.module.name>
+
+ <!-- Override properties for the OSGi maven-bundle-plugin to generate proper manifest -->
+ <commons.osgi.requireCapability>osgi.contract;filter:="(&(osgi.contract=JakartaServlet)(version=6.0))"</commons.osgi.requireCapability>
+
+ <!-- Override link to Jakarta EE -->
+ <commons.javadoc.javaee.link>https://jakarta.ee/specifications/platform/10/apidocs/</commons.javadoc.javaee.link>
</properties>
<dependencies>
diff --git a/commons-fileupload2-javax/pom.xml b/commons-fileupload2-javax/pom.xml
index 9db1eec4..9219e174 100644
--- a/commons-fileupload2-javax/pom.xml
+++ b/commons-fileupload2-javax/pom.xml
@@ -36,6 +36,10 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
<commons.module.name>org.apache.commons.fileupload2.javax</commons.module.name>
+
+ <!-- Override properties for the OSGi maven-bundle-plugin to generate proper manifest -->
+ <commons.osgi.import>javax.servlet.*;version=${commons.servlet-api.version},*</commons.osgi.import>
+ <commons.osgi.requireCapability>osgi.contract;filter:="(&(osgi.contract=JavaServlet)(version=${commons.servlet-api.version}))"</commons.osgi.requireCapability>
</properties>
<dependencies>
diff --git a/commons-fileupload2-portlet/pom.xml b/commons-fileupload2-portlet/pom.xml
index c9299010..f254f4a4 100644
--- a/commons-fileupload2-portlet/pom.xml
+++ b/commons-fileupload2-portlet/pom.xml
@@ -36,6 +36,10 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
<commons.module.name>org.apache.commons.fileupload2.portlet</commons.module.name>
+
+ <!-- Override properties for the OSGi maven-bundle-plugin to generate proper manifest -->
+ <commons.osgi.import>!javax.portlet,*</commons.osgi.import>
+ <commons.osgi.dynamicImport>javax.portlet</commons.osgi.dynamicImport>
</properties>
<dependencies>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3f117f1f..d6b2ae7a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -48,6 +48,7 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="add" due-to="James Reeves">Fix off-by-one error when checking fileSizeMax in FileItemInputImpl #235.</action>
<!-- ADD -->
<action dev="ggregory" type="add" due-to="Gary Gregory">Refactor to support Jakarta Servlet 5 and 6.</action>
+ <action dev="ggregory" type="add" due-to="Michal H Siemaszko, Gary Gregory">Generate some OSGi metadata.</action>
<!-- UDPATE -->
<action dev="ggregory" type="update" due-to="Dependabot">Bump Java from 8 to 11.</action>
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump commons-parent from 58 to 59.</action>