summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/bnd.bnd3
-rw-r--r--server/pom.xml4
2 files changed, 4 insertions, 3 deletions
diff --git a/server/bnd.bnd b/server/bnd.bnd
index dfeb5d5d39..be2d43aad2 100644
--- a/server/bnd.bnd
+++ b/server/bnd.bnd
@@ -5,11 +5,12 @@ Import-Package: com.vaadin.sass.*;resolution:=optional,\
com.liferay.portal.kernel.util;resolution:=optional,\
javax.portlet*;resolution:=optional,\
javax.validation*;resolution:=optional;version='${javax.validation.version}',\
- org.atmosphere*;resolution:=optional,\
+ org.atmosphere*;resolution:=optional;version='${atmosphere.runtime.version}',\
com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: !com.vaadin.sass*,\
!com.vaadin.shared*,\
!com.vaadin.osgi.resources*,\
!com.vaadin.osgi.push*,\
+ !com.vaadin.external*,\
com.vaadin*;-noimport:=true
diff --git a/server/pom.xml b/server/pom.xml
index 3d2f8c47bc..76f8341199 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -88,9 +88,9 @@
<!-- Small reflection library -->
<dependency>
- <groupId>com.googlecode.gentyref</groupId>
+ <groupId>com.vaadin.external</groupId>
<artifactId>gentyref</artifactId>
- <version>1.2.0</version>
+ <version>1.2.0.vaadin1</version>
</dependency>
<!-- OSGi API -->