[
https://issues.apache.org/jira/browse/KARAF-5942?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16713547#comment-16713547
]
ASF GitHub Bot commented on KARAF-5942:
---------------------------------------
jbonofre closed pull request #674: [KARAF-5942][KARAF-5943] Update to Aries
Blueprint Core 1.10.1 & Aries Blueprint CM 1.3.1
URL: https://github.com/apache/karaf/pull/674
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholder.java
b/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholder.java
index 095678a986..19f25cb404 100644
---
a/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholder.java
+++
b/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholder.java
@@ -14,10 +14,12 @@
*/
package org.apache.karaf.jaas.blueprint.jasypt.handler;
+import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholderExt;
import org.jasypt.encryption.StringEncryptor;
-import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder;
-public class EncryptablePropertyPlaceholder extends
AbstractPropertyPlaceholder {
+import java.util.Map;
+
+public class EncryptablePropertyPlaceholder extends
AbstractPropertyPlaceholderExt {
private StringEncryptor encryptor;
@@ -38,4 +40,10 @@ protected String getProperty(String val) {
return encryptor.decrypt(val);
}
+ @Override
+ public Map<String, Object> getDefaultProperties() {
+ return null;
+ }
+
+
}
diff --git a/pom.xml b/pom.xml
index 6e1b96d2f9..01315f4b44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,9 +218,9 @@
<aries.application.api.version>1.0.0</aries.application.api.version>
<aries.application.management.version>1.0.0</aries.application.management.version>
<aries.blueprint.api.version>1.0.1</aries.blueprint.api.version>
- <aries.blueprint.core.version>1.9.0</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.10.1</aries.blueprint.core.version>
<aries.blueprint.core.compatibility.version>1.0.0</aries.blueprint.core.compatibility.version>
- <aries.blueprint.cm.version>1.2.0</aries.blueprint.cm.version>
+ <aries.blueprint.cm.version>1.3.1</aries.blueprint.cm.version>
<aries.blueprint.web.version>1.0.1</aries.blueprint.web.version>
<aries.blueprint.spring.version>0.6.0</aries.blueprint.spring.version>
<aries.blueprint.spring.extender.version>0.4.0</aries.blueprint.spring.extender.version>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Upgrade to Aries Blueprint Core 1.10.1
> --------------------------------------
>
> Key: KARAF-5942
> URL: https://issues.apache.org/jira/browse/KARAF-5942
> Project: Karaf
> Issue Type: Dependency upgrade
> Components: karaf
> Reporter: Jean-Baptiste Onofré
> Assignee: Jean-Baptiste Onofré
> Priority: Major
> Fix For: 4.2.2
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
