Skip to content

Commit 4ff50c9

Browse files
committed
tycho-compiler-plugin/ecj don't yet support Java 25.
Revert "Java 25 update" This reverts commit 88af43f.
1 parent 88af43f commit 4ff50c9

File tree

110 files changed

+112
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+112
-112
lines changed

base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Utils
44
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.activemq;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Activator: uk.ac.stfc.isis.ibex.activemq.ActiveMQ
7-
Bundle-RequiredExecutionEnvironment: JavaSE-25
7+
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Bundle-ActivationPolicy: lazy
99
Export-Package: uk.ac.stfc.isis.ibex.activemq,
1010
uk.ac.stfc.isis.ibex.activemq.message

base/uk.ac.stfc.isis.ibex.alarm.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Tests
44
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.alarm.tests
55
Bundle-Version: 1.0.0.qualifier
66
Fragment-Host: uk.ac.stfc.isis.ibex.alarm;bundle-version="1.0.0"
7-
Bundle-RequiredExecutionEnvironment: JavaSE-25
7+
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.junit;bundle-version="4.11.0",
99
org.hamcrest;bundle-version="1.1.0",
1010
org.mockito.mockito-core;bundle-version="4.7.0",

base/uk.ac.stfc.isis.ibex.alarm/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
1717
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
1818
org.csstudio.alarm.beast.msghist;bundle-version="4.0.1",
1919
wrapped.org.apache.activemq.activemq-all;bundle-version="5.18.6"
20-
Bundle-RequiredExecutionEnvironment: JavaSE-25
20+
Bundle-RequiredExecutionEnvironment: JavaSE-21
2121
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alarm
2222
Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
2323
javax.inject;version="1.0.0"

base/uk.ac.stfc.isis.ibex.alerts.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
1010
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
1111
net.bytebuddy.byte-buddy-agent;bundle-version="1.12.13",
1212
org.objenesis;bundle-version="3.2.0"
13-
Bundle-RequiredExecutionEnvironment: JavaSE-25
13+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1414
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alerts.tests

base/uk.ac.stfc.isis.ibex.alerts/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
1212
uk.ac.stfc.isis.ibex.epics.switching
1313
Bundle-ActivationPolicy: lazy
1414
Export-Package: uk.ac.stfc.isis.ibex.alerts
15-
Bundle-RequiredExecutionEnvironment: JavaSE-25
15+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1616
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alerts

base/uk.ac.stfc.isis.ibex.banner/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
1111
uk.ac.stfc.isis.ibex.epics.switching,
1212
uk.ac.stfc.isis.ibex.configserver,
1313
uk.ac.stfc.isis.ibex.epics
14-
Bundle-RequiredExecutionEnvironment: JavaSE-25
14+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1515
Bundle-ActivationPolicy: lazy
1616
Export-Package: uk.ac.stfc.isis.ibex.banner
1717
Automatic-Module-Name: uk.ac.stfc.isis.ibex.banner

base/uk.ac.stfc.isis.ibex.beamstatus/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.model;bundle-version="1.0.0",
1111
uk.ac.stfc.isis.ibex.instrument,
1212
uk.ac.stfc.isis.ibex.epics.switching,
1313
org.diirt.vtype;bundle-version="3.1.5"
14-
Bundle-RequiredExecutionEnvironment: JavaSE-25
14+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1515
Export-Package: uk.ac.stfc.isis.ibex.beamstatus
1616
Bundle-ActivationPolicy: lazy
1717
Automatic-Module-Name: uk.ac.stfc.isis.ibex.beamstatus

base/uk.ac.stfc.isis.ibex.configserver.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Config server tests
44
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.configserver.tests
55
Bundle-Version: 1.0.0.qualifier
66
Fragment-Host: uk.ac.stfc.isis.ibex.configserver;bundle-version="1.0.0"
7-
Bundle-RequiredExecutionEnvironment: JavaSE-25
7+
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.junit;bundle-version="4.10.0",
99
uk.ac.stfc.isis.ibex.epics,
1010
org.hamcrest,

base/uk.ac.stfc.isis.ibex.configserver/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
2222
com.google.gson,
2323
uk.ac.stfc.isis.ibex.managermode,
2424
uk.ac.stfc.isis.ibex.validators;bundle-version="1.0.0"
25-
Bundle-RequiredExecutionEnvironment: JavaSE-25
25+
Bundle-RequiredExecutionEnvironment: JavaSE-21
2626
Bundle-ActivationPolicy: lazy
2727
Export-Package: uk.ac.stfc.isis.ibex.configserver;
2828
uses:="uk.ac.stfc.isis.ibex.epics.pv,

base/uk.ac.stfc.isis.ibex.dae.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Tests
44
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.dae.tests
55
Bundle-Version: 1.0.0.qualifier
66
Fragment-Host: uk.ac.stfc.isis.ibex.dae;bundle-version="1.0.0"
7-
Bundle-RequiredExecutionEnvironment: JavaSE-25
7+
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.junit;bundle-version="4.10.0",
99
org.hamcrest,
1010
org.mockito.mockito-core;bundle-version="4.7.0",

0 commit comments

Comments
 (0)