Changes for 3.14.20
Change-Id: Icf25a88009336a57a404979eea45a866a3214a89
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs b/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs
index 6686ccd..3ce3845 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs
@@ -1,3 +1,36 @@
-#Thu Apr 19 20:30:05 GMT-08:00 2007
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=2
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.exec-env-too-low=2
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
+compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
compilers.use-project=true
eclipse.preferences.version=1
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/build.properties b/framework/bundles/org.eclipse.ecf.filetransfer/build.properties
index 09a545d..ffb4306 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/build.properties
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/build.properties
@@ -9,3 +9,4 @@
schema/
jars.compile.order = .
source.. = src/
+jre.compilation.profile = J2SE-1.5
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF
index 4010c7a..60798c2 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui.dosgi;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
Bundle-Vendor: %plugin.provider
Fragment-Host: org.eclipse.ecf.remoteservice.ui;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
@@ -10,4 +10,5 @@
Import-Package: org.eclipse.ecf.osgi.services.distribution;version="2.0.0",
org.eclipse.ecf.osgi.services.remoteserviceadmin;version="1.0.0"
DynamicImport-Package: *
+Automatic-Module-Name: org.eclipse.ecf.remoteservice.ui.dosgi
diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs b/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs
index 9d21611..59d8b40 100644
--- a/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs
+++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs
@@ -1,9 +1,10 @@
-#Sat Apr 24 17:39:11 PDT 2010
compilers.f.unresolved-features=1
compilers.f.unresolved-plugins=1
compilers.incompatible-environment=2
compilers.p.build=1
compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
compilers.p.build.java.compliance=1
compilers.p.build.missing.output=2
compilers.p.build.output.library=1
@@ -11,17 +12,20 @@
compilers.p.build.src.includes=1
compilers.p.deprecated=1
compilers.p.discouraged-class=0
+compilers.p.exec-env-too-low=2
compilers.p.internal=1
compilers.p.missing-packages=2
compilers.p.missing-version-export-package=2
compilers.p.missing-version-import-package=2
compilers.p.missing-version-require-bundle=2
compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
compilers.p.unknown-attribute=1
compilers.p.unknown-class=1
compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
+compilers.p.unknown-identifier=2
compilers.p.unknown-resource=1
compilers.p.unresolved-ex-points=0
compilers.p.unresolved-import=0
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
index 30be189..d3a8e77 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundle.name
Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin.console
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.3.0.qualifier
Bundle-Vendor: %bundle.provider
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: bundle
@@ -17,4 +17,5 @@
org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional,
org.eclipse.ecf;bundle-version="[3.8.0,4.0.0)"
Service-Component: OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
+Automatic-Module-Name: org.eclipse.ecf.osgi.services.remoteserviceadmin.console
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
index 18d9537..f2b61b5 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
@@ -9,6 +9,6 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.osgi.services.remoteserviceadmin.console</artifactId>
- <version>1.2.100-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs
index 675dd6c..6b0dfb1 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs
@@ -54,7 +54,7 @@
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml
index 8b5d527..70d3843 100644
--- a/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.osgi.services.feature"
label="ECF Remote Services Admin"
- version="2.5.200.qualifier"
+ version="2.5.300.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml
index 2665698..e4f8fc2 100644
--- a/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.osgi.services.feature</artifactId>
- <version>2.5.200-SNAPSHOT</version>
+ <version>2.5.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 afd0578..7c6ef5f 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.soa.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.soa.feature/feature.xml
@@ -43,11 +43,7 @@
id="org.eclipse.ecf.remoteservice.rosgi.feature"
version="0.0.0"/>
- <includes
- id="org.eclipse.ecf.remoteservice.soap.feature"
- version="0.0.0"/>
-
- <includes
+ <includes
id="org.eclipse.ecf.server.generic.feature"
version="0.0.0"/>
