Make vaadin-server export the VAADIN package again (#20332)

Change-Id: I7241ec11a9bfe7ebfa6a720b1abb3c4d0fabdb36

diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml
index 642ab89930d21760ef2e0a2cbb728f8e39f0ff3c..0dc0432c56236eea3af015f3382376fd285e29b5 100644 (file)
--- a/compatibility-server/pom.xml
+++ b/compatibility-server/pom.xml
@@ -80,7 +80,7 @@
                     <instructions>
                         <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
                         <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
-                        <Export-Package>com.vaadin.v7.*;version="${osgi.bundle.version}"</Export-Package>
+                        <Export-Package>VAADIN;version="${osgi.bundle.version}",com.vaadin.v7.*;version="${osgi.bundle.version}"</Export-Package>
 
                         <Require-Bundle>
                             com.vaadin.server;bundle-version="${osgi.bundle.version}",

diff --git a/server/pom.xml b/server/pom.xml
index 4d65f1046c95807a96d813faf64f8aa0e9697591..67768c0caf20a26b22bdeab081bb23ae13d8dadb 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -189,7 +189,7 @@
                     <instructions>
                         <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
                         <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
-                        <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package>
+                        <Export-Package>VAADIN;version="${osgi.bundle.version}",com.vaadin.*;version="${osgi.bundle.version}"</Export-Package>
                         <Import-Package>javax.servlet;version="${osgi.javax.servlet.version}",
                             javax.servlet.http;version="${osgi.javax.servlet.version}",
                             javax.validation;version="${javax.validation.version}";resolution:=optional,