You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by aledsage <gi...@git.apache.org> on 2016/08/09 22:45:15 UTC
[GitHub] brooklyn-server pull request #294: Adds brooklyn-rest-client feature
GitHub user aledsage opened a pull request:
https://github.com/apache/brooklyn-server/pull/294
Adds brooklyn-rest-client feature
@neykov can you take a look please?
Useful for any downstream projects that depend on brooklyn-rest-client and that want to run in Karaf.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/brooklyn-server brooklyn-rest-client-feature
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/294.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #294
----
commit 2ec42ee225acb847ab627ed944c52578469f3d46
Author: Aled Sage <al...@gmail.com>
Date: 2016-08-09T13:38:46Z
Adds brooklyn-rest-client feature
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-server issue #294: Adds brooklyn-rest-client feature
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-server/pull/294
@neykov thanks for the great comments! I'm made those changes and confirmed it works in a downstream project.
For the `javax.annotation` bundle, I now get version 1.2 already present in Karaf 4.0.4:
```
bundle:list -t 0 | grep -i annot
27 | Active | 100 | 2.4.5 | Jackson-annotations
33 | Active | 80 | 2.4.5 | Jackson-module-JAXB-annotations
65 | Active | 80 | 1.5.6 | swagger-annotations
69 | Active | 10 | 1.2 | javax.annotation API
```
Are you happy with merging this now?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-server issue #294: Adds brooklyn-rest-client feature
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on the issue:
https://github.com/apache/brooklyn-server/pull/294
Looks great, merging.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-server pull request #294: Adds brooklyn-rest-client feature
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/294#discussion_r74196358
--- Diff: karaf/features/src/main/feature/feature.xml ---
@@ -100,6 +100,38 @@
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
</feature>
+ <feature name="brooklyn-rest-client" version="${project.version}" description="Brooklyn REST Client">
+ <feature>brooklyn-rest-api</feature>
+ <feature>swagger</feature>
+
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-client/${project.version}</bundle>
+
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
+ <bundle dependency='true'>mvn:commons-logging/commons-logging/${commons-logging.version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+
+ <bundle dependency='true'>wrap:mvn:com.google.code.findbugs/jsr305/${jsr305.version}</bundle>
+
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jaxrs/${resteasy.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jackson2-provider/${resteasy.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/jaxrs-api/${resteasy.version}</bundle>
+ <bundle dependency='true'>mvn:org.jboss.spec.javax.annotation/jboss-annotations-api_1.1_spec/${jboss-annotations-api_1.1_spec.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:javax.activation/activation/${javax-activation.version}</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+ <bundle dependency="true">wrap:mvn:net.jcip/jcip-annotations/${jcip-annotations.version}</bundle>
--- End diff --
https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcip-annotations/1.0_1
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-server pull request #294: Adds brooklyn-rest-client feature
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/294#discussion_r74207956
--- Diff: karaf/features/src/main/feature/feature.xml ---
@@ -100,6 +100,38 @@
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
</feature>
+ <feature name="brooklyn-rest-client" version="${project.version}" description="Brooklyn REST Client">
+ <feature>brooklyn-rest-api</feature>
+ <feature>swagger</feature>
+
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-client/${project.version}</bundle>
+
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
+ <bundle dependency='true'>mvn:commons-logging/commons-logging/${commons-logging.version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+
+ <bundle dependency='true'>wrap:mvn:com.google.code.findbugs/jsr305/${jsr305.version}</bundle>
+
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jaxrs/${resteasy.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jackson2-provider/${resteasy.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/jaxrs-api/${resteasy.version}</bundle>
+ <bundle dependency='true'>mvn:org.jboss.spec.javax.annotation/jboss-annotations-api_1.1_spec/${jboss-annotations-api_1.1_spec.version}</bundle>
--- End diff --
The Felix framework already provides a `javax.annotation` package (bundle 0) at version 1.0. This one provides the same package at version 1.1. This could potentially lead to `Uses constraint violation` when resolving the bundles, depending on loading order. If possible better remove it. Resteasy being wrapped doesn't have a dependency on a specific version of the package.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-server pull request #294: Adds brooklyn-rest-client feature
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/294#discussion_r74196285
--- Diff: karaf/features/src/main/feature/feature.xml ---
@@ -100,6 +100,38 @@
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
</feature>
+ <feature name="brooklyn-rest-client" version="${project.version}" description="Brooklyn REST Client">
+ <feature>brooklyn-rest-api</feature>
+ <feature>swagger</feature>
+
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-client/${project.version}</bundle>
+
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
+ <bundle dependency='true'>mvn:commons-logging/commons-logging/${commons-logging.version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+
+ <bundle dependency='true'>wrap:mvn:com.google.code.findbugs/jsr305/${jsr305.version}</bundle>
+
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jaxrs/${resteasy.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jackson2-provider/${resteasy.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/jaxrs-api/${resteasy.version}</bundle>
+ <bundle dependency='true'>mvn:org.jboss.spec.javax.annotation/jboss-annotations-api_1.1_spec/${jboss-annotations-api_1.1_spec.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:javax.activation/activation/${javax-activation.version}</bundle>
--- End diff --
Better use the servicemix bundlized jar instead of wrap wherever possible as they are already tested. https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/2.0.1_1.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-server pull request #294: Adds brooklyn-rest-client feature
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/brooklyn-server/pull/294
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-server pull request #294: Adds brooklyn-rest-client feature
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/294#discussion_r74197655
--- Diff: karaf/pom.xml ---
@@ -48,6 +48,16 @@
<servicemix.version>6.0.0</servicemix.version>
<reflections.bundle.version>0.9.9_1</reflections.bundle.version> <!-- see reflections.version -->
+ <!-- brooklyn-rest-client's transitive dependencies from resteasy -->
+ <jboss-annotations-api_1.1_spec.version>1.0.1.Final</jboss-annotations-api_1.1_spec.version>
+ <javax-activation.version>1.1</javax-activation.version>
+ <jcip-annotations.version>1.0</jcip-annotations.version>
+
+ <!-- brooklyn-rest-client's transitive dependencies from httpclient:4.4.1 -->
+ <commons-logging.version>1.2</commons-logging.version>
+ <commons-codec.version>1.9</commons-codec.version>
+ <commons-io.version>2.4</commons-io.version>
+
--- End diff --
I think we are still adding those to the root pom for consistency. The versions here are used in the build process/tests only.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---