summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2017-04-25 13:05:21 +0300
committerHenri Sara <henri.sara@gmail.com>2017-04-25 15:01:06 +0300
commitdf060e265ab097dffdfe49a4f011d306938a9021 (patch)
treeb53d6ec8bfdba09a1e2e7450c1ccfc840199a771
parent2c7c72b098ac494b11aec92faa0784ea7c063edb (diff)
downloadvaadin-framework-df060e265ab097dffdfe49a4f011d306938a9021.tar.gz
vaadin-framework-df060e265ab097dffdfe49a4f011d306938a9021.zip
Add missing fields to OSGi manifests
Adds RequiredExecutionEnvironment and License fields and renames some bundles (SymbolicName) for backwards compatibility.
-rw-r--r--client-compiled/bnd.bnd4
-rw-r--r--compatibility-client-compiled/bnd.bnd4
-rw-r--r--compatibility-server/bnd.bnd4
-rw-r--r--compatibility-shared/bnd.bnd4
-rw-r--r--compatibility-themes/bnd.bnd4
-rw-r--r--liferay-integration/bnd.bnd2
-rw-r--r--osgi-integration/bnd.bnd2
-rw-r--r--push/bnd.bnd2
-rw-r--r--server/bnd.bnd2
-rw-r--r--shared/bnd.bnd2
-rw-r--r--themes/bnd.bnd2
11 files changed, 27 insertions, 5 deletions
diff --git a/client-compiled/bnd.bnd b/client-compiled/bnd.bnd
index 60f79d805e..6dafd2826a 100644
--- a/client-compiled/bnd.bnd
+++ b/client-compiled/bnd.bnd
@@ -1,6 +1,8 @@
-Bundle-SymbolicName: ${project.groupId}.client.compiled
+Bundle-SymbolicName: ${project.groupId}.client-compiled
Bundle-Name: Default Widgetset
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.widgetset;-noimport:=true
diff --git a/compatibility-client-compiled/bnd.bnd b/compatibility-client-compiled/bnd.bnd
index 665722b56b..4ae54db981 100644
--- a/compatibility-client-compiled/bnd.bnd
+++ b/compatibility-client-compiled/bnd.bnd
@@ -1,6 +1,8 @@
-Bundle-SymbolicName: ${project.groupId}.compatibility.client.compiled
+Bundle-SymbolicName: ${project.groupId}.compatibility-client-compiled
Bundle-Name: Compatibility Widgetset
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.compatibility.widgetset;-noimport:=true
diff --git a/compatibility-server/bnd.bnd b/compatibility-server/bnd.bnd
index 98aae5e56f..ef841e7d0d 100644
--- a/compatibility-server/bnd.bnd
+++ b/compatibility-server/bnd.bnd
@@ -1,5 +1,7 @@
-Bundle-SymbolicName: ${project.groupId}.compatibility.server
+Bundle-SymbolicName: ${project.groupId}.compatibility-server
Bundle-Name: Vaadin Compatibility Server
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
org.osgi*,\
javax.validation*;resolution:=optional;version='${javax.validation.version}',\
diff --git a/compatibility-shared/bnd.bnd b/compatibility-shared/bnd.bnd
index 754a6a4ca0..c6c7af1b69 100644
--- a/compatibility-shared/bnd.bnd
+++ b/compatibility-shared/bnd.bnd
@@ -1,5 +1,7 @@
-Bundle-SymbolicName: ${project.groupId}.compatibility.shared
+Bundle-SymbolicName: ${project.groupId}.compatibility-shared
Bundle-Name: Vaadin Compatibility Shared
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
org.osgi*
Export-Package: \
diff --git a/compatibility-themes/bnd.bnd b/compatibility-themes/bnd.bnd
index ee3e21796b..77a814a990 100644
--- a/compatibility-themes/bnd.bnd
+++ b/compatibility-themes/bnd.bnd
@@ -1,6 +1,8 @@
-Bundle-SymbolicName: ${project.groupId}.compatibility.themes
+Bundle-SymbolicName: ${project.groupId}.compatibility-themes
Bundle-Name: Vaadin Compatibility Themes
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.compatibility.themes;-noimport:=true
diff --git a/liferay-integration/bnd.bnd b/liferay-integration/bnd.bnd
index 53295f4db9..304a507547 100644
--- a/liferay-integration/bnd.bnd
+++ b/liferay-integration/bnd.bnd
@@ -1,6 +1,8 @@
Bundle-SymbolicName: ${project.groupId}.liferay.integration
Bundle-Name: Vaadin Liferay Integration
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.liferay*;-noimport:=true
diff --git a/osgi-integration/bnd.bnd b/osgi-integration/bnd.bnd
index 1244665199..502e24de25 100644
--- a/osgi-integration/bnd.bnd
+++ b/osgi-integration/bnd.bnd
@@ -1,6 +1,8 @@
Bundle-SymbolicName: ${project.groupId}.osgi.integration
Bundle-Name: Vaadin OSGi Integration
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
diff --git a/push/bnd.bnd b/push/bnd.bnd
index f5d0deb9a7..1169785e24 100644
--- a/push/bnd.bnd
+++ b/push/bnd.bnd
@@ -1,6 +1,8 @@
Bundle-SymbolicName: ${project.groupId}.push
Bundle-Name: Vaadin Push
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.push;-noimport:=true
diff --git a/server/bnd.bnd b/server/bnd.bnd
index be2d43aad2..06cc058aaa 100644
--- a/server/bnd.bnd
+++ b/server/bnd.bnd
@@ -1,6 +1,8 @@
Bundle-SymbolicName: ${project.groupId}.server
Bundle-Name: Vaadin Server
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin.sass.*;resolution:=optional,\
com.liferay.portal.kernel.util;resolution:=optional,\
javax.portlet*;resolution:=optional,\
diff --git a/shared/bnd.bnd b/shared/bnd.bnd
index 1894e06bd1..d7d440871a 100644
--- a/shared/bnd.bnd
+++ b/shared/bnd.bnd
@@ -1,6 +1,8 @@
Bundle-SymbolicName: ${project.groupId}.shared
Bundle-Activator: com.vaadin.osgi.resources.OSGiVaadinResources
Bundle-Name: Vaadin Shared
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
org.osgi*
Export-Package: com.vaadin.osgi.resources;-noimport:=true,\
diff --git a/themes/bnd.bnd b/themes/bnd.bnd
index 7398d4de6e..9947e48059 100644
--- a/themes/bnd.bnd
+++ b/themes/bnd.bnd
@@ -1,6 +1,8 @@
Bundle-SymbolicName: ${project.groupId}.themes
Bundle-Name: Vaadin Themes
Bundle-Version: ${osgi.bundle.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.themes;-noimport:=true