Compare commits

..

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

11 changed files with 80 additions and 91 deletions

1
.ecj.metadata Normal file
View File

@ -0,0 +1 @@
93617e44d5b7fd7c301ad128d64367b64db2fa34 SOURCES/ecjsrc-4.20.jar

View File

@ -1 +0,0 @@
1

11
.gitignore vendored
View File

@ -1,10 +1 @@
/noarch SOURCES/ecjsrc-4.20.jar
/.build-*.log
/*.src.rpm
/ecj-*.pom
/ecj-*/
/ecjsrc-*.jar
/java10api.jar
/java14api.jar
/javax15api.jar
/javax16api.jar

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ecj</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.linuxtools.rpm.core.rpmnature</nature>
<nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
</natures>
</projectDescription>

View File

@ -1,11 +1,11 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Created-By: Maven Archiver 3.5.1 Created-By: Maven Archiver 3.5.0
Build-Jdk-Spec: 11 Build-Jdk-Spec: 11
Main-Class: org.eclipse.jdt.internal.compiler.batch.Main Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Compiler for Java(TM) Bundle-Name: Eclipse Compiler for Java(TM)
Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch
Bundle-Version: 3.28.0.v20211117-1416 Bundle-Version: 3.27.0.v20210823-1758
Bundle-ClassPath: . Bundle-ClassPath: .
Bundle-Vendor: Eclipse.org Bundle-Vendor: Eclipse.org
Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org.e Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org.e

47
SOURCES/ecj-3.27.0.pom Normal file
View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 2018 GK Software SE and others.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/
SPDX-License-Identifier: EPL-2.0
Contributors:
Stephan Herrmann - initial implementation
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xsi:noNamespaceSchemaLocation="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.27.0</version>
<description>Eclipse Compiler for Java(TM)</description>
<name>Eclipse Compiler for Java(TM)</name>
<url>http://www.eclipse.org/jdt</url>
<licenses>
<license>
<name>Eclipse Public License - v 2.0</name>
<url>https://www.eclipse.org/legal/epl-2.0/</url>
<distribution>repo</distribution>
</license>
</licenses>
<organization>
<name>Eclipse Foundation</name>
<url>http://www.eclipse.org/</url>
</organization>
<issueManagement>
<system>Bugzilla</system>
<url>https://bugs.eclipse.org/</url>
</issueManagement>
<scm>
<connection>scm:git:https://git.eclipse.org/r/jdt/eclipse.jdt.core.git</connection>
<url>https://git.eclipse.org/c/jdt/eclipse.jdt.core.git</url>
</scm>
<developers>
<developer>
<url>https://projects.eclipse.org/projects/eclipse.jdt/who</url>
</developer>
</developers>
</project>

View File

@ -1,9 +1,9 @@
Epoch: 1 Epoch: 1
%global eclipse_ver 4.23 %global eclipse_ver 4.20
%global bundle_ver 3.29.0 %global bundle_ver 3.27.0
%global jar_ver %{eclipse_ver} %global jar_ver %{eclipse_ver}
%global drop R-%{jar_ver}-202203080310 %global drop R-%{jar_ver}-202106111600
Summary: Eclipse Compiler for Java Summary: Eclipse Compiler for Java
Name: ecj Name: ecj
@ -25,9 +25,9 @@ BuildArch: noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: java-devel BuildRequires: java-17-openjdk-devel
Requires: java-headless Requires: (java-1.8.0-headless or java-11-headless or java-17-headless)
Requires: javapackages-tools Requires: javapackages-tools
%description %description
@ -50,7 +50,7 @@ rm ./META-INF/ECLIPSE_.{SF,RSA}
org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt
%build %build
export JAVA_HOME=/usr/lib/jvm/java export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
ant ant
%install %install
@ -70,53 +70,39 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
%{_mandir}/man1/ecj* %{_mandir}/man1/ecj*
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:4.23-11 * Fri Oct 27 2023 Hui Wang <huwang@redhat.com> - 1:4.20-11
- Bump release for October 2024 mass rebuild: - Resolves: RHEL-14879 ecj requires specific java version
Resolves: RHEL-64018
* Tue Aug 06 2024 Adam Krajcik <akrajcik@redhat.com> - 1:4.23-10 * Wed Feb 15 2023 Coty Sutherland <csutherl@redhat.com> - 1:4.20-10
- Add gating - Drop unnecessary javax16.api.jar (again)
- Resolves: RHEL-52907 - Switch to using Java 21 as the default JDK - Add dependency on javapackages-tools since the ecj binary requires it to run
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:4.23-9 * Wed Feb 15 2023 Coty Sutherland <csutherl@redhat.com> - 1:4.20-9
- Bump release for June 2024 mass rebuild - Trigger CI tests again
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.23-8 * Wed Feb 15 2023 Coty Sutherland <csutherl@redhat.com> - 1:4.20-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Update BuildRequires to use java-17
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.23-7 * Tue Feb 14 2023 Hui Wang <huwang@redhat.com> - 1:4.20-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Fix JAVA_HOME
* Wed Jul 19 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1:4.23-6 * Tue Feb 14 2023 Hui Wang <huwang@redhat.com> - 1:4.20-6
- Build with default Java version - Add requires java-11-openjdk and java-11-openjdk-headless
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.23-5 * Tue Feb 07 2023 Hui Wang <huwang@redhat.com> - 1:4.20-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Add javax16api.jar back
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.23-4 * Sat Feb 04 2023 Hui Wang <huwang@redhat.com> - 1:4.20-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Remove javax16api.jar which is not necessary in RHEL-8
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.23-3 * Thu Feb 02 2023 Hui Wang <huwang@redhat.com> - 1:4.20-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Add tmt gating plan
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1:4.23-2 * Wed Feb 01 2023 Hui Wang <huwang@redhat.com> - 1:4.20-2
- Rebuilt for Drop i686 JDKs - Add gating.yaml
* Fri Apr 01 2022 Mat Booth <mat.booth@gmail.com> - 1:4.23-1 * Thu Jan 19 2023 Hui Wang <huwang@redhat.com> - 1:4.20-1
- Update to latest upstream release - Update to 4.20
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:4.22-3
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Dec 06 2021 Mat Booth <mat.booth@gmail.com> - 1:4.22-1
- Update to latest upstream release
* Wed Sep 15 2021 Mat Booth <mat.booth@gmail.com> - 1:4.21-1
- Update to latest upstream release
- Drop build requirement on Java 8, ecj now requires Java 11
* Wed Aug 25 2021 Stefan Bluhm <stefan.bluhm@clacee.eu> - 1:4.19-3 * Wed Aug 25 2021 Stefan Bluhm <stefan.bluhm@clacee.eu> - 1:4.19-3
- Added RHEL8 build. - Added RHEL8 build.

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,9 +0,0 @@
summary: Basic smoke test
prepare:
- name: packages
how: install
package:
- ecj
execute:
how: tmt
script: ecj -version

View File

@ -1,2 +0,0 @@
SHA512 (ecj-3.29.0.pom) = ede260b2acae642035e277488e35aeab79aa83365b496fb5d377d4be5d3facc8eb39821e379f58a7a632c9b46fee275e200e77986dda09150b49da788edae52a
SHA512 (ecjsrc-4.23.jar) = 3b0dcbfb0d35363987daa93bb1d0aedeeff8c7b871f11b51af91cbcbbde0d9118dfcc754504019ae13f9621cd11c8f63cafd7fa7cfbdea65a9d6dc66aab00dd6