OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=59

ecj-3.29.0.pom

@@ -1,47 +0,0 @@
-<?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.29.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>

ecj-3.32.0.pom

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eclipse.jdt</groupId>
+  <artifactId>ecj</artifactId>
+  <version>3.32.0</version>
+  <name>Eclipse Compiler for Java(TM)</name>
+  <description>Eclipse Compiler for Java(TM)</description>
+  <url>https://projects.eclipse.org/projects/eclipse.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>https://www.eclipse.org/</url>
+  </organization>
+  <issueManagement>
+    <system>Github</system>
+    <url>https://github.com/eclipse-jdt/eclipse.jdt.core/issues</url>
+  </issueManagement>
+  <scm>
+    <connection>scm:git:https://github.com/eclipse-jdt/eclipse.jdt.core.git</connection>
+    <url>https://github.com/eclipse-jdt/eclipse.jdt.core</url>
+  </scm>
+  <developers>
+    <developer>
+      <url>https://projects.eclipse.org/projects/eclipse.jdt/who</url>
+    </developer>
+  </developers>
+</project>

ecj.spec

@@ -16,10 +16,10 @@
 #
 
 
-%global eclipse_ver 4.23
+%global eclipse_ver 4.26
-%global bundle_ver 3.29.0
+%global bundle_ver 3.32.0
 %global jar_ver %{eclipse_ver}
-%global drop R-%{jar_ver}-202203080310
+%global drop R-%{jar_ver}-202211231800
 Name:           ecj
 Version:        %{eclipse_ver}
 Release:        0
@@ -32,6 +32,7 @@ Source1:        https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/%{bundle_ver}
 # Extracted from https://download.eclipse.org/eclipse/downloads/drops4/%%{drop}/ecj-%%{jar_ver}.jar
 Source2:        MANIFEST.MF
 Patch0:         ecj-rpmdebuginfo.patch
+Patch1:         fix-build.patch
 BuildRequires:  ant
 BuildRequires:  java-devel >= 11
 BuildRequires:  javapackages-local >= 6
@@ -45,6 +46,7 @@ the JDT Core batch compiler.
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1
 
 # Specify encoding
 sed -i -e '/compilerarg/s/Xlint:none/Xlint:none -encoding cp1252/' build.xml
@@ -62,7 +64,7 @@ install -pm 0644 ecj.jar %{buildroot}%{_javadir}/%{name}/ecj.jar
 
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-%mvn_install_pom %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}/ecj.pom
+%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}/ecj.pom
 %add_maven_depmap %{name}/ecj.pom %{name}/ecj.jar -a "org.eclipse.jdt:core,org.eclipse.jdt.core.compiler:ecj,org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.tycho:org.eclipse.jdt.compiler.apt"
 
 # Install the ecj wrapper script

ecjsrc-4.26.jar

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ee9ea8310f7a3384dc928e2354e8f1387dedda0350a899e4ee5a7056fa6fbd8
+size 2347137

fix-build.patch

@@ -0,0 +1,11 @@
+--- a/build.xml	2023-08-21 13:18:06.079833092 +0200
++++ b/build.xml	2023-08-21 13:18:27.466641958 +0200
+@@ -27,7 +27,7 @@
+ 					debuglevel="lines,source"
+ 					debug="true"
+ 					release="11">
+-			<compilerarg line="-Xlint:none --patch-module java.compiler=javax17api.jar"/>
++			<compilerarg line="-Xlint:none --patch-module java.compiler=javax18api.jar"/>
+ 		</javac>
+ 
+ 		<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>