This is an automated email from the ASF dual-hosted git repository.
paulrutter pushed a change to branch feature/FELIX-6750-Jetty-12.1.0-tryout
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
from 4f69f6839a - Remove try/catch which is fixed in beta2
add ebd5bef49c FELIX-6792 - do not embed apache commons and fileupload
into jetty (#435)
add 0a7488a55f FELIX-6792 : Adjust tests and clean up poms
add a1cb3095f1 Disable workflow as action is not allowed
add 50f6f7eff0 Bump commons-fileupload:commons-fileupload (#432)
add 326327004c FELIX-6794: Fileinstall hangs (endless loop) when
java.io.tempdir is not writable, use java.nio.Files instead, improve diagnostics
add 8715ca5e4f FELIX-6796 : Potential NPE when logging into webconsole
add f155c61cfb FELIX-6796 : Improve shutdown handling
add d7504bade3 Add testcase for FELIX-6726
add 5890c44b60 Ignore IllegalArgumentException on unget service
add 95469d0c74 Merge pull request #436 from
tjwatson/ignoreIllegalArgumentException
add e6356fa024 Use globalContext for commands if configured
add 6e1b92d2b7 Merge pull request #437 from
tjwatson/fixComponentCommandsGlobal
add 206a7c82c7 Reenable CI by using hash instead of version
add 2399afe500 Merge pull request #439 from
apache/maintenance/ci-fix-path-filter
add dcbd0faf03 Bump actions/checkout from 4 to 5
add df53bd3e9c Merge pull request #441 from
apache/dependabot/github_actions/actions/checkout-5
add b7c55ce32a FELIX-6797 Update to Jetty 12.0.25 / 9.4.58.v20250814 -
update to 12.0.25
add d8ad69afa1 Merge pull request #442 from
apache/maintenance/FELIX-6797-jetty-1.0.25
add efa5526f0f Enable conditional command registration.
add 70a07242a8 [maven-release-plugin] prepare release
org.apache.felix.webconsole-5.0.14
add 7d49ca9f12 [maven-release-plugin] prepare for next development
iteration
add 2d5d03ad81 Update jetty 11.x to 11.0.26 as well
add e88c336256 Merge pull request #443 from
apache/maintenance/FELIX-6797-jetty-1.0.25
add 5016cf5377 Merge branch 'master' into
feature/FELIX-6750-Jetty-12.1.0-tryout
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven-ci.yml | 4 +-
.../fileinstall/internal/DirectoryWatcher.java | 20 ++-----
http/base/pom.xml | 2 +-
http/bridge/pom.xml | 14 +----
http/itest/pom.xml | 2 +-
.../felix/http/itest/BaseIntegrationTest.java | 2 +
http/jetty/pom.xml | 16 +-----
.../http/jetty/it/AbstractJettyTestSupport.java | 4 +-
http/jetty12/pom.xml | 21 +------
.../http/jetty/it/AbstractJettyTestSupport.java | 4 +-
http/samples/whiteboard/pom.xml | 2 +-
.../ipojo-webconsole-quicktart/pom.xml | 2 +-
scr/pom.xml | 2 +-
.../java/org/apache/felix/scr/impl/Activator.java | 7 ++-
.../apache/felix/scr/impl/ComponentCommands.java | 19 +++---
.../scr/impl/config/ScrConfigurationImpl.java | 18 +++++-
.../felix/scr/impl/config/ScrMetaTypeProvider.java | 6 ++
.../impl/helper/ComponentServiceObjectsHelper.java | 3 +-
.../scr/impl/manager/AbstractPrototypeRefPair.java | 19 +++---
.../felix/scr/impl/manager/ScrConfiguration.java | 5 +-
.../felix/scr/integration/ComponentTestBase.java | 15 ++---
.../{Felix3680Test.java => Felix6726Test.java} | 48 ++++++++--------
.../components/{felix5276 => felix6726}/A.java | 47 ++++++++-------
.../{felix5276/A.java => felix6726/B.java} | 47 ++++++++-------
.../{felix5276/A.java => felix6726/BImpl.java} | 4 +-
.../{felix5276/A.java => felix6726/Consumer.java} | 53 +++++++++--------
...IX_5276.xml => integration_test_FELIX_6726.xml} | 61 +++++++-------------
webconsole/pom.xml | 2 +-
.../webconsole/internal/servlet/OsgiManager.java | 67 ++++++++++++----------
.../internal/servlet/OsgiManagerHttpContext.java | 11 ++--
.../servlet/OsgiManagerHttpContextTest.java | 4 +-
.../internal/servlet/OsgiManagerTest.java | 9 ++-
32 files changed, 262 insertions(+), 278 deletions(-)
copy scr/src/test/java/org/apache/felix/scr/integration/{Felix3680Test.java =>
Felix6726Test.java} (56%)
copy scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276
=> felix6726}/A.java (88%)
copy
scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276/A.java
=> felix6726/B.java} (87%)
copy
scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276/A.java
=> felix6726/BImpl.java} (89%)
copy
scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276/A.java
=> felix6726/Consumer.java} (80%)
copy scr/src/test/resources/{integration_test_FELIX_5276.xml =>
integration_test_FELIX_6726.xml} (51%)
