spi-fly/changelog.md

spifly-1.3.4

Raymond Augé (12):

simplify changelog generation (remove emails), just execute ./changelog.sh and you're done [628c9fc41c]
Bump mockito-core from 3.8.0 to 3.9.0 in /spi-fly [1db45ff4ec]
Bump easymock from 4.2 to 4.3 in /spi-fly [e8670e0734]
Bump junit-jupiter.version from 5.7.1 to 5.7.2 in /spi-fly [3ad9907e2c]
Bump junit-platform.version from 1.7.1 to 1.7.2 in /spi-fly [57b5ebefe6]
Bump maven-dependency-plugin from 3.1.2 to 3.2.0 in /spi-fly [da44eb7c68]
Bump org.apache.felix.framework from 7.0.0 to 7.0.1 in /spi-fly [5ffa384dbf]
Bump mockito-core from 3.8.0 to 3.11.2 in /spi-fly [6b36317f53]
Bump asm.version from 9.1 to 9.2 in /spi-fly [896c8cccbd]
Bump osgi.test.version from 0.10.0 to 1.0.0 in /spi-fly [9cc3046d69]
Bump assertj-core from 3.19.0 to 3.20.2 in /spi-fly [6c5dfb2591]
persist resolve result [1f17e9b47d]

spifly-1.3.3

Raymond Augé (16):

update to support java 16 [413c991cf5]
Bump asm.version from 9.0 to 9.1 in /spi-fly [2b6f1d0e82]
cleanup build files [1b718885d3]
generate a changelog [b6ef5dd118]
Bump maven-enforcer-plugin from 3.0.0-M2 to 3.0.0-M3 in /spi-fly [fcd785b486]
Bump build-helper-maven-plugin from 3.0.0 to 3.2.0 in /spi-fly [1a6a6b8667]
Bump maven-dependency-plugin from 3.1.1 to 3.1.2 in /spi-fly [18b40c0c8e]
Bump org.apache.felix.framework from 6.0.1 to 7.0.0 in /spi-fly [4e62c96b05]
Bump easymock from 3.2 to 4.2 in /spi-fly [a951757767]
build examples so that we can use them for integration testing [af64e9bc98]
clean various IDE warnings [28091f518f]
flatten poms [746b760644]
run examples as integration tests to assure they continue to provide accurate information [893b66b5ea]
reformat with spaces [156b3c7754]
assure tests succeed when javadoc and source are built [66d053f38d]
fix release plugin commit to gitbox repo with correct credentials [dbe933b265]

spifly-1.3.2

Raymond Augé (1):

ARIES-2013 The Provide-Capability header is broken in 1.3.1 due to FELIX-6337 [d73a389ef2]

spifly-1.3.1

Raymond Augé (3):

ARIES-2008 Update to ASM 9.0 (and other minor build cleanup [d11043689b]
ARIES-1998 IllegalStateException on service unregistration in ProviderBundleTrackerCustomizer.removedBundle [a19c140d14]
ARIES-2009 Lower or remap the level of some log events to reduce noise [54ea07ad1f]

spifly-1.3.0

Raymond Augé (5):

ARIES-1933 manual opt-in [9fbf63c4c7]
ARIES-1984 Process lazy activation provider bundles [8a7d311e2a]
ARIES-1985 Don't process fragments directly [76f39f22d9]
ARIES-1986 Update to ASM 8.0.1 [f99759ac04]
ARIES-1978 Do not embed ASM in SPIFly [6ae6c1a4ce]

spifly-1.2.4

Raymond Augé (3):

[ARIES-1976] aries.spi-fly: upgrade to ASM 7.3.1 to support JDK 14 and 15 [6c66891f2c]
cleanup build warnings [2512fb9dc4]
bnd 5.0.1 [626155919e]

Colm O hEigeartaigh (1):

ARIES-1934 - Make sure jar/zip files are jailed to the destination directory [e8477faa3f]

spifly-1.2.3

A. J. David Bosschaert (194):

Initial code & tests for the SPI Fly component. [1dcb8aa6d1]
Added Apache source code license. [8c351d8732]
Require an opt-in Manifest header in order for bundles to be considered as SPI providers. The header is: SPI-Provider: [b1d84c2ac8]
Remove an unnecessary import and annotation. [7b11f7f6c7]
Refactored the SPIBundleTracker following feedback from Jarek Gawor. [02800f7631]
Adding the prototype as discussed on aries-dev to the code base. [e976cbff39]
Changes as suggested by Bartosz Kowalewski in ARIES-353 [9a8368fe8f]
ARIES-363 committed on behalf of Bartosz Kowalewski [be8441b953]
Removed unnecessary import. [c2b9294523]
Aries-373 committed on behalf of Bartosz Kowalewski [7574885e7d]
[ARIES-373] antrun-setproxy.patch applied on behalf of Bartosz Kowalewski [8ac946374c]
Initial import. [5b25a127c8]
Initial import. [3816b050db]
Initial import. [9d8c45e029]
Initial import. [66b402fc40]
Initial import. [b9f4ae2c87]
Initial import. [bc93eadc0b]
Initial import. [5ada06c923]
Adding initial use of ASM to SPI-Fly. [aacc95d768]
Work in Progress - applied ASM weaving to insert method calls that store, fix up and restore the TCCL. [41ddf0586b]
Rename project. [76ea328d24]
Rename packages and put proper dependency version ranges in. [e770968e85]
git-svn-id: https://svn.apache.org/repos/asf/incubator/aries/trunk@1042142 13f79535-47bb-0310-9956-ffa450edef68 [868b7ed229]
Rename packages and put proper dependency version ranges in. [57613910d5]
git-svn-id: https://svn.apache.org/repos/asf/incubator/aries/trunk@1042153 13f79535-47bb-0310-9956-ffa450edef68 [ca0548be44]
Remove manual registration of advice service. [dff8abfd59]
Adding Bundle Tracker that registers the SPI impl as a service. [47f17cf624]
Work in progress. Generating an additional method in the calling class that can pass appropriate information to the classloader lookup component. [2cb6a477ae]
Work in progress. [4bddb26398]
Renamed some classes. [27e84cdc2e]
Small changes. [1b0852ff49]
Remove dependency. [972a2c3e1d]
Second example impl project. [a1bf211366]
Second example impl project. [d7543c722b]
Test Fragment [30ccfd9079]
Small improvements. [c3e94e93a4]
New Bundle Tracker customizer test. [28e2f3c422]
Client Weaving Hook Test. [5244cd589d]
An additional test SPI imple bundle. [77ae27124c]
Test covering multiple suitable providers for ServiceLoader.load() [1600dc4c69]
Support for selecting a specific provider by the consumer through the following header: SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class);bundle=impl2 Only selects the bundle with BSN impl2 [8904ea8e57]
Support for treating methods other than ServiceLoader.load() [db512f22de]
Added support for selecting the JRE (through the system bundle) for selecting an SPI implementation. [1cc1a66b76]
Ability to deal with distinguishing overloads, e.g. ServiceLoader.load(Class) != ServiceLoader.load(Class, ClassLoader) [b01cd66a4b]
Added some javadoc... [fff4109eab]
Most of the tests fail now - this is WIP [4d0dc41bad]
Work in progress. [e890cad3ea]
Work in progress. [3fcc6cb8bf]
A few tests are passing again - Work in Progress [2a884a05f0]
Small cleanup. [d411017cc7]
More fixes. [93785df179]
Small test fix. [e71ae79223]
Support multiple WeavingData instances per client. [4e187bf792]
Most tests passing now. Still Work in Progress. [7474794db7]
More test fixes. [6ed676f341]
Additional tests passing. [9f4139eb3c]
Add bundle version support. [75d20c957f]
Removed warning. [47a4eec015]
Added some comments. [9f53b82923]
Remove unused projects. [687257865a]
Disabling a test that fails intermittently. [1c1ca5c6bd]
Fix for unit test. [7f3879e9e2]
Prepare for migration to new WeavingHook-based SPI Fly (which currentely sits in the contrib directory) [0bf1789170]
Adding the beginnings of the WeavingHook-based SPI Fly to the maven build. [7e7a3fdd58]
Move a bunch of unit tests from contrib to the spi-fly-core maven component. [8ddd3fbe55]
Enabling the remainder of the new unit tests for SPI-Fly [6b51036c02]
File cleanup that the previous SVN commit refused to take. [33fab6ee46]
Change value of SPI-Consumer header from “true” to “*” [9b1f9ac446]
Start of a static weaving tool. [e78d0597ef]
Work in progress for Spi Fly [9bb9237884]
Additional WIP for SPI Fly [e5e0379a3d]
Additional WIP for SPI Fly [aa40da40a1]
More changes to the static tool. WIP [e3c96a31b7]
First step of major SPI-Fly refactoring. [938661d72a]
Missing file from previous commit. [a4865d337f]
More SPI-Fly refactoring [2875fa8c8c]
More SPI-Fly refactoring. [c37a468cf5]
Forgot to delete these in previous commit. [d880faee9e]
Fix 1 test and removed unneeded resources. [f81bdc9b1a]
Furter work re the refactoring of SPI-Fly. [09e3eeb588]
Resolve a few maven warnings. [9720d7ec34]
Another SPI Fly test passing. [2da9d56f6b]
More work on the SPI-Fly tests [22bd5d0394]
More SPI-Fly tests passing. [35ca1a1553]
Additional test fix for SPI Fly. [3304ff6d37]
Two additional test fixes. [321317b6b9]
All existing SPI-Fly tests now passing. [6628203a90]
Initial set of example bundles to demo SPI providers and consumers. [736c7d11e5]
Renamed examples to example ‘bundle’ as there will be non-bundle components to the examples too. [2ce59a1c4c]
Work in progress on the SPI-Fly examples. [4d118388e4]
Work in progress SPI-Fly examples. [4ae8f3b2f8]
Added a plain jar provider to the examples. [1f636ffbb2]
Some cleanup. [4fd33417e1]
More tweaks to the examples. [170dbff5e7]
Bug fix in the code that finds the classloader for a bundle (which is pre-4.2 compliant). Also fixed the BundleListener code. [1f395efd48]
Add support for finding META-INF/services files in embedded jars (via Bundle-ClassPath). [fa03b4e61b]
Enhanced SPI-Fly support for bundles containing no classes, only embedded jars. [fb882dde96]
Small changes [a9bfc2c878]
Renamed client example directories [a18fd9dcfa]
Delete old directories [3ee4b78c8d]
Adding an alternative client example maven module. [b35387bf42]
Second example client. [047160090d]
Add support for jars embedded in the consumer via Bundle-ClassPath [d5b7bdb271]
Fixed dependencies. [9f452e530c]
Adding packageinfo files to SPI-Fly exported API and get the statictool to use that to automatically put the right version on the modified Import-Package statements. [578fd77a32]
Generate a jar with dependencies for the static tool. [d2eed49fb5]
Fix ProviderBundleTrackerCustomizerTest [054fe48384]
Increase test coverage on ProviderBundleTrackerCustomizer. [de9fdd9581]
Additional test coverage for Util class. [a8ba95a1f0]
Improvement to test. [cf3137fc4a]
Fix small typo. [608a75af29]
Switch from direct download of eclipse jar to dependency on osgi 4.3 via maven. Also deleted old contrib dir. [cbe8ef6537]
Use bytecode generation to generate try/finally around TCCL setting [ccffeee08d]
Improved weaving code thanks to Tim Ward! [9808613176]
Initial support for specifying the SPI Provider capability as Provide-Capability: osgi.spi.provider [9fe6d6b1f2]
First pass at support for Generic Capabilities and Generic Requirements to opt in to SPI Fly support. This is consistent with the latest RFC 167. The following headers are supported: Provide-Capability: osgi.spi.provider; effective:=active this is identical to the old SPI-Provider: * header [70d030100e]
Enabled more tests for the generic capability model [550a66016f]
Enabled an additional test case. The following requirement is now supported too: [ed12a4202f]
Small fix to make the Require-Capability model work. [8ef9841a32]
Support for capability filtering on bundle versions. [f07915db26]
Support for filtering services coming from specific bundles, for example: osgi.spi.provider; effective:=active; filter:=“(&(service=org.apache.aries.mytest.AltSPI)(bundle-symbolic-name=impl4))” will only select AltSPI services from a bundle with impl4 as symbolic name. No other SPIs are selected. More complex filters are also supported, see ClientWeavingHookGenericCapabilityTest for examples. [6f866e012b]
Client-side support for matching custom attributes. [00acefd550]
Add support for selectively exposing SPIs from an SPI Provider Bundle. [91951b1cff]
Add custom properties to service registrations. [92e43a1d05]
Additional test for multiple service types and instances. [4b791dbe7f]
Handle the service-registry and effective directives. [d997dd3c45]
Allow ‘provided’ services that aren't actually found in META-INF/services. [68135cf82b]
Update the static weaver to work with the new ASM configuration. [0f252242e2]
Add a strategy to obtain bundle classloader via OSGi 4.3 BundleRevision if this API is available. It uses reflection and will be skipped when run in an 4.2 framework. [1215b27242]
Use an OSGi Friendly Class Writer, one that can deal with OSGi class loading. Thanks to Tim Ward for pointing this out. [0b40add8a1]
Test case for the mechanism to obtain the bundle classloader through the BundleRevision. [f2bb4603d3]
Fix typo in manifest. [e489ca066b]
Change Provide-Capability/Require-Capability model to follow latest thinking for the ServiceLoader Mediator spec. [ba5b8c9c9f]
Added extra functionality and testing for provided-spi directive. [cf5f94b96a]
Update capability namespaces. [ccb166ee3c]
Added test to check that TCCL is properly set back when the SPI implemetation throws an exception. [e9f8e4b43b]
Initial refactor to support the latest ServiceLoader Mediator spec. [fa9c13ebe8]
Renamed and removed a bunch of constants. [2897a23ac3]
Remove commented out code [c5ad240d6b]
Update the examples to work with the new capabilities. [da4596c246]
Revert part of the previous commit as it causes issues with the mockobjects used in the tests. [8569ff96b7]
Update ServiceLoader to the latest API. [909f813039]
Update manifest to use new extender names. [059ddc3cf4]
Update serviceloader.url -> serviceloader.mediator service registration property [1ad4c18bfe]
Fix for a bug that previously too many classes were enhanced. [e7fbfdf2a2]
Remove the register=“*” functionality from the osgi.serviceloader capability as this functionality can be achieved by leaving out the directive. This fixes one failing test on the OSGi ServiceLoader Mediator CT. [939e7d2285]
[SPI-Fly] Prevent registration of service properties starting with a dot ‘.’. This fixes an OSGi TCK failure. [0b6f1446aa]
[SPI-Fly] Convert Providers to use OSGi Service Factories instead of plain services. This fixes a TCK failure. [ea6893528e]
Move SPI-Fly to 1.0.0-SNAPSHOT [eed461f0e8]
[SPI-Fly] Remove provider metadata when provider bundle is removed. [23236cbe16]
[SPI Fly] Remote some debug printlns out of the weaver code. [b4b1a1ad91]
[SPI-Fly] Upgrade asm dependency from 3.2 to 4.0 [6b11877048]
A minor change to the script that copies the SPI-Fly bundle to the OSGi CT location. [8f4751a44d]
Add the jar-with-dependencies of the static tool to the default build. [b186d31e88]
Fix some issues with the static bundle manifest and add a demo that shows how SPI Fly can be used with TCCL.getResource() [7cc1750eaf]
Add some tests to the static weaving code. [9d8c2d5090]
Move the SpiFlyConstants class out of the API directory which is otherwise empty. [4fc5558dbb]
Add support for Require Capability to the static tool. [ec8453f035]
Remove defuct itests module. [0edf0853f5]
Add -internal to the internal component artifact names (core and weaver). [e3e237b3bd]
Classloading fix to the static tool. [bc5a03a855]
Initial code to support the Security requirements from the spec. [f8569c2b7c]
Implement the security requirements of the ServiceLoader Mediator spec implementation in SPI Fly. [e59e3c7a40]
Make tests independent of the order in which providers are invoked. [f58fdf1d8c]
Add Aries Versioning Plugin for the bundles in this project. [946772494c]
Additional example that shows a single bundle being a provider and consumer at the same time. [c78de942cb]
[SPI Fly] Fix for NPE. [e53efdd282]
[ARIES-1156] SPI Fly fix syntax errors with static tool Manifest generation [8061a8a0d7]
[ARIES-1156] SPI-Fly static tool does not work with Require-Capability bundles [97624380e2]
Convert file to use unix line delimiters. [3526120dc2]
ARIES-1289 Remove problematic directory entry check [57be0b2ffa]
Exclude SPI Fly examples from release. [61976add4a]
SPI Fly: fix version in reactor pom. [23022e2a91]
Update dependency for core-internal to 1.0.2 [1bea7d44c9]
spi-fly-static-bundle: Update dependency for core-internal to 1.0.2 [6fb7e2d35b]
spi-fly-static-tool: Update dependency for core-internal to 1.0.2 [28068fc707]
SPI Fly: Re-enable examples in build. [ffde3d8143]
Move intra-spi-fly dependencies to SNAPSHOT to fix build during voting period. [5997981959]
ARIES-953 SPIFly: SPI-Consumer breaks when method has multiple parameters [8c598bf637]
Prepare poms for next release, get all internal deps over to 1.0.3-SNAPSHOT and remove examples from the release. [98eadf3d00]
Re-enable examples in build. [dd49d93a8b]
Add license header [7ed1601c63]
ARIES-1437 Use ASM5 Opcodes instead of the ASM4 and implement ASM 5 visitor api. [623a483765]
Remove examples for release [5662e5ecfd]
Re-enabled examples [7cae840af1]
ARIES-1461 Example for an SPI client based on a fragment. [27119f7aa6]
ARIES-1461 Support consumer and providers headers for fragment bundles [7b74f37240]
ARIES-1461 Support for SPI Fly headers added via fragments. [c064c11b2d]
ARIES-1461 Additional tests for SPI provider registered via fragment. [d688d0797e]
ARIES-1461 Tests for the Fragment Support [e13a648f0b]
Remove examples in preparation for release [11dc5102a4]
ARIES-1321 Support variable as argument for ServiceLoader.load [c380bc75a1]
ARIES-1801 SPI Fly does not work with a dynamic class object [43e908ebc1]
Fix up javadoc in preparation for release. [3b4a9edf42]

Raymond Augé (28):

ARIES-1814 Solve the start order limitations with SPI Fly by first creating a framework extension [e030c88a8d]
ARIES-1814 Solve the start order limitations with SPI Fly by then eliminating unused dependency on Log Service [2f4f69f851]
ARIES-1814 Solve the start order limitations with SPI Fly by changing the verification approach to rely on uses constraints instead of package attributes [fc8eb1d7d9]
[spifly] unify formatting to use spaces (no code changes) [4bd3502f6c]
[spifly] slim it down & eliminate warnings [196f5394af]
[spifly] the framework extension can only work on a framework >= R7 [ad94c53010]
Revert “ARIES-1814 Solve the start order limitations with SPI Fly by then eliminating unused dependency on Log Service” [601104325f]
ARIES-1814 Solve the start order limitations with SPI Fly by then eliminating unused dependency on Log Service [5dd212aa7b]
update parent pom for spifly [b2f1f73d90]
update spifly poms [b42cea2428]
[spifly] updates for rat checks [581c324dbd]
sink spifly reactor with next release [caa547cca3]
ARIES-1854 Add support for ServiceLoader.load(Class, ClassLoader) [a97cb62732]
ARIES-1855 Finish removing legacy of LogService [6759f688a9]
ARIES-1844 Support for ASM 7 (Java 11) [a09e653530]
ARIES-1739 Specifiying a version in Require-Capability prevents registration [dcad573208]
[spi-fly] additional tests [f0f7ed22a2]
ARIES-1857 Regression in framework.extension due to work on ARIES-1739 [1d5515b564]
ARIES-1857 Regression in framework.extension due to work on ARIES-1739 [763efa536e]
ARIES-1860 Dynamic Spifly fails on java 11 [59b3b8175f]
ARIES-1862 Remove superfluous transitive dependencies from spifly dynamic.bundle [3730d7df5f]
ARIES-1863 Ensure type compatibility when running in an environment that already has bnd uses elsewhere [865fc78db0]
ARIES-1859 source of org.apache.aries.spifly.dynamic.bundle on maven isn't complete [69bcc05f30]
ARIES-1864 Fix failure in security compliance test [cdcb583fcc]
ARIES-1806 Support to create prototype scoped services [09d2f3dfca]
ARIES-1901 Spi Fly not properly handling multiple providers described in the same descriptor as services [755334d8a9]
ARIES-1917 Sources for dynamic.framework.extension are not complete [bb85b57246]
ARIES-1918 Move felix framework dependency from runtime to test [85ba548171]

Daniel Kulp (10):

Update all parents to 0.5 version and reset relativePath elements [4dbdcd7c40]
Use the released parent poms so aries can actually build with a somewhat clean .m2/repository. [26a58856ce]
[ARIES-947] Warning cleanups for spi-fly Patch from Jean-Baptiste Onofré applied [bce6c84cd8]
Add scm locations to release by module can work [46860338df]
Add an scm location [a7893bcbe3]
Use a better artifact name to make sure the tags are unique [383c75a4ed]
Missed one [e3b751578b]
Use snapshot versions until release promoted [f0168a5731]
spy fly build with java6, maven 3.2.1 [9e7c564c2c]
Define the versioning plugin as an execution in the parent pom. It can thus be removed from ALL the other poms. [a9acc74396]

Jean-Baptiste Onofré (9):

[ARIES-1006] Upgrade to the “new” parent pom and OSGi 4.3.1 [e3f35439e4]
Change parent version to 2.0.0-SNAPSHOT [fa71042e41]
Update scm section [a5a813f4ed]
[ARIES-1908] Upgrade to ASM 7.1 [91bfed52ba]
Upgrade to spi-fly core 1.2.2 [e06b524c83]
Update to spifly core and spifly weaver 1.2.2 [a580dcb977]
Upgrade to spifly dynamic bundle 1.2.2 [e37b3d9e5f]
Upgrade to spifly core 1.2.2 [367782181c]
Upgrade to spifly core and weaver 1.2.2 [5cc279fc9a]

Guillaume Nodet (7):

Remove the incubating tag in the version [6c64df9c24]
Fix spi-fly tests [092137c426]
[ARIES-1185] SPI Fly does not work with Java 8 [1d78abfbc3]
[ARIES-1192] Upgrade to maven-bundle-plugin 2.4.1-SNAPSHOT [2164e2e51f]
Upgrade all modules to the released parent [b685f3fad4]
Upgrade to being released spy-fly-core [771888b90f]
[ARIES-1646] [spi-fly] Improve upward compatibility of SPI Fly to ASM Version 6.x [bcea0ebed7]

David Jencks (6):

ARIES-173 beginnings of pom cleanup. This adds scm info to all top-level subprojects and does a little bit of dependency cleanup. No shared dependencies in project parent pom yet. [bd9b32246f]
ARIES-173 upgrade a few versions and put some in parent dependency management. More to go. [d9a36a9273]
ARIES-173 cleanup use of dependencies mananged in the default-parent pom [df35bc17b4]
ARIES-173 add legal files in each subproject [92281a3941]
ARIES-173 change version to 0.1-incubating-SNAPSHOT, filter config.ini files, set up properties to use in filtering, don't use release versions in blog sample [df3581d577]
ARIES-680 try to make all use of slf4j-api, osgi core and osgi compendium provided dependencies [5fcc1bd991]

Freeman Fang (3):

[ARIES-1908]aries.spi-fly:upgrade to asm 7.1 so that can work with JDK12|JDK13 [c3d2a9a1b4]
Revert “[ARIES-1908]aries.spi-fly:upgrade to asm 7.1 so that can work with JDK12|JDK13” [0999a10c95]
[ARIES-1908]aries.spi-fly:upgrade to asm 7.1 so that can work with JDK12|JDK13 [7ddd679ca9]

Holly Cummins (3):

Checkpoint: moving parent to 1.0.0-SNAPSHOT, and also util (but not util‘s dependers’ [8b5a5a4e44]
Moving packageinfo files to version 1.0.0 [62773bc3c3]
[ARIES-862] Moving to released versions of blueprint.api and util [02f02e5a02]

Jeremy Hughes (3):

Move everything to using 0.2-incubating-SNAPSHOT while 0.1-incubting is voted on [84d8829ea7]
ARIES-494 use to indicate where the parent pom resides. This enables use of maven 3 [6e161dcd7e]
ARIES-936 Make this test JVM agnostic [c39a71d041]

Christian Schneider (2):

Remove unused LogService ref [2f7f2ae131]
[ARIES-1584] Do not spam messages for each considered and skipped bundle [fb196e93a3]

Zoe Slattery (2):

ARIES-548 Fix references to incubator in trunk [83b28ac372]
ARIES-562. Move up to 0.4-SNAP and fix ordering issue with proxy [941b7456cb]

Jarek Gawor (1):

switch trunk to 0.3-incubating-SNAPSHOT [ba4283c926]

Joseph Alan Bohn (1):

increase default timeouts for tests in hopes that there will be fewer service timeouts on slower machines [0f6806575d]