You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by JemDay <gi...@git.apache.org> on 2016/06/10 17:38:16 UTC
[GitHub] qpid-proton pull request #75: PROTON-1224: Upgrade BouncyCastle
GitHub user JemDay opened a pull request:
https://github.com/apache/qpid-proton/pull/75
PROTON-1224: Upgrade BouncyCastle
Support 1.48+ of BouncyCastle
Added unit-test and associated certificate and key test resources.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/JemDay/qpid-proton master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/qpid-proton/pull/75.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 #75
----
commit d97854bc37f6b71f0ba6944c39e59826c6651d12
Author: Jem Day <jd...@paypal.com>
Date: 2016-06-10T17:13:36Z
PROTON-1224: Upgrade BouncyCastle to 1.48+
commit f9efcf058cd056ac61ed174b6b31555454740610
Author: Jem Day <jd...@paypal.com>
Date: 2016-06-10T17:13:36Z
PROTON-1224: Upgrade BouncyCastle to 1.48+
commit daa2959004e2d090a5e5afcedd4dfc7e3e9a49a7
Author: Jem Day <jd...@paypal.com>
Date: 2016-06-10T17:30:38Z
Merge branch 'master' of https://github.com/JemDay/qpid-proton
commit 7aff6361d6942ea069727f118750bb27117aa8cf
Author: Jem Day <jd...@paypal.com>
Date: 2016-06-10T17:34:27Z
Merge branch 'master' of https://github.com/apache/qpid-proton
----
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton issue #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay commented on the issue:
https://github.com/apache/qpid-proton/pull/75
I would like to close this PR and open a new one with (hopefully) a much cleaner change delta ...
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton issue #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay commented on the issue:
https://github.com/apache/qpid-proton/pull/75
i think this is royally screwed up now, the file-change list looks clean but using a rebase rather than a pull (to remove the merge commits) now appears to be having an even worse affect.
I'm open to suggestions - i can close this PR, trash my fork, and then re-create the change if that's going to be a simpler path forward but before that i would like to better understand the fork/pull/commit/push/PR cycle when there may be multiple commits to the fork before the PR is actually raised. Squashing after commits have been pushed seems to just open world of hurt
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton issue #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay commented on the issue:
https://github.com/apache/qpid-proton/pull/75
OK ... my lack of high-wire skills with GITis really showing through now ... i'm completely stumped as to how to 'not' include other commits when pushing back to my fork ..
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton issue #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay commented on the issue:
https://github.com/apache/qpid-proton/pull/75
Robbie - thanks for reviewing and sorry for the slow response, i'll look to try and resolve these today.
As previously discussed i'm not an enormous fan of this reflective approach but the cmake build process for java floored me a bit w.r.t how to achieve the maven style dependency at compile time.
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton issue #75: PROTON-1224: Upgrade BouncyCastle
Posted by gemmellr <gi...@git.apache.org>.
Github user gemmellr commented on the issue:
https://github.com/apache/qpid-proton/pull/75
I still need to have a final look, but if you could address the couple niggles I commented on that would be good. As I mentioned before, if you could also please remove merge commits from PRs that would be good, you have added a second in this version. Feel free to rebase the PR and squash all the commits, you don't need to open a new PR.
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton pull request #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay closed the pull request at:
https://github.com/apache/qpid-proton/pull/75
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton pull request #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay commented on a diff in the pull request:
https://github.com/apache/qpid-proton/pull/75#discussion_r67372424
--- Diff: tests/pom.xml ---
@@ -99,7 +99,7 @@ mvn test \
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.47</version>
+ <version>1.48</version>
--- End diff --
will do..
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton issue #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay commented on the issue:
https://github.com/apache/qpid-proton/pull/75
Closing for re-creation
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton pull request #75: PROTON-1224: Upgrade BouncyCastle
Posted by gemmellr <gi...@git.apache.org>.
Github user gemmellr commented on a diff in the pull request:
https://github.com/apache/qpid-proton/pull/75#discussion_r67023365
--- Diff: proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/cert.pem.txt ---
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
--- End diff --
Please provide instructions on exactly how to (re)create the SSL resources used for the tests, so they can be easily updated later as needed.
E.g like the existing proton SSL test resource details: https://github.com/apache/qpid-proton/blob/master/tests/python/proton_tests/ssl_db/README.txt
Or the qpid-jms SSL test resource details (which can be sourced and execute directly): https://github.com/apache/qpid-jms/blob/master/qpid-jms-client/src/test/resources/README.txt
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton pull request #75: PROTON-1224: Upgrade BouncyCastle
Posted by JemDay <gi...@git.apache.org>.
Github user JemDay commented on a diff in the pull request:
https://github.com/apache/qpid-proton/pull/75#discussion_r67372467
--- Diff: proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/cert.pem.txt ---
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
--- End diff --
will do
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton issue #75: PROTON-1224: Upgrade BouncyCastle
Posted by gemmellr <gi...@git.apache.org>.
Github user gemmellr commented on the issue:
https://github.com/apache/qpid-proton/pull/75
you just need to ensure you have the upstream repo up to date, then rebase your fork against it, then [force] push to your fork, which should result in your commit(s) sitting at the head of the branch with the current upstream commits preceding them and no unnecessary merge commits. You can repeat that process as many times as you like.
You obviously want to avoid force pushes on branches you are using to directly collaborate with other people on, but typically you commit work on a specific branch for the PR and then since noone else is likely to be depending on it doing such a force push is of little consequence to anyone.
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[GitHub] qpid-proton pull request #75: PROTON-1224: Upgrade BouncyCastle
Posted by gemmellr <gi...@git.apache.org>.
Github user gemmellr commented on a diff in the pull request:
https://github.com/apache/qpid-proton/pull/75#discussion_r67023070
--- Diff: tests/pom.xml ---
@@ -99,7 +99,7 @@ mvn test \
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.47</version>
+ <version>1.48</version>
--- End diff --
Given the idea is to update it probably makes sense to go for the latest version rather than this 3+ year old version (same goes for the other instance).
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org