Skip to content

Conversation

@stain
Copy link
Member

@stain stain commented Feb 3, 2015

Fixes JENA-879 for jena-osgi-test

Replaces eosgi-maven-plugin tests with PAX Exam testing.
Tests jena-osgi with OSGi frameworks Eclipse Equinox and Apache Felix.

@afs
Copy link
Member

afs commented Feb 7, 2015

Having pulled #24 (reorganise tohave moduel apache-jena-osgi), it appears to me that this pull request is out of date. Having attempted to pull it, I got several merge conflicts that were not obvious as to how they should be resolved. It looks like some commits are relative to an older version of #24.

@asfbot asfbot mentioned this pull request Feb 8, 2015
stain added 4 commits February 9, 2015 09:55
..according to
https://ops4j1.jira.com/wiki/display/PAXEXAM4/OSGi+Containers

but with slf4j-log4j instead of logback to be license safe.

(logback 0.9.18 or later should be ASF-OK though, as it's
now both LGPL and EPL
http://logback.qos.ch/license.html )
@stain
Copy link
Member Author

stain commented Feb 9, 2015

Well, you told me to separate the changes.. ;-)) I'll rebase this pull
request.

On 7 February 2015 at 18:00, Andy Seaborne notifications@github.com wrote:

Having pulled #24 #24 (reorganise
tohave moduel apache-jena-osgi), it appears to me that this pull request is
out of date. Having attempted to pull it, I got several merge conflicts
that were not obvious as to how they should be resolved. It looks like some
commits are relative to an older version of #24
#24.


Reply to this email directly or view it on GitHub
#25 (comment).

Stian Soiland-Reyes, eScience Lab
School of Computer Science
The University of Manchester
http://soiland-reyes.com/stian/work/ http://orcid.org/0000-0001-9842-9718

@stain stain force-pushed the jena-osgi-pax-exam branch from 32f331b to 91507a8 Compare February 9, 2015 10:07
@stain
Copy link
Member Author

stain commented Feb 9, 2015

HTTP/1.1 786 Try It Now

@asfgit asfgit merged commit 91507a8 into apache:master Feb 9, 2015
asfgit pushed a commit that referenced this pull request Feb 9, 2015
@stain stain deleted the jena-osgi-pax-exam branch February 25, 2015 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants