Skip to content

Commit

Permalink
Bump tests to newer Java as ecj no longer compiles to pre 1.8 target
Browse files Browse the repository at this point in the history
Using 17 as preferred target in non compiler specific tests to prevent
having to do similar update soon.
Updates o.e.jdt.core to the version signed with same certificate.
  • Loading branch information
akurtakov committed Dec 6, 2024
1 parent 18d2e7c commit fa3e551
Show file tree
Hide file tree
Showing 72 changed files with 71 additions and 113 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Tests Plug-in
Bundle-SymbolicName: bundle.tests
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: bundle;bundle-version="0.0.1",
org.junit;bundle-version="3.8.0"
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle Plug-in
Bundle-SymbolicName: bundle
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: bundle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle01 Plug-in
Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build01.bundle01
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: bundle01
Require-Bundle: org.eclipse.osgi;bundle-version="3.2.0"
Bundle-Activator: bundle01.Bundle01Activator
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle02 Plug-in
Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build01.bundle02
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle02 Plug-in
Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build01.bundle03
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.junit;bundle-version="3.8.2"
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle02 Plug-in
Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build02.bundle02
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Activator: bundle02.Bundle02Activator
Require-Bundle: org.eclipse.osgi;bundle-version="3.2.0",
org.codehaus.tycho.tychoits.tycho0209.build01.bundle01,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<ignoreTychoRepositories>false</ignoreTychoRepositories>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Bundle-Name: Bundle01
Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build03.bundle01
Bundle-Version: 0.0.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.codehaus.tycho.tychoits.tycho0209.build01.bundle02
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ Bundle-SymbolicName: TYCHO0367localRepositoryCrosstalk.bundle01;singleton:=true
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.osgi,
org.junit;bundle-version="3.8.2"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Activator: TYCHO0367localRepositoryCrosstalk.bundle01.Activator
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ Bundle-SymbolicName: TYCHO0367localRepositoryCrosstalk.bundle02;singleton:=true
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.osgi,
org.junit;bundle-version="3.8.2"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Activator: TYCHO0367localRepositoryCrosstalk.bundle02.Activator
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<environments>
<environment>
<os>linux</os>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<environments>
<environment>
<os>linux</os>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: Plugin
Bundle-SymbolicName: productDotQualifier.plugin;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.equinox.app
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle
Bundle-SymbolicName: bundle
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.13.0</version>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.sonatype.tycho.testextraclasspathtest1.Activator
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.sonatype.tycho.testextraclasspathtest2.Activator
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.sonatype.tycho.testextraclasspathtest3.Activator
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/TYCHO476/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2
Bundle-Name: ExecutionEnvironments Test
Bundle-SymbolicName: executionEnvironments
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
2 changes: 1 addition & 1 deletion tycho-its/projects/compiler.mavenCompilerPlugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.13.0</version>
<configuration>
<compilerId>jdt</compilerId>
<compilerArgument>-err:unused</compilerArgument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle1
Bundle-SymbolicName: bundle1
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: bundle1;version="1.0.0"
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,6 @@
<mainLabel>The custom main label</mainLabel>
<mainFilename>custom-overview.html</mainFilename>
</tocOptions>
<jvmOptions>
<jvmOption>
-Xms8m</jvmOption>
<jvmOption>-Xmx48m</jvmOption>
<jvmOption>
-Dfoo=bar

</jvmOption>
</jvmOptions>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
<packaging>jar</packaging>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle
Bundle-SymbolicName: epc.bundle.test
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: javax.activation;version="1.1.0"
Require-Bundle: org.junit
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.swt;bundle-version="[3.2.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.3
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package: org.eclipse.swt.graphics
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: 364095_dependencyResolverBREE.ee-from-bree
Bundle-Version: 1.0.0
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: org.w3c.dom
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: 364095_dependencyResolverBREE.ee-from-pom
Bundle-Version: 1.0.0
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: org.w3c.dom
2 changes: 1 addition & 1 deletion tycho-its/projects/eeProfile/ee-from-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<executionEnvironment>J2SE-1.5</executionEnvironment>
<executionEnvironment>JavaSE-17</executionEnvironment>
</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2
Bundle-Name: OSGi Jarsigning Example Bundle
Bundle-SymbolicName: jarsigning
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
2 changes: 1 addition & 1 deletion tycho-its/projects/jar-signing/plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2
Bundle-Name: OSGi Jarsigning Example Bundle
Bundle-SymbolicName: jarsigning
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
2 changes: 1 addition & 1 deletion tycho-its/projects/jar-signing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<keystore.key.password>abcd1234</keystore.key.password>
<jarsigner.plugin.groupId>org.apache.maven.plugins</jarsigner.plugin.groupId>
<jarsigner.plugin.artifactId>maven-jarsigner-plugin</jarsigner.plugin.artifactId>
<jarsigner.plugin.version>1.2</jarsigner.plugin.version>
<jarsigner.plugin.version>3.0.0</jarsigner.plugin.version>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bundle using the host bundle and the implicitly provided implementation
Bundle-SymbolicName: org.example.phf.consumer
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.junit
Import-Package: phf.host
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Fragment providing the implementation for linux.gtk.x86_64
Bundle-SymbolicName: org.example.phf.linux.gtk.x86_64
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Fragment-Host: org.example.phf.host
X-Comment: Platform filter disabled so that the test runs on all platforms
X-Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64))
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: Host bundle requiring its implementation fragments via a p2.inf dependency
Bundle-SymbolicName: org.example.phf.host
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: phf.host
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: Test Plug-in
Bundle-SymbolicName: bundle.test
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.junit;bundle-version="3.8.2"
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Bundle-Name: Bundle using the custom touchpoint
Bundle-SymbolicName: pmr.bundle
Bundle-Version: 0.1.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Bundle-Version: 0.1.0.qualifier
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.equinox.p2.engine.spi
Require-Bundle: org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Require-Bundle: org.eclipse.osgi,
org.junit
Bundle-Activator: test.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundle.tests
Bundle-Version: 1.0.0.qualifier
DynamicImport-Package: bundle
Require-Bundle: org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: bundle
Bundle-Version: 1.0.0.qualifier
Export-Package: bundle
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundle.tests
Bundle-Version: 1.0.0.qualifier
Import-Package: split
Require-Bundle: org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-17
Loading

0 comments on commit fa3e551

Please sign in to comment.