Merge pull request #676 from eclipse-passage/572134

Bug 572134 FLS fails been started without -server.port parameter
eclipse-passage · Mar 20, 2021 · 4192658 · 4192658
2 parents 188a6d9 + 3f25d92
commit 4192658
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/....eclipse.passage.lac.jetty/src/org/eclipse/passage/lac/internal/jetty/JettyActivator.java b/....eclipse.passage.lac.jetty/src/org/eclipse/passage/lac/internal/jetty/JettyActivator.java
@@ -38,6 +38,7 @@ public void stop(BundleContext context) throws Exception {
 		jetty.terminate();
 	}
 
+	@SuppressWarnings("restriction")
 	private JettyHandler handler() {
 		return new JettyHandler(request -> new AgentRequestHandled(request).get());
 	}

diff --git a/...es/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/connect/Port.java b/...es/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/connect/Port.java
@@ -45,7 +45,7 @@ public String key() {
 
 	@Override
 	public Optional<Integer> get() {
-		return raw.map(this::parse).orElseGet(Optional::empty);
+		return raw.map(this::parse).orElseGet(this::defaultPort);
 	}
 
 	private Optional<Integer> defaultPort() {
@@ -57,7 +57,7 @@ private Optional<Integer> parse(String port) {
 			return Optional.of(Integer.parseInt(port));
 		} catch (NumberFormatException e) {
 			log.error("failed: ", e); //$NON-NLS-1$ ;
-			return defaultPort();
+			return Optional.empty();
 		}
 	}
 

diff --git a/releng/org.eclipse.passage.parent/pom.xml b/releng/org.eclipse.passage.parent/pom.xml
@@ -42,7 +42,7 @@
 		<eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
 		<cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
 
-		<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/</eclipserun-repo>
+		<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/</eclipserun-repo>
 		<released.baseline>https://download.eclipse.org/passage/updates/release/1.1.2/</released.baseline>
 		<staging.baseline>https://download.eclipse.org/passage/drops/integration/latest/</staging.baseline>
 

diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup
@@ -284,7 +284,7 @@
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
           <repository
               url="https://download.eclipse.org/ecp/releases/releases_125/1250/"/>
           <repository

diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
@@ -19,7 +19,7 @@
 			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>