From 7a1e6d3d59d9fb90dc4e3d65f46327e20775fade Mon Sep 17 00:00:00 2001 From: Jeff Smits <j.smits-1@tudelft.nl> Date: Mon, 29 Jul 2024 16:58:17 +0200 Subject: [PATCH] Change javax.annotation.Generated from jsr205 to jakarta.annotation.Generated from jakarta.annotation:annotation-api --- lwb.distrib/spoofax.lwb.eclipse/build.gradle.kts | 2 +- .../main/java/mb/spoofax/lwb/eclipse/util/ClassPathUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lwb.distrib/spoofax.lwb.eclipse/build.gradle.kts b/lwb.distrib/spoofax.lwb.eclipse/build.gradle.kts index 88ab14d4b..44388fc9c 100644 --- a/lwb.distrib/spoofax.lwb.eclipse/build.gradle.kts +++ b/lwb.distrib/spoofax.lwb.eclipse/build.gradle.kts @@ -143,7 +143,7 @@ val privatePackage = listOf( "com.google.common.util.concurrent.internal.*", "com.squareup.javapoet.*", "kotlin.*;-split-package:=merge-first", - "javax.annotation.*;-split-package:=merge-first", + "jakarta.annotation.*", // Embed `io.github.classgraph:classgraph`. "io.github.classgraph.*", "nonapi.io.github.classgraph.*", diff --git a/lwb.distrib/spoofax.lwb.eclipse/src/main/java/mb/spoofax/lwb/eclipse/util/ClassPathUtil.java b/lwb.distrib/spoofax.lwb.eclipse/src/main/java/mb/spoofax/lwb/eclipse/util/ClassPathUtil.java index cd98b4dfa..7a17748c6 100644 --- a/lwb.distrib/spoofax.lwb.eclipse/src/main/java/mb/spoofax/lwb/eclipse/util/ClassPathUtil.java +++ b/lwb.distrib/spoofax.lwb.eclipse/src/main/java/mb/spoofax/lwb/eclipse/util/ClassPathUtil.java @@ -27,7 +27,7 @@ import org.eclipse.ui.texteditor.IDocumentProvider; import org.osgi.framework.BundleActivator; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import javax.annotation.Nullable; import java.io.File; import java.util.Comparator; @@ -49,7 +49,7 @@ public static List<File> getClassPath() { .addClassLoader(GppEclipseParticipant.class.getClassLoader()) .addClassLoader(Rv32ImEclipseComponent.class.getClassLoader()) - .addClassLoader(Generated.class.getClassLoader()) // Artifact: javax.annotation:jsr250-api:1.0 + .addClassLoader(Generated.class.getClassLoader()) // Artifact: jakarta.annotation:annotation-api:2.1.0 .addClassLoader(BundleActivator.class.getClassLoader()) // Bundle: org.eclipse.osgi .addClassLoader(IConfigurationElement.class.getClassLoader()) // Bundle: org.eclipse.equinox.registry