From: Artur Signell <artur@vaadin.com>
Date: Mon, 10 Oct 2016 15:35:19 +0000 (+0300)
Subject: Make vaadin-server export the VAADIN package again (#20332)
X-Git-Tag: 8.0.0.alpha9~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=247a64ee5f3dccbdd916b7e26df68cb962f50cd6;p=vaadin-framework.git

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 642ab89930..0dc0432c56 100644
--- 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 4d65f1046c..67768c0caf 100644
--- 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,