Fixes for build.

eclipse · Apr 22, 2023 · 02b90e7 · 02b90e7
1 parent 038aad1
commit 02b90e7
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 64 deletions.
diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
@@ -61,51 +61,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>build-schema-docs</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>eclipse-run</goal>
-            </goals>
-            <configuration>
-              <applicationsArgs>-consolelog -data target/workspace -application org.eclipse.ant.core.antRunner -quiet -buildfile buildschemadocs.xml</applicationsArgs>
-              <dependencies>
-
-                <dependency>
-                  <artifactId>org.eclipse.ant.core</artifactId>
-                  <type>eclipse-plugin</type>
-                </dependency>
-
-                <dependency>
-                  <artifactId>org.apache.ant</artifactId>
-                  <type>eclipse-plugin</type>
-                </dependency>
-                <dependency>
-                  <artifactId>org.eclipse.pde.build</artifactId>
-                  <type>eclipse-plugin</type>
-                </dependency>
-                <dependency>
-                  <artifactId>org.eclipse.pde.core</artifactId>
-                  <type>eclipse-plugin</type>
-                </dependency>
-                <dependency>
-                  <artifactId>org.eclipse.help.base</artifactId>
-                  <type>eclipse-plugin</type>
-                </dependency>
-                <dependency>
-                  <artifactId>javax.annotation</artifactId>
-                  <type>eclipse-plugin</type>
-                </dependency>
-
-              </dependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf.identity/pom.xml b/framework/bundles/org.eclipse.ecf.identity/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.identity</artifactId>
-  <version>3.9.402-SNAPSHOT</version>
+  <version>3.10.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf.ssl/pom.xml b/framework/bundles/org.eclipse.ecf.ssl/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.ssl</artifactId>
-  <version>1.2.500-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf/pom.xml b/framework/bundles/org.eclipse.ecf/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf</artifactId>
-  <version>3.10.0-SNAPSHOT</version>
+  <version>3.11.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/...ders/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/META-INF/MANIFEST.MF b/...ders/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Name: %plugin.name
 Bundle-Vendor: %plugin.provider
 Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient5.win32;singleton:=true
 Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient5.win32
-Bundle-Version: 1.0.501.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.ecf;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)"

diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../../</relativePath>
   </parent>
    <artifactId>org.eclipse.ecf.provider.filetransfer.httpclient5.win32</artifactId>
-  <version>1.0.501-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/.classpath b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/...es/org.eclipse.ecf.provider.filetransfer.httpclient5/.settings/org.eclipse.jdt.core.prefs b/...es/org.eclipse.ecf.provider.filetransfer.httpclient5/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF
@@ -2,16 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient5;singleton:=true
-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient5
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.13.0",
  org.eclipse.ecf;bundle-version="3.9.101",
  org.eclipse.core.jobs;bundle-version="3.10.800"
-Import-Package: javax.net.ssl,
- org.apache.hc.client5.http;version="[5.1.3,6.0.0)",
+Import-Package: org.apache.hc.client5.http;version="[5.1.3,6.0.0)",
  org.apache.hc.client5.http.async;version="[5.1.3,6.0.0)",
  org.apache.hc.client5.http.async.methods;version="[5.1.3,6.0.0)",
  org.apache.hc.client5.http.auth;version="[5.1.3,6.0.0)",

diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.provider.filetransfer.httpclient5</artifactId>
-  <version>1.0.500-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
      <build>

diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.provider.filetransfer.ssl</artifactId>
-  <version>1.0.201-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.provider.filetransfer</artifactId>
-  <version>3.2.800-SNAPSHOT</version>
+  <version>3.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2022-12.target b/releng/org.eclipse.ecf.releng.target/ecf-2022-12.target
@@ -68,5 +68,5 @@
 			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
 		</location>
 	</locations>
-	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>