[PR] KARAF-7789: Upgrade to xbean 4.24 [karaf]
jbonofre opened a new pull request, #1797: URL: https://github.com/apache/karaf/pull/1797 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] KARAF-7790: Upgrade to jansi 2.4.1 [karaf]
jbonofre opened a new pull request, #1796: URL: https://github.com/apache/karaf/pull/1796 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(karaf) branch main updated: auto-link to ASF Jira
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/main by this push: new 8cd6a48ba7 auto-link to ASF Jira new 7ad97460fd Merge pull request #1770 from hboutemy/patch-1 8cd6a48ba7 is described below commit 8cd6a48ba7e2f12a7159634a59b2a8505950c21f Author: Hervé Boutemy AuthorDate: Thu Sep 21 07:49:17 2023 +0200 auto-link to ASF Jira --- .asf.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 9420e0abc7..d0cb88776d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -17,3 +17,6 @@ notifications: pullrequests: commits@karaf.apache.org +github: + autolink_jira: +- KARAF
Re: [PR] auto-link to ASF Jira [karaf]
jbonofre merged PR #1770: URL: https://github.com/apache/karaf/pull/1770 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(karaf) branch karaf-4.4.x updated: [KARAF-6606] Fixed felix.fileinstall.filename property availability via ConfigMBean (getConfig method)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
new 6e8067203d [KARAF-6606] Fixed felix.fileinstall.filename property
availability via ConfigMBean (getConfig method)
6e8067203d is described below
commit 6e8067203d58f857fcfc2e688e0484c1cc8aa355
Author: Francesco Calabria
AuthorDate: Tue Nov 14 16:33:18 2023 +0100
[KARAF-6606] Fixed felix.fileinstall.filename property availability via
ConfigMBean (getConfig method)
(cherry picked from commit 8910546230032ca5d679f09d61ada486ce78510d)
---
.../config/core/impl/ConfigRepositoryImpl.java | 6 ++
.../core/impl/FelixFileInstallFilenameTest.java| 90 ++
2 files changed, 96 insertions(+)
diff --git
a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
index c5bfa76a8b..3f057863e3 100644
---
a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
+++
b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
@@ -165,6 +165,12 @@ public class ConfigRepositoryImpl implements
ConfigRepository {
}
if (file != null && file.exists()) {
tp = load(file);
+
+Object fileInstallFileName =
props.get(FILEINSTALL_FILE_NAME);
+if (fileInstallFileName != null &&
!"".equals(fileInstallFileName)) {
+tp.put(FILEINSTALL_FILE_NAME, fileInstallFileName);
+}
+
} else {
for (Enumeration e = props.keys();
e.hasMoreElements();) {
String key = e.nextElement();
diff --git
a/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java
b/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java
new file mode 100644
index 00..8af1236713
--- /dev/null
+++
b/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.config.core.impl;
+
+import junit.framework.TestCase;
+import org.apache.felix.utils.properties.TypedProperties;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.easymock.EasyMock.*;
+
+public class FelixFileInstallFilenameTest extends TestCase {
+
+private static final String PID = "my.test.persistent.id";
+
+private static final String CFG_TEST_FILE = "src/test/resources/test.cfg";
+
+private static final URI CFG_TEST_FILE_URI =
Paths.get(CFG_TEST_FILE).toUri();
+
+private static final String FILE_INSTALL_FILENAME =
"felix.fileinstall.filename";
+
+private ConfigRepositoryImpl configRepository;
+
+@Override
+protected void setUp() throws Exception {
+ConfigurationAdmin admin = createMock(ConfigurationAdmin.class);
+configRepository = new ConfigRepositoryImpl(admin);
+
+Configuration config = createMock(Configuration.class);
+expect(admin.getConfiguration(PID, null)).andReturn(config);
+replay(admin);
+
+Properties properties = new Properties();
+properties.load(Files.newInputStream(Paths.get(CFG_TEST_FILE)));
+
+Dictionary dictionary = new Hashtable<>();
+for (Map.Entry entry : properties.entrySet()) {
+dictionary.put(String.valueOf(entry.getKey()), entry.getValue());
+}
+dictionary.put(FILE_INSTALL_FILENAME, CFG_TEST_FILE_URI);
+
+expect(config.getProcessedProperties(null))
+.andReturn(dictionary);
+replay(config);
+}
+
+public void testGetConfig() throws InvalidSyntaxException, IOException {
+
+TypedProperties tp = configRepository.getConfig(PID);
+
+assertNotNull("The felix.fileinstall.filename
(karaf) branch main updated: [KARAF-6606] Fixed felix.fileinstall.filename property availability via ConfigMBean (getConfig method)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 8910546230 [KARAF-6606] Fixed felix.fileinstall.filename property
availability via ConfigMBean (getConfig method)
new 78e795d9a9 Merge pull request #1793 from cala87/KARAF-6606
8910546230 is described below
commit 8910546230032ca5d679f09d61ada486ce78510d
Author: Francesco Calabria
AuthorDate: Tue Nov 14 16:33:18 2023 +0100
[KARAF-6606] Fixed felix.fileinstall.filename property availability via
ConfigMBean (getConfig method)
---
.../config/core/impl/ConfigRepositoryImpl.java | 6 ++
.../core/impl/FelixFileInstallFilenameTest.java| 90 ++
2 files changed, 96 insertions(+)
diff --git
a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
index c5bfa76a8b..3f057863e3 100644
---
a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
+++
b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
@@ -165,6 +165,12 @@ public class ConfigRepositoryImpl implements
ConfigRepository {
}
if (file != null && file.exists()) {
tp = load(file);
+
+Object fileInstallFileName =
props.get(FILEINSTALL_FILE_NAME);
+if (fileInstallFileName != null &&
!"".equals(fileInstallFileName)) {
+tp.put(FILEINSTALL_FILE_NAME, fileInstallFileName);
+}
+
} else {
for (Enumeration e = props.keys();
e.hasMoreElements();) {
String key = e.nextElement();
diff --git
a/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java
b/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java
new file mode 100644
index 00..8af1236713
--- /dev/null
+++
b/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.config.core.impl;
+
+import junit.framework.TestCase;
+import org.apache.felix.utils.properties.TypedProperties;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.easymock.EasyMock.*;
+
+public class FelixFileInstallFilenameTest extends TestCase {
+
+private static final String PID = "my.test.persistent.id";
+
+private static final String CFG_TEST_FILE = "src/test/resources/test.cfg";
+
+private static final URI CFG_TEST_FILE_URI =
Paths.get(CFG_TEST_FILE).toUri();
+
+private static final String FILE_INSTALL_FILENAME =
"felix.fileinstall.filename";
+
+private ConfigRepositoryImpl configRepository;
+
+@Override
+protected void setUp() throws Exception {
+ConfigurationAdmin admin = createMock(ConfigurationAdmin.class);
+configRepository = new ConfigRepositoryImpl(admin);
+
+Configuration config = createMock(Configuration.class);
+expect(admin.getConfiguration(PID, null)).andReturn(config);
+replay(admin);
+
+Properties properties = new Properties();
+properties.load(Files.newInputStream(Paths.get(CFG_TEST_FILE)));
+
+Dictionary dictionary = new Hashtable<>();
+for (Map.Entry entry : properties.entrySet()) {
+dictionary.put(String.valueOf(entry.getKey()), entry.getValue());
+}
+dictionary.put(FILE_INSTALL_FILENAME, CFG_TEST_FILE_URI);
+
+expect(config.getProcessedProperties(null))
+.andReturn(dictionary);
+replay(config);
+}
+
+public void testGetConfig() throws InvalidSyntaxException, IOException {
+
+TypedProperties tp = configRepository.getConfig(PID);
+
+assertNotNull("The felix.fileinstall.filename properties should be
present",
Re: [PR] [KARAF-6606] Fixed felix.fileinstall.filename property availability via ConfigMBean (getConfig method) [karaf]
jbonofre merged PR #1793: URL: https://github.com/apache/karaf/pull/1793 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(karaf) branch dependabot/maven/jaas/modules/org.apache.derby-derby-10.17.1.0 deleted (was b54c8abff9)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/jaas/modules/org.apache.derby-derby-10.17.1.0 in repository https://gitbox.apache.org/repos/asf/karaf.git was b54c8abff9 Bump org.apache.derby:derby from 10.14.2.0 to 10.17.1.0 in /jaas/modules The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Bump org.apache.derby:derby from 10.14.2.0 to 10.17.1.0 in /jaas/modules [karaf]
dependabot[bot] commented on PR #1794: URL: https://github.com/apache/karaf/pull/1794#issuecomment-1854265825 OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting `@dependabot ignore this major version` or `@dependabot ignore this minor version`. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump org.apache.derby:derby from 10.14.2.0 to 10.17.1.0 in /jaas/modules [karaf]
jbonofre closed pull request #1794: Bump org.apache.derby:derby from 10.14.2.0 to 10.17.1.0 in /jaas/modules URL: https://github.com/apache/karaf/pull/1794 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
