svn commit: r1801599 - in /felix/trunk/converter/converter/src: main/java/org/apache/felix/converter/impl/ main/java/org/osgi/util/converter/ test/java/org/apache/felix/converter/impl/

[davidb]

Author: davidb
Date: Tue Jul 11 12:12:27 2017
New Revision: 1801599

URL: http://svn.apache.org/viewvc?rev=1801599=rev
Log:
Felix Converter - update the implementation for the new API.

Added:

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/AbstractSpecifying.java

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/FunctioningImpl.java

felix/trunk/converter/converter/src/main/java/org/osgi/util/converter/Converters.java

felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterFunctionTest.java
Removed:

felix/trunk/converter/converter/src/main/java/org/osgi/util/converter/StandardConverter.java
Modified:

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/AdapterImpl.java

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java

felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterBuilderTest.java

felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterMapTest.java

felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java

Added: 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/AbstractSpecifying.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/AbstractSpecifying.java?rev=1801599=auto
==
--- 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/AbstractSpecifying.java
 (added)
+++ 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/AbstractSpecifying.java
 Tue Jul 11 12:12:27 2017
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.felix.converter.impl;
+
+import org.osgi.util.converter.Specifying;
+
+public abstract class AbstractSpecifying> implements 
Specifying {
+protected volatile Object defaultValue;
+protected volatile boolean hasDefault = false;
+protected volatile boolean forceCopy = false;
+protected volatile boolean keysIgnoreCase = false;
+protected volatile Class sourceAsClass;
+protected volatile boolean sourceAsDTO = false;
+protected volatile boolean sourceAsJavaBean = false;
+protected volatile Class targetAsClass;
+protected volatile boolean targetAsDTO = false;
+protected volatile boolean targetAsJavaBean = false;
+
+@SuppressWarnings("unchecked")
+private T castThis() {
+return (T) this;
+}
+
+@Override
+public T copy() {
+forceCopy  = true;
+return castThis();
+}
+
+@Override
+public T defaultValue(Object defVal) {
+defaultValue = defVal;
+hasDefault = true;
+return castThis();
+}
+
+@Override
+public T keysIgnoreCase() {
+keysIgnoreCase = true;
+return castThis();
+}
+
+@Override
+public T sourceAs(Class cls) {
+sourceAsClass = cls;
+return castThis();
+}
+
+@Override
+public T sourceAsBean() {
+// To avoid ambiguity, reset any instruction to sourceAsDTO
+sourceAsDTO = false;
+sourceAsJavaBean = true;
+return castThis();
+}
+
+@Override
+public T sourceAsDTO() {
+// To avoid ambiguity, reset any instruction to sourceAsJavaBean
+sourceAsJavaBean = false;
+sourceAsDTO = true;
+return castThis();
+}
+
+@Override
+public T targetAs(Class cls) {
+targetAsClass = cls;
+return castThis();
+}
+
+@Override
+public T targetAsBean() {
+// To avoid ambiguity, reset any instruction to targetAsDTO
+targetAsDTO = false;
+targetAsJavaBean = true;
+return castThis();
+}
+
+@Override
+public T targetAsDTO() {
+// To avoid ambiguity, reset any instruction to targetAsJavaBean
+targetAsJavaBean = false;
+targetAsDTO = true;
+   

svn commit: r1801611 - in /felix/trunk/converter/converter/src: main/java/org/apache/felix/converter/impl/ConverterImpl.java test/java/org/apache/felix/converter/impl/ConverterTest.java

[davidb]

Author: davidb
Date: Tue Jul 11 12:49:27 2017
New Revision: 1801611

URL: http://svn.apache.org/viewvc?rev=1801611=rev
Log:
Felix converter - support special conversions between character arrays and 
Strings.

Modified:

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java

felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java

Modified: 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java?rev=1801611=1801610=1801611=diff
==
--- 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
 (original)
+++ 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
 Tue Jul 11 12:49:27 2017
@@ -25,12 +25,15 @@ import java.time.OffsetTime;
 import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
 import org.osgi.util.converter.ConverterBuilder;
+import org.osgi.util.converter.Converters;
 import org.osgi.util.converter.Functioning;
 import org.osgi.util.converter.Rule;
+import org.osgi.util.converter.TypeReference;
 
 public class ConverterImpl implements InternalConverter {
 @Override
@@ -72,6 +75,47 @@ public class ConverterImpl implements In
 cb.rule(new Rule(Pattern::compile) {});
 cb.rule(new Rule(UUID::fromString) {});
 cb.rule(new Rule(ZonedDateTime::parse) {});
+
+// Special conversions between character arrays / list and String
+cb.rule(new Rule(ConverterImpl::charArrayToString) {});
+cb.rule(new Rule(ConverterImpl::characterArrayToString) {});
+//cb.rule(new Rule(ConverterImpl::characterListToString) {});
+cb.rule(new Rule(ConverterImpl::stringToCharArray) {});
+cb.rule(new Rule(ConverterImpl::stringToCharacterArray) {});
+//cb.rule(new Rule(ConverterImpl::stringToCharacterList) {});
+}
+
+private static String charArrayToString(char[] ca) {
+StringBuilder sb = new StringBuilder(ca.length);
+for (char c : ca) {
+sb.append(c);
+}
+return sb.toString();
+}
+
+private static String characterArrayToString(Character[] ca) {
+return 
charArrayToString(Converters.standardConverter().convert(ca).to(char[].class));
+}
+
+private static String characterListToString(List cl) {
+return 
charArrayToString(Converters.standardConverter().convert(cl).to(char[].class));
+}
+
+private static char[] stringToCharArray(String s) {
+char[] ca = new char[s.length()];
+
+for (int i=0; i() {});
 }
 
 private Class loadClassUnchecked(String className) {

Modified: 
felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java?rev=1801611=1801610=1801611=diff
==
--- 
felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java
 (original)
+++ 
felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java
 Tue Jul 11 12:49:27 2017
@@ -139,6 +139,23 @@ public class ConverterTest {
 assertEquals(Double.valueOf("12.3"), 
converter.convert("12.3").to(Double.class));
 }
 
+@Test
+public void testCharAggregateToString() {
+char[] ca = new char[] {'h', 'e', 'l', 'l', 'o'};
+assertEquals("hello", converter.convert(ca).to(String.class));
+
+Character[] ca2 = converter.convert(ca).to(Character[].class);
+assertEquals("hello", converter.convert(ca2).to(String.class));
+
+//List cl = converter.convert(ca).to(new 
TypeReference() {});
+//assertEquals("hello", converter.convert(cl).to(String.class));
+
+// And back
+assertArrayEquals(ca, converter.convert("hello").to(char[].class));
+assertArrayEquals(ca2, 

svn commit: r1801604 - /felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java

[cziegeler]

Author: cziegeler
Date: Tue Jul 11 12:17:20 2017
New Revision: 1801604

URL: http://svn.apache.org/viewvc?rev=1801604=rev
Log:
Adjust to latest converter api

Modified:

felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java

Modified: 
felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java?rev=1801604=1801603=1801604=diff
==
--- 
felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java
 (original)
+++ 
felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java
 Tue Jul 11 12:17:20 2017
@@ -24,13 +24,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.osgi.util.converter.Converter;
-import org.osgi.util.converter.StandardConverter;
+import org.osgi.util.converter.Converters;
 import org.osgi.util.converter.TypeReference;
 
 public class TypeConverter {
 
 public static Converter getConverter() {
-return new StandardConverter();
+return Converters.standardConverter();
 }
 
 private final List allFiles = new ArrayList<>();

svn commit: r1801621 - in /felix/trunk/converter/converter/src: main/java/org/apache/felix/converter/impl/ test/java/org/apache/felix/converter/impl/

[davidb]

Author: davidb
Date: Tue Jul 11 14:51:56 2017
New Revision: 1801621

URL: http://svn.apache.org/viewvc?rev=1801621=rev
Log:
Felix Converter - better handling of rules with generics

Modified:

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterBuilderImpl.java

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java

felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterBuilderTest.java

felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java

Modified: 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterBuilderImpl.java?rev=1801621=1801620=1801621=diff
==
--- 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterBuilderImpl.java
 (original)
+++ 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterBuilderImpl.java
 Tue Jul 11 14:51:56 2017
@@ -16,7 +16,9 @@
  */
 package org.apache.felix.converter.impl;
 
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -63,6 +65,24 @@ public class ConverterBuilderImpl implem
 public ConverterBuilder rule(TargetRule rule) {
Type type = rule.getTargetType();
getRulesList(type).add(rule.getFunction());
+
+   if (type instanceof ParameterizedType) {
+   ParameterizedType pt = (ParameterizedType) type;
+
+   boolean containsWildCard = false;
+   for (Type t : pt.getActualTypeArguments()) {
+   if (t instanceof WildcardType) {
+   containsWildCard = true;
+   break;
+   }
+   }
+
+   // If the parameterized type is a wildcard (e.g. '?') then register 
also the raw
+   // type for the rule. I.e Class will also be registered under 
bare Class.
+   if (containsWildCard)
+   getRulesList(pt.getRawType()).add(rule.getFunction());
+   }
+
 return this;
 }
 

Modified: 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java?rev=1801621=1801620=1801621=diff
==
--- 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
 (original)
+++ 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
 Tue Jul 11 14:51:56 2017
@@ -25,7 +25,6 @@ import java.time.OffsetTime;
 import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
@@ -33,7 +32,6 @@ import org.osgi.util.converter.Converter
 import org.osgi.util.converter.Converters;
 import org.osgi.util.converter.Functioning;
 import org.osgi.util.converter.Rule;
-import org.osgi.util.converter.TypeReference;
 
 public class ConverterImpl implements InternalConverter {
 @Override
@@ -76,13 +74,11 @@ public class ConverterImpl implements In
 cb.rule(new Rule(UUID::fromString) {});
 cb.rule(new Rule(ZonedDateTime::parse) {});
 
-// Special conversions between character arrays / list and String
+// Special conversions between character arrays and String
 cb.rule(new Rule(ConverterImpl::charArrayToString) {});
 cb.rule(new Rule(ConverterImpl::characterArrayToString) {});
-//cb.rule(new Rule(ConverterImpl::characterListToString) {});
 cb.rule(new Rule(ConverterImpl::stringToCharArray) {});
 cb.rule(new Rule(ConverterImpl::stringToCharacterArray) {});
-//cb.rule(new Rule(ConverterImpl::stringToCharacterList) {});
 }
 
 private static String charArrayToString(char[] ca) {
@@ -97,10 +93,6 @@ public class ConverterImpl implements In
 return 
charArrayToString(Converters.standardConverter().convert(ca).to(char[].class));
 }
 
-private static String characterListToString(List cl) {
-return 
charArrayToString(Converters.standardConverter().convert(cl).to(char[].class));
-}
-
 private static char[] stringToCharArray(String s) {
 char[] ca = new char[s.length()];
 
@@ -114,10 +106,6 @@ public class ConverterImpl implements In
 return 

svn commit: r1801622 - /felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java

[davidb]

Author: davidb
Date: Tue Jul 11 15:00:53 2017
New Revision: 1801622

URL: http://svn.apache.org/viewvc?rev=1801622=rev
Log:
Felix Converter - slight improvement on ConverterImpl.

Modified:

felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java

Modified: 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java?rev=1801622=1801621=1801622=diff
==
--- 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
 (original)
+++ 
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
 Tue Jul 11 15:00:53 2017
@@ -29,7 +29,6 @@ import java.util.UUID;
 import java.util.regex.Pattern;
 
 import org.osgi.util.converter.ConverterBuilder;
-import org.osgi.util.converter.Converters;
 import org.osgi.util.converter.Functioning;
 import org.osgi.util.converter.Rule;
 
@@ -75,13 +74,13 @@ public class ConverterImpl implements In
 cb.rule(new Rule(ZonedDateTime::parse) {});
 
 // Special conversions between character arrays and String
-cb.rule(new Rule(ConverterImpl::charArrayToString) {});
-cb.rule(new Rule(ConverterImpl::characterArrayToString) {});
-cb.rule(new Rule(ConverterImpl::stringToCharArray) {});
-cb.rule(new Rule(ConverterImpl::stringToCharacterArray) {});
+cb.rule(new Rule(this::charArrayToString) {});
+cb.rule(new Rule(this::characterArrayToString) 
{});
+cb.rule(new Rule(this::stringToCharArray) {});
+cb.rule(new Rule(this::stringToCharacterArray) 
{});
 }
 
-private static String charArrayToString(char[] ca) {
+private String charArrayToString(char[] ca) {
 StringBuilder sb = new StringBuilder(ca.length);
 for (char c : ca) {
 sb.append(c);
@@ -89,11 +88,11 @@ public class ConverterImpl implements In
 return sb.toString();
 }
 
-private static String characterArrayToString(Character[] ca) {
-return 
charArrayToString(Converters.standardConverter().convert(ca).to(char[].class));
+private String characterArrayToString(Character[] ca) {
+return charArrayToString(convert(ca).to(char[].class));
 }
 
-private static char[] stringToCharArray(String s) {
+private char[] stringToCharArray(String s) {
 char[] ca = new char[s.length()];
 
 for (int i=0; i

svn commit: r1801567 - in /felix/trunk/http: itest/src/test/java/org/apache/felix/http/itest/ jetty/ jetty/src/main/java/org/apache/felix/http/jetty/internal/

[cziegeler]

Author: cziegeler
Date: Tue Jul 11 08:26:08 2017
New Revision: 1801567

URL: http://svn.apache.org/viewvc?rev=1801567=rev
Log:
FELIX-5664 : Update Jetty to 9.3.20.v20170531 or 9.4.6.v20170531 to fix 
CVE-2017-9735Adjust ittest to R6 implementation

Modified:

felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/EventListenerTest.java

felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java
felix/trunk/http/jetty/pom.xml

felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyActivator.java

felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java

Modified: 
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/EventListenerTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/EventListenerTest.java?rev=1801567=1801566=1801567=diff
==
--- 
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/EventListenerTest.java
 (original)
+++ 
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/EventListenerTest.java
 Tue Jul 11 08:26:08 2017
@@ -65,7 +65,7 @@ public class EventListenerTest extends B
 {
 private Dictionary getListenerProps()
 {
-final Dictionary props = new Hashtable();
+final Dictionary props = new Hashtable<>();
 props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER, "true");
 
 return props;
@@ -73,7 +73,7 @@ public class EventListenerTest extends B
 
 private Dictionary getServletProps(final String pattern)
 {
-final Dictionary props = new Hashtable();
+final Dictionary props = new Hashtable<>();
 props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, 
pattern);
 
 return props;
@@ -480,7 +480,7 @@ public class EventListenerTest extends B
 };
 
 // register with all contexts
-final Dictionary props = new Hashtable();
+final Dictionary props = new Hashtable<>();
 props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER, "true");
 props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(" 
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=*)");
 final ServiceRegistration reg = 
m_context.registerService(ServletRequestListener.class, listener, props);

Modified: 
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java?rev=1801567=1801566=1801567=diff
==
--- 
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java
 (original)
+++ 
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java
 Tue Jul 11 08:26:08 2017
@@ -614,10 +614,9 @@ public class HttpServiceRuntimeTest exte
 ServletContextDTO defaultContextDTO = runtimeDTO.servletContextDTOs[2];
 long contextServiceId = defaultContextDTO.serviceId;
 
-assertEquals(Arrays.toString(defaultContextDTO.servletDTOs), 2, 
defaultContextDTO.servletDTOs.length);
-assertServlet(defaultContextDTO.servletDTOs, "default servlet", 
contextServiceId);
-assertServlet(defaultContextDTO.servletDTOs, "default error page", 
contextServiceId);
-
+assertEquals(1, defaultContextDTO.servletDTOs.length);
+assertEquals("default servlet", defaultContextDTO.servletDTOs[0].name);
+assertEquals(contextServiceId, 
defaultContextDTO.servletDTOs[0].servletContextId);
 assertEquals(1, defaultContextDTO.filterDTOs.length);
 assertEquals("default filter", defaultContextDTO.filterDTOs[0].name);
 assertEquals(contextServiceId, 
defaultContextDTO.filterDTOs[0].servletContextId);
@@ -631,10 +630,9 @@ public class HttpServiceRuntimeTest exte
 ServletContextDTO testContextDTO = runtimeDTO.servletContextDTOs[1];
 contextServiceId = testContextDTO.serviceId;
 
-assertEquals(2, testContextDTO.servletDTOs.length);
-assertServlet(testContextDTO.servletDTOs, "context servlet", 
contextServiceId);
-assertServlet(testContextDTO.servletDTOs, "context error page", 
contextServiceId);
-
+assertEquals(1, testContextDTO.servletDTOs.length);
+assertEquals("context servlet", testContextDTO.servletDTOs[0].name);
+assertEquals(contextServiceId, 
testContextDTO.servletDTOs[0].servletContextId);
 assertEquals(1, testContextDTO.filterDTOs.length);
 assertEquals("context filter", 

svn commit: r1801568 - /felix/trunk/http/jetty/pom.xml

[cziegeler]

Author: cziegeler
Date: Tue Jul 11 08:29:43 2017
New Revision: 1801568

URL: http://svn.apache.org/viewvc?rev=1801568=rev
Log:
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.4.4

Modified:
felix/trunk/http/jetty/pom.xml

Modified: felix/trunk/http/jetty/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1801568=1801567=1801568=diff
==
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Tue Jul 11 08:29:43 2017
@@ -28,13 +28,13 @@
 
 Apache Felix Http Jetty
 org.apache.felix.http.jetty
-3.4.3-SNAPSHOT
+3.4.4
 jar
 
 
-
scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/jetty
-
scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/jetty
-http://svn.apache.org/viewvc/felix/trunk/http/jetty/
+
scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http.jetty-3.4.4
+
scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.http.jetty-3.4.4
+
http://svn.apache.org/viewvc/felix/releases/org.apache.felix.http.jetty-3.4.4
 
 
 

svn commit: r1801569 - /felix/releases/org.apache.felix.http.jetty-3.4.4/

[cziegeler]

Author: cziegeler
Date: Tue Jul 11 08:29:57 2017
New Revision: 1801569

URL: http://svn.apache.org/viewvc?rev=1801569=rev
Log:
[maven-release-plugin] copy for tag org.apache.felix.http.jetty-3.4.4

Added:
felix/releases/org.apache.felix.http.jetty-3.4.4/   (props changed)
  - copied from r1801568, felix/trunk/http/jetty/

Propchange: felix/releases/org.apache.felix.http.jetty-3.4.4/
--
--- svn:ignore (added)
+++ svn:ignore Tue Jul 11 08:29:57 2017
@@ -0,0 +1,6 @@
+target
+.settings
+.classpath
+.project
+.externalToolBuilders
+maven-eclipse.xml

Propchange: felix/releases/org.apache.felix.http.jetty-3.4.4/
--
svn:mergeinfo = /felix/sandbox/tmoloney/http/jetty:1074406

svn propchange: r1801567 - svn:log

[cziegeler]

Author: cziegeler
Revision: 1801567
Modified property: svn:log

Modified: svn:log at Tue Jul 11 08:27:41 2017
--
--- svn:log (original)
+++ svn:log Tue Jul 11 08:27:41 2017
@@ -1 +1,2 @@
-FELIX-5664 : Update Jetty to 9.3.20.v20170531 or 9.4.6.v20170531 to fix 
CVE-2017-9735Adjust ittest to R6 implementation
+FELIX-5664 : Update Jetty to 9.3.20.v20170531 or 9.4.6.v20170531 to fix 
CVE-2017-9735
+Adjust ittest to R6 implementation