updated jersey version Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/80435713 Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/80435713 Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/80435713
Branch: refs/heads/master Commit: 804357139d99721bc96186429d899376fd898d64 Parents: f7f76e1 Author: Reto Gmür <[email protected]> Authored: Sat Aug 29 23:11:22 2015 +0200 Committer: Reto Gmür <[email protected]> Committed: Sat Aug 29 23:11:22 2015 +0200 ---------------------------------------------------------------------- jaxrs.whiteboard.jersey/pom.xml | 183 +++++++++---------- provisioning/jaxrs-whiteboard/pom.xml | 32 ++-- .../src/main/feature/feature.xml | 2 + 3 files changed, 106 insertions(+), 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/clerezza/blob/80435713/jaxrs.whiteboard.jersey/pom.xml ---------------------------------------------------------------------- diff --git a/jaxrs.whiteboard.jersey/pom.xml b/jaxrs.whiteboard.jersey/pom.xml index 52a61d8..432d87d 100644 --- a/jaxrs.whiteboard.jersey/pom.xml +++ b/jaxrs.whiteboard.jersey/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.clerezza</groupId> <artifactId>clerezza</artifactId> @@ -30,104 +30,97 @@ - <name>Clerezza JAX-RS Whiteboard Jersey</name> - <description>Providing JAX-RS OSGi Whiteboard registration of components.</description> - <licenses> - <license> - <name>Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - <comments>A business-friendly OSS license</comments> - </license> - </licenses> + <name>Clerezza JAX-RS Whiteboard Jersey</name> + <description>Providing JAX-RS OSGi Whiteboard registration of components.</description> + <licenses> + <license> + <name>Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> - <build> - <!-- make it an OSGi bundle --> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Private-Package> - org.apache.stanbol.commons.web.base.jersey;version=${project.version} - </Private-Package> - <!-- <Import-Package> - javax.servlet; version="[2.5.0,4.0.0)", - javax.servlet.http; version="[2.5.0,4.0.0)", - org.apache.stanbol.commons.web.base, - org.apache.stanbol.commons.web.base.*, - * - </Import-Package> --> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <build> + <!-- make it an OSGi bundle --> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-scr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Private-Package> + org.apache.stanbol.commons.web.base.jersey;version=${project.version} + </Private-Package> + <!-- <Import-Package> + javax.servlet; version="[2.5.0,4.0.0)", + javax.servlet.http; version="[2.5.0,4.0.0)", + org.apache.stanbol.commons.web.base, + org.apache.stanbol.commons.web.base.*, + * + </Import-Package> --> + </instructions> + </configuration> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - <!-- Jersey --> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <!-- if your container implements Servlet API older than 3.0, - use "jersey-container-servlet-core", otherwise - "jersey-container-servlet" --> - <artifactId>jersey-container-servlet-core</artifactId> - <version>2.8</version> - </dependency> - <!-- jersey depends on unavailable version --> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.2-b04</version> - </dependency> - <!-- <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - </dependency> --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <!-- Jersey --> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> + <version>2.19</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <!-- if your container implements Servlet API older than 3.0, + use "jersey-container-servlet-core", otherwise + "jersey-container-servlet" --> + <artifactId>jersey-container-servlet-core</artifactId> + <version>2.21</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> - <!-- OSGi tax --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr.annotations</artifactId> - </dependency> - <!-- for tests --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> + <!-- OSGi tax --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr.annotations</artifactId> + </dependency> + <!-- for tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/clerezza/blob/80435713/provisioning/jaxrs-whiteboard/pom.xml ---------------------------------------------------------------------- diff --git a/provisioning/jaxrs-whiteboard/pom.xml b/provisioning/jaxrs-whiteboard/pom.xml index c57c543..baadb3d 100644 --- a/provisioning/jaxrs-whiteboard/pom.xml +++ b/provisioning/jaxrs-whiteboard/pom.xml @@ -43,7 +43,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> + <version>2.0.1</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -58,17 +58,17 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> - <version>2.17</version> + <version>2.21</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> - <version>2.17</version> + <version>2.21</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>2.17</version> + <version>2.21</version> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> @@ -76,22 +76,22 @@ use "jersey-container-servlet-core", otherwise "jersey-container-servlet" --> <artifactId>jersey-container-servlet-core</artifactId> - <version>2.17</version> + <version>2.21</version> </dependency> <dependency> <groupId>org.glassfish.hk2</groupId> <artifactId>hk2-api</artifactId> - <version>2.3.0</version> + <version>2.4.0-b31</version> </dependency> <dependency> <groupId>org.glassfish.hk2</groupId> <artifactId>hk2-locator</artifactId> - <version>2.3.0</version> + <version>2.4.0-b31</version> </dependency> <dependency> <groupId>org.glassfish.hk2</groupId> <artifactId>hk2-utils</artifactId> - <version>2.3.0</version> + <version>2.4.0-b31</version> </dependency> <dependency> <groupId>org.glassfish.hk2</groupId> @@ -102,32 +102,32 @@ <dependency> <groupId>org.glassfish.hk2.external</groupId> <artifactId>javax.inject</artifactId> - <version>2.3.0</version> + <version>2.4.0-b31</version> </dependency> - <dependency> + <!--<dependency> <groupId>org.glassfish.hk2.external</groupId> <artifactId>asm-all-repackaged</artifactId> - <version>2.3.0</version> + <version>2.4.0-b31</version> </dependency> - <dependency> + <dependency> <groupId>org.glassfish.hk2.external</groupId> <artifactId>cglib</artifactId> <version>2.2.0-b23</version> - </dependency> + </dependency> --> <dependency> <groupId>org.glassfish.hk2.external</groupId> <artifactId>aopalliance-repackaged</artifactId> - <version>2.2.0</version> + <version>2.4.0-b31</version> </dependency> <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.18.0-GA</version> + <version>3.20.0-GA</version> </dependency> <dependency> <groupId>org.glassfish.jersey.bundles.repackaged</groupId> <artifactId>jersey-guava</artifactId> - <version>2.17</version> + <version>2.21</version> </dependency> <dependency> <groupId>javax.validation</groupId> http://git-wip-us.apache.org/repos/asf/clerezza/blob/80435713/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml b/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml index a85b051..3863ebb 100644 --- a/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml +++ b/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml @@ -22,6 +22,8 @@ <details>${project.description}</details> <!-- <config>foo=bar</config> --> <bundle start-level="1">mvn:javax.annotation/javax.annotation-api/1.2</bundle> + <!-- to prevent "No generator was provided and there is no default generator registered" Exception, see https://java.net/jira/browse/JERSEY-2788 --> + <bundle start-level="15">mvn:org.glassfish.hk2/osgi-resource-locator/1.0.1</bundle> </feature> </features> \ No newline at end of file
