Author: cziegeler
Date: Tue Oct 11 07:41:56 2016
New Revision: 1764210
URL: http://svn.apache.org/viewvc?rev=1764210&view=rev
Log:
Update to latest converter changes
Modified:
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/TypeConverter.java
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/yaml/YAMLUtil.java
Modified:
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/TypeConverter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/TypeConverter.java?rev=1764210&r1=1764209&r2=1764210&view=diff
==============================================================================
---
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/TypeConverter.java
(original)
+++
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/TypeConverter.java
Tue Oct 11 07:41:56 2016
@@ -24,9 +24,9 @@ import java.util.ArrayList;
import java.util.List;
import org.osgi.framework.Bundle;
-import org.osgi.service.converter.Converter;
-import org.osgi.service.converter.StandardConverter;
-import org.osgi.service.converter.TypeReference;
+import org.osgi.converter.Converter;
+import org.osgi.converter.StandardConverter;
+import org.osgi.converter.TypeReference;
public class TypeConverter {
Modified:
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/yaml/YAMLUtil.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/yaml/YAMLUtil.java?rev=1764210&r1=1764209&r2=1764210&view=diff
==============================================================================
---
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/yaml/YAMLUtil.java
(original)
+++
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/yaml/YAMLUtil.java
Tue Oct 11 07:41:56 2016
@@ -38,7 +38,7 @@ import org.apache.felix.configurator.imp
import org.apache.felix.configurator.impl.model.ConfigPolicy;
import org.apache.felix.configurator.impl.model.ConfigurationFile;
import org.osgi.framework.Bundle;
-import org.osgi.service.converter.TypeReference;
+import org.osgi.converter.TypeReference;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.error.YAMLException;
