You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2017/08/18 08:43:14 UTC
svn commit: r1805383 - in
/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model:
ModelResolveUtility.java package-info.java
Author: tomekr
Date: Fri Aug 18 08:43:14 2017
New Revision: 1805383
URL: http://svn.apache.org/viewvc?rev=1805383&view=rev
Log:
SLING-7054: Slingstart artifacts with parametrized version not removed from the effective slingstart model
Exposed the ModelResolveUtility#replace() method.
Modified:
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java?rev=1805383&r1=1805382&r2=1805383&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java Fri Aug 18 08:43:14 2017
@@ -33,7 +33,10 @@ import org.apache.sling.provisioning.mod
/**
* Helper methods for resolving variables and artifact versions in models.
*/
-class ModelResolveUtility {
+public class ModelResolveUtility {
+
+ private ModelResolveUtility() {
+ }
/**
* Replace properties in the string.
@@ -44,7 +47,7 @@ class ModelResolveUtility {
* @result The value of the variable
* @throws IllegalArgumentException If variable can't be found.
*/
- static String replace(final Feature feature, final String v, final VariableResolver resolver) {
+ public static String replace(final Feature feature, final String v, final VariableResolver resolver) {
if ( v == null ) {
return null;
}
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java?rev=1805383&r1=1805382&r2=1805383&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java Fri Aug 18 08:43:14 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("1.9.0")
+@org.osgi.annotation.versioning.Version("1.10.0")
package org.apache.sling.provisioning.model;