Skip to content

Commit 50fa838

Browse files
authored
fix: do not include flow-server packages from OSGI manifest (#9414)
## Description Fixes the `vaadin-board` OSGI manifest to not export `com.vaadin.flow.component.clipboard` from `flow-server`: - Change the exported package pattern to not use a wildcard before the component name - Introduce a `osgi.export.package.additional` variable, so that `vaadin-grid` can still export `com.vaadin.flow.component.treegrid`, which is otherwise not exported anymore with the new pattern - Remove the `-noimport:=true` directive to simplify the implementation, which doesn't seem to make any difference as the same manifests are generated without it - Remove some demo related instructions, which should not be relevant since demo modules have been removed Fixes #9392 ## Type of change - Bugfix
1 parent e0ad3c5 commit 50fa838

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

pom.xml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,9 @@
319319
320320
dash: -
321321
packageNameWithoutDash: ${replacestring;${packageNameWithDash};${dash};}
322+
packageName: ${replacestring;${packageNameWithoutDash};icons;icon}
322323
323-
packageNameTmp: ${replacestring;${packageNameWithoutDash};icons;icon}
324-
325-
isDemoPattern: .*-flow-demo
326-
isDemo: ${matches;${project.artifactId};${isDemoPattern}}
327-
packageName: ${packageNameTmp}${if;${isDemo};.demo}
328-
329-
exportPackageDefault: ${project.groupId}.flow.component.*${packageName}.*
324+
exportPackageDefault: ${project.groupId}.flow.component.${packageName}.*
330325
isExportPackageDefault: ${is;${osgi.export.package};default}
331326
exportPackage: ${if;${isExportPackageDefault};${exportPackageDefault};${osgi.export.package}}
332327
symbolicNameDefault: ${project.groupId}.flow.component.${packageName}
@@ -336,17 +331,14 @@
336331
Bundle-SymbolicName: ${symbolicName}
337332
338333
Import-Package: *
339-
Export-Package: ${exportPackage};-noimport:=true
334+
Export-Package: ${join;${exportPackage};${osgi.export.package.additional}}
340335
Bundle-License: ${osgi.bundle.license}
341336
342337
CvdlName: ${cvdlName}
343338
Implementation-Title: ${project.name}
344339
Vaadin-Package-Version: 1
345340
includeresource.resources: -src/main/resources
346341
347-
//if profile war is used in demos
348-
fixupmessages: "Classes found in the wrong directory";is:=warning
349-
350342
]]></bnd>
351343
</configuration>
352344
<executions>

vaadin-grid-flow-parent/vaadin-grid-flow/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<name>Vaadin Grid</name>
1212
<description>Vaadin Grid</description>
1313
<properties>
14+
<osgi.export.package.additional>com.vaadin.flow.component.treegrid.*</osgi.export.package.additional>
1415
<surefire.argLine>-javaagent:${org.mockito:mockito-core:jar}</surefire.argLine>
1516
</properties>
1617
<dependencies>

0 commit comments

Comments
 (0)