Skip to content

Commit df060e2

Browse files
Henri Sarahesara
Henri Sara
authored andcommitted
Add missing fields to OSGi manifests
Adds RequiredExecutionEnvironment and License fields and renames some bundles (SymbolicName) for backwards compatibility.
1 parent 2c7c72b commit df060e2

File tree

11 files changed

+27
-5
lines changed

11 files changed

+27
-5
lines changed

Diff for: client-compiled/bnd.bnd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
Bundle-SymbolicName: ${project.groupId}.client.compiled
1+
Bundle-SymbolicName: ${project.groupId}.client-compiled
22
Bundle-Name: Default Widgetset
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
57
*
68
Export-Package: com.vaadin.osgi.widgetset;-noimport:=true

Diff for: compatibility-client-compiled/bnd.bnd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
Bundle-SymbolicName: ${project.groupId}.compatibility.client.compiled
1+
Bundle-SymbolicName: ${project.groupId}.compatibility-client-compiled
22
Bundle-Name: Compatibility Widgetset
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
57
*
68
Export-Package: com.vaadin.osgi.compatibility.widgetset;-noimport:=true

Diff for: compatibility-server/bnd.bnd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
Bundle-SymbolicName: ${project.groupId}.compatibility.server
1+
Bundle-SymbolicName: ${project.groupId}.compatibility-server
22
Bundle-Name: Vaadin Compatibility Server
3+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
4+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
35
Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
46
org.osgi*,\
57
javax.validation*;resolution:=optional;version='${javax.validation.version}',\

Diff for: compatibility-shared/bnd.bnd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
Bundle-SymbolicName: ${project.groupId}.compatibility.shared
1+
Bundle-SymbolicName: ${project.groupId}.compatibility-shared
22
Bundle-Name: Vaadin Compatibility Shared
3+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
4+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
35
Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
46
org.osgi*
57
Export-Package: \

Diff for: compatibility-themes/bnd.bnd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
Bundle-SymbolicName: ${project.groupId}.compatibility.themes
1+
Bundle-SymbolicName: ${project.groupId}.compatibility-themes
22
Bundle-Name: Vaadin Compatibility Themes
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
57
*
68
Export-Package: com.vaadin.osgi.compatibility.themes;-noimport:=true

Diff for: liferay-integration/bnd.bnd

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Bundle-SymbolicName: ${project.groupId}.liferay.integration
22
Bundle-Name: Vaadin Liferay Integration
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
57
*
68
Export-Package: com.vaadin.osgi.liferay*;-noimport:=true

Diff for: osgi-integration/bnd.bnd

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Bundle-SymbolicName: ${project.groupId}.osgi.integration
22
Bundle-Name: Vaadin OSGi Integration
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
57
*
68

Diff for: push/bnd.bnd

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Bundle-SymbolicName: ${project.groupId}.push
22
Bundle-Name: Vaadin Push
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
57
*
68
Export-Package: com.vaadin.osgi.push;-noimport:=true

Diff for: server/bnd.bnd

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Bundle-SymbolicName: ${project.groupId}.server
22
Bundle-Name: Vaadin Server
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin.sass.*;resolution:=optional,\
57
com.liferay.portal.kernel.util;resolution:=optional,\
68
javax.portlet*;resolution:=optional,\

Diff for: shared/bnd.bnd

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Bundle-SymbolicName: ${project.groupId}.shared
22
Bundle-Activator: com.vaadin.osgi.resources.OSGiVaadinResources
33
Bundle-Name: Vaadin Shared
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
57
org.osgi*
68
Export-Package: com.vaadin.osgi.resources;-noimport:=true,\

Diff for: themes/bnd.bnd

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Bundle-SymbolicName: ${project.groupId}.themes
22
Bundle-Name: Vaadin Themes
33
Bundle-Version: ${osgi.bundle.version}
4+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
5+
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
46
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
57
*
68
Export-Package: com.vaadin.osgi.themes;-noimport:=true

0 commit comments

Comments
 (0)