diff -Nru jersey-1.14/jersey-client/pom.xml jersey-1.14-gil/jersey-client/pom.xml
--- jersey-1.14/jersey-client/pom.xml 2012-09-18 15:33:38.000000000 +0200
+++ jersey-1.14-gil/jersey-client/pom.xml 2012-09-18 15:43:51.482442292 +0200
@@ -115,8 +115,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
diff -Nru jersey-1.14/jersey-core/pom.xml jersey-1.14-gil/jersey-core/pom.xml
--- jersey-1.14/jersey-core/pom.xml 2012-09-18 15:33:44.000000000 +0200
+++ jersey-1.14-gil/jersey-core/pom.xml 2012-09-18 15:47:07.716963250 +0200
@@ -71,9 +71,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff -Nru jersey-1.14/jersey-grizzly/pom.xml jersey-1.14-gil/jersey-grizzly/pom.xml
--- jersey-1.14/jersey-grizzly/pom.xml 2012-09-18 15:33:38.000000000 +0200
+++ jersey-1.14-gil/jersey-grizzly/pom.xml 2012-09-18 15:48:15.865462858 +0200
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
diff -Nru jersey-1.14/jersey-json/pom.xml jersey-1.14-gil/jersey-json/pom.xml
--- jersey-1.14/jersey-json/pom.xml 2012-09-18 15:34:07.000000000 +0200
+++ jersey-1.14-gil/jersey-json/pom.xml 2012-09-18 15:49:30.411543662 +0200
@@ -115,7 +115,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.moxy</artifactId>
+ <artifactId>eclipselink</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
diff -Nru jersey-1.14/jersey-server/pom.xml jersey-1.14-gil/jersey-server/pom.xml
--- jersey-1.14/jersey-server/pom.xml 2012-09-18 15:34:07.000000000 +0200
+++ jersey-1.14-gil/jersey-server/pom.xml 2012-09-18 15:51:34.391885740 +0200
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
@@ -165,9 +165,9 @@
</plugin>
<plugin>
- <groupId>com.sun.tools.xjc.maven2</groupId>
- <artifactId>maven-jaxb-plugin</artifactId>
- <version>1.1.1</version>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb22-plugin</artifactId>
+ <version>0.8.1</version>
<executions>
<execution>
<goals>
diff -Nru jersey-1.14/jersey-server-linking/pom.xml jersey-1.14-gil/jersey-server-linking/pom.xml
--- jersey-1.14/jersey-server-linking/pom.xml 2012-09-18 15:33:46.000000000 +0200
+++ jersey-1.14-gil/jersey-server-linking/pom.xml 2012-09-18 15:54:10.796453577 +0200
@@ -58,9 +58,9 @@
<version>2.2</version>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <version>7.0.27</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff -Nru jersey-1.14/jersey-servlet/pom.xml jersey-1.14-gil/jersey-servlet/pom.xml
--- jersey-1.14/jersey-servlet/pom.xml 2012-09-18 15:33:09.000000000 +0200
+++ jersey-1.14-gil/jersey-servlet/pom.xml 2012-09-18 16:24:04.002326795 +0200
@@ -53,28 +53,40 @@
<name>jersey-servlet</name>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.ejb</artifactId>
- <version>3.1</version>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
+ <artifactId>weld-core</artifactId>
<version>1.1.4.Final</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-build-config</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
@@ -83,14 +95,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>1.8.2</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
diff -Nru jersey-1.14/pom.xml jersey-1.14-gil/pom.xml
--- jersey-1.14/pom.xml 2012-09-18 15:34:07.000000000 +0200
+++ jersey-1.14-gil/pom.xml 2012-09-18 16:17:18.379481190 +0200
@@ -236,7 +236,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.moxy</artifactId>
+ <artifactId>eclipselink</artifactId>
</dependency>
</dependencies>
<build>
@@ -511,7 +511,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.moxy</artifactId>
+ <artifactId>eclipselink</artifactId>
<version>${moxy.version}</version>
</dependency>
</dependencies>