[SMX4-919] Resuming inclusion of sources artifact in bundles
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/bundles/trunk/gwt-dev-2.4.0@1235224 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 73f4dac..a95a109 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -26,14 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.gwt-dev</artifactId>
<version>2.4.0_1-SNAPSHOT</version>
-
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -43,43 +40,43 @@
<pkgArtifactId>gwt-dev</pkgArtifactId>
<pkgVersion>2.4.0</pkgVersion>
<servicemix.osgi.export>
- !javax.servlet*,
+ !javax.servlet*,
!org.apache*,
!org.eclipse*,
- com.google.gwt*;version=${pkgVersion}
+ com.google.gwt*;version=${pkgVersion};-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
- net.sourceforge.htmlunit.corejs.javascript;resolution:=optional,
- org.apache.catalina;resolution:=optional,
- org.apache.catalina.core;resolution:=optional,
- org.apache.catalina.logger;resolution:=optional,
- org.apache.catalina.startup;resolution:=optional,
- org.apache.commons.collections.map;resolution:=optional,
- org.apache.coyote.tomcat5;resolution:=optional,
- org.apache.tools.ant.types;resolution:=optional,
- org.eclipse.jdt.internal.core.util;resolution:=optional,
- org.mortbay.component;resolution:=optional,
- org.mortbay.jetty;resolution:=optional,
- org.mortbay.jetty.handler;resolution:=optional,
- org.mortbay.jetty.nio;resolution:=optional,
- org.mortbay.jetty.security;resolution:=optional,
- org.mortbay.jetty.webapp;resolution:=optional,
- org.mortbay.log;resolution:=optional,
- com.gargoylesoftware.htmlunit;resolution:=optional,
- com.gargoylesoftware.htmlunit.html;resolution:=optional,
- com.gargoylesoftware.htmlunit.javascript;resolution:=optional,
- com.gargoylesoftware.htmlunit.javascript.background;resolution:=optional,
- com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,
+ net.sourceforge.htmlunit.corejs.javascript;resolution:=optional,
+ org.apache.catalina;resolution:=optional,
+ org.apache.catalina.core;resolution:=optional,
+ org.apache.catalina.logger;resolution:=optional,
+ org.apache.catalina.startup;resolution:=optional,
+ org.apache.commons.collections.map;resolution:=optional,
+ org.apache.coyote.tomcat5;resolution:=optional,
+ org.apache.tools.ant.types;resolution:=optional,
+ org.eclipse.jdt.internal.core.util;resolution:=optional,
+ org.mortbay.component;resolution:=optional,
+ org.mortbay.jetty;resolution:=optional,
+ org.mortbay.jetty.handler;resolution:=optional,
+ org.mortbay.jetty.nio;resolution:=optional,
+ org.mortbay.jetty.security;resolution:=optional,
+ org.mortbay.jetty.webapp;resolution:=optional,
+ org.mortbay.log;resolution:=optional,
+ com.gargoylesoftware.htmlunit;resolution:=optional,
+ com.gargoylesoftware.htmlunit.html;resolution:=optional,
+ com.gargoylesoftware.htmlunit.javascript;resolution:=optional,
+ com.gargoylesoftware.htmlunit.javascript.background;resolution:=optional,
+ com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,
*
</servicemix.osgi.import.pkg>
<servicemix.osgi.private>
- com.google.gwt.core*,
- com.google.gwt.dev*,
- com.google.gwt.lang*,
- com.google.gwt.soyc*,
+ com.google.gwt.core*,
+ com.google.gwt.dev*,
+ com.google.gwt.lang*,
+ com.google.gwt.soyc*,
com.google.gwt.thirdparty*,
- com.google.gwt.util*
- </servicemix.osgi.private>
+ com.google.gwt.util*
+ </servicemix.osgi.private>
</properties>
<dependencies>
@@ -89,6 +86,15 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
@@ -124,4 +130,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
