Repository: johnzon Updated Branches: refs/heads/master 37497fa4e -> 3fe71ac0d
JOHNZON-188 patch from Raymond Augé to apply Portable Java Contracts (OSGi), thanks Raymond Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/3fe71ac0 Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/3fe71ac0 Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/3fe71ac0 Branch: refs/heads/master Commit: 3fe71ac0d70c2e4238e902adeafbed825a8610a0 Parents: 37497fa Author: Romain Manni-Bucau <[email protected]> Authored: Fri Sep 28 17:15:56 2018 +0200 Committer: Romain Manni-Bucau <[email protected]> Committed: Fri Sep 28 17:15:56 2018 +0200 ---------------------------------------------------------------------- johnzon-jaxrs/pom.xml | 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml | 10 +++++----- pom.xml | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/3fe71ac0/johnzon-jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 23290db..bc30545 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxrs_2.1_spec</artifactId> - <version>1.0</version> + <version>1.1</version> <scope>provided</scope> <optional>true</optional> </dependency> http://git-wip-us.apache.org/repos/asf/johnzon/blob/3fe71ac0/johnzon-json-extras/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index f2e5c8d..3707370 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -37,7 +37,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jsonb_1.0_spec</artifactId> - <version>1.0</version> + <version>1.1</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/johnzon/blob/3fe71ac0/johnzon-jsonb/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 4451657..adb775f 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -37,28 +37,28 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-annotation_1.3_spec</artifactId> - <version>1.0</version> + <version>1.1</version> <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxrs_2.1_spec</artifactId> - <version>1.0</version> + <version>1.1</version> <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcdi_1.1_spec</artifactId> - <version>1.0</version> + <artifactId>geronimo-jcdi_2.0_spec</artifactId> + <version>1.1</version> <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jsonb_1.0_spec</artifactId> - <version>1.0</version> + <version>1.1</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/johnzon/blob/3fe71ac0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9dd1804..0af5250 100644 --- a/pom.xml +++ b/pom.xml @@ -40,12 +40,12 @@ <url>http://johnzon.apache.org</url> <properties> - <geronimo-jsonp.version>1.0</geronimo-jsonp.version> + <geronimo-jsonp.version>1.1</geronimo-jsonp.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <johnzon.site.url>https://svn.apache.org/repos/asf/johnzon/site/publish/</johnzon.site.url> <pubsub.url>scm:svn:${johnzon.site.url}</pubsub.url> <staging.directory>${project.build.directory}/site</staging.directory> - <felix.plugin.version>2.5.3</felix.plugin.version> + <felix.plugin.version>4.0.0</felix.plugin.version> <bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy> <java-compile.version>1.8</java-compile.version> <cxf.version>3.0.0</cxf.version> @@ -367,6 +367,7 @@ <extensions>true</extensions> <configuration> <instructions> + <_contract>*</_contract> <_removeheaders>Private-Package,Include-Resource,Embed-Dependency,Created-By,Bnd-LastModified,Built-By,Tool</_removeheaders> <_versionpolicy>${bnd.version.policy}</_versionpolicy> <Bundle-DocURL>http://johnzon.apache.org/</Bundle-DocURL>
