diff options
| author | Mirjan Merruko <mirjan@vaadin.com> | 2017-04-07 14:49:07 +0300 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-04-25 15:01:06 +0300 |
| commit | 24cfdc4ea0dc6260c044c6f2d53820a748f1d87e (patch) | |
| tree | e0b81e9bd86b5c9c7be6302b4abd31a833af2cb9 | |
| parent | 5308eb76f463ededa059f8d82653b29ee813a92a (diff) | |
| download | vaadin-framework-24cfdc4ea0dc6260c044c6f2d53820a748f1d87e.tar.gz vaadin-framework-24cfdc4ea0dc6260c044c6f2d53820a748f1d87e.zip | |
Fix dependency issues that cause the server bundle to be built incorrectly
| -rw-r--r-- | server/bnd.bnd | 3 | ||||
| -rw-r--r-- | server/pom.xml | 4 |
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 --> |