Merge branch 'change-186306-1'

Change-Id: I776c7a4952fb89624fc64d407a21d34fb8ffe1df

9 files changed, 82 insertions, 11 deletions

diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
index a7bd87bd0..fd4c29620 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.examples.feature"
       label="ECF Remote Services Examples"
-      version="1.5.300.qualifier"
+      version="1.5.400.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml
index 5538de89d..42f94674d 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.examples.feature</artifactId>
-  <version>1.5.300-SNAPSHOT</version>
+  <version>1.5.400-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml
index 2cf20827e..342d8a364 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.rosgi.feature"
       label="ECF Remote Services R-OSGi Provider"
-      version="1.2.0.qualifier"
+      version="1.2.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
index 463bc785b..90b8132e6 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.rosgi.feature</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml
index af619ef2f..13a3db846 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.servlet.feature"
       label="ECF Remote Services Servlet API Feature"
-      version="1.0.200.qualifier"
+      version="1.0.300.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -43,7 +43,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
          unpack="false"/>
 
    <plugin
-         id="javax.servlet"
+         id="jakarta.servlet-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml
index 27d9be16b..4cb03a799 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.servlet.feature</artifactId>
-  <version>1.0.200-SNAPSHOT</version>
+  <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.soa.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.soa.feature/feature.xml
index 7c6ef5f56..cd1385558 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.soa.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.soa.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.soa.feature"
       label="ECF Service-Oriented Architecture"
-      version="2.0.201.qualifier"
+      version="2.0.300.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -43,7 +43,7 @@
          id="org.eclipse.ecf.remoteservice.rosgi.feature"
          version="0.0.0"/>
 
-    <includes
+   <includes
          id="org.eclipse.ecf.server.generic.feature"
          version="0.0.0"/>
 
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2021-09.target b/releng/org.eclipse.ecf.releng.target/ecf-2021-09.target
new file mode 100644
index 000000000..865e81401
--- /dev/null
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2021-09.target
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="2021-09" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
+<repository location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
+<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
+<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
+<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
+<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+<unit id="org.jdom" version="1.1.1.v201101151400"/>
+<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
+<unit id="org.json" version="1.0.0.v201011060100"/>
+<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
+<unit id="org.objectweb.asm" version="9.1.0.v20210209-1849"/>
+<unit id="org.objectweb.asm.source" version="9.1.0.v20210209-1849"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
+<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
+<unit id="org.apache.httpcomponents.httpclient.win" version="4.5.13.v20210128-2225"/>
+<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.13.v20210128-2225"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
+<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
+<unit id="com.sun.jna" version="4.5.1.v20210503-0343"/>
+<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.source" version="4.5.1.v20210503-0343"/>
+<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+<unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
+<unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/>
+<unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.21.0.v20210506-1232"/>
+<unit id="org.eclipse.emf.edit.ui.source.feature.group" version="2.21.0.v20210506-1232"/>
+<unit id="org.eclipse.pde.feature.group" version="3.14.900.v20210906-0500"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.14.900.v20210906-0500"/>
+<unit id="org.eclipse.platform.feature.group" version="4.21.0.v20210906-0842"/>
+<unit id="org.eclipse.platform.source.feature.group" version="4.21.0.v20210906-0842"/>
+<repository location="https://download.eclipse.org/releases/2021-09"/>
+</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
+		<unit id="org.apache.httpcomponents.client5.httpclient5" version="5.0.2.v20201015-2258"/>
+		<unit id="org.apache.httpcomponents.client5.httpclient5.source" version="5.0.2.v20201015-2258"/>
+		<unit id="org.apache.httpcomponents.core5.httpcore5" version="5.0.2.v20201015-2258"/>
+		<unit id="org.apache.httpcomponents.core5.httpcore5.source" version="5.0.2.v20201015-2258"/>
+		<unit id="org.apache.httpcomponents.core5.httpcore5-h2" version="5.0.2.v20210429-1809"/>
+		<unit id="org.apache.httpcomponents.core5.httpcore5-h2.source" version="5.0.2.v20210429-1809"/>
+		<unit id="org.conscrypt.conscrypt-openjdk-uber" version="2.5.1.v20210429-1809"/>
+		<unit id="org.conscrypt.conscrypt-openjdk-uber.source" version="2.5.1.v20210429-1809"/>
+		<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
+		<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
+	</location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.ecf.releng.target/pom.xml b/releng/org.eclipse.ecf.releng.target/pom.xml
index 83f550849..bb64a1540 100644
--- a/releng/org.eclipse.ecf.releng.target/pom.xml
+++ b/releng/org.eclipse.ecf.releng.target/pom.xml
@@ -31,9 +31,9 @@
             <configuration>
               <artifacts>
                  <artifact>
-                  <file>ecf-2020-09.target</file>
+                  <file>ecf-2021-09.target</file>
                   <type>target</type>
-                  <classifier>ecf-2020-09</classifier>
+                  <classifier>ecf-2021-09</classifier>
                 </artifact>
               </artifacts>
             </configuration>