shade and rewrite codehaus and maven dependencies #2115

jurgenvinju · 2025-01-03T14:11:54Z

by relocating org.apache.maven and org.codehaus we can run maven instance classes twice without collision later in the rascal-maven-plugin
removed the unshaded deployment profile
removed the appenders for maven/codehaus dependency injection files, because the relocator will produce two different files now.

…ance classes twice without collision later in the rascal-maven-plugin

jurgenvinju · 2025-01-03T14:14:14Z

tested java -jar rascal.jar; import util::Reflective; getRascalProjectConfig(|project://rascal|)
tested mvn rascal:console; import util::Reflective; getRascalProjectConfig(|project://rascal|)
- snapshot dependency on this PR rascal branch

codecov · 2025-01-03T14:16:26Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49%. Comparing base (6c58baa) to head (6016e9e).
Report is 15 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##              main   #2115   +/-   ##
=======================================
  Coverage       49%     49%           
- Complexity    6224    6234   +10     
=======================================
  Files          663     663           
  Lines        59181   59181           
  Branches      8615    8615           
=======================================
+ Hits         29458   29479   +21     
+ Misses       27497   27475   -22     
- Partials      2226    2227    +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

DavyLandman · 2025-01-03T15:19:35Z

I like this better, but we should also revert the changes to build.yaml

DavyLandman · 2025-01-03T15:20:18Z

pom.xml

@@ -322,14 +322,6 @@
                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                    <resource>io/usethesource/vallang/type/types.config</resource>
                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">


Why did hmyhey get removed? Shouldn't they still be there, but in a new directory?

I tried to remove them for the sake of minimalism. That worked. I guess the rewrites make sure the collisions don't happen anymore.

DavyLandman · 2025-01-03T15:20:54Z

We should also do a test of the generated jar on Windows, just to make sure it also works there.

jurgenvinju · 2025-01-03T20:40:48Z

Ok. Are there any volunteers for testing the jar on windows? I had to remove my virtual windows 10 to save disk space.

Removed unshaded action run

DavyLandman · 2025-01-04T09:44:30Z

On Monday I'll bake a jar and run it.

DavyLandman · 2025-01-06T10:06:01Z

On windows, it doesn't work:

rascal>getProjectPathConfig(|home:///swat.engineering/rascal/rascal-libs/salix-contrib/|);
WARNING: could not resolve dependency on: |lib://salix-core| because: |lib://salix-core|
PathConfig: pathConfig(
  ignores=[],
  javaCompilerPath=[|file:///C:/Users/Davy/swat.engineering/rascal/releng/rascal/target/rascal-0.41.0-RC3-SNAPSHOT.jar|],
  bin=|target://salix-contrib|,
  classloaders=[
    |target://salix-contrib|,
    |system:///|
  ],
  libs=[|lib://rascal|],
  srcs=[|home:///swat.engineering/rascal/rascal-libs/salix-contrib/src/main/rascal|])
rascal>

while it should have been (v0.40.17.jar):

rascal>getProjectPathConfig(|home:///swat.engineering/rascal/rascal-libs/salix-contrib/|);
PathConfig: pathConfig(
  ignores=[],
  javaCompilerPath=[|file:///C:/Users/Davy/.m2/repository/org/rascalmpl/rascal/0.40.17/rascal-0.40.17.jar|],
  bin=|target://salix-contrib|,
  classloaders=[
    |target://salix-contrib|,
    |system:///|,
    |file:///C:/Users/Davy/.m2/repository/org/rascalmpl/rascal/0.40.11/rascal-0.40.11.jar|,
    |file:///C:/Users/Davy/.m2/repository/org/rascalmpl/salix-core/0.2.5/salix-core-0.2.5.jar|
  ],
  libs=[
    |lib://rascal|,
    |jar+file:///C:/Users/Davy/.m2/repository/org/rascalmpl/salix-core/0.2.5/salix-core-0.2.5.jar!/|
  ],
  srcs=[|home:///swat.engineering/rascal/rascal-libs/salix-contrib/src/main/rascal|])

DavyLandman · 2025-01-06T12:10:41Z

I've just tested it on linux, it also doesn't work.

rascal>getProjectPathConfig(|home:///swat.engineering/rascal/salix-contrib/|);
WARNING: could not resolve dependency on: |lib://salix-core| because: |lib://salix-core|
PathConfig: pathConfig(
  ignores=[],
  javaCompilerPath=[|file:///home/davy/swat.engineering/rascal/rascal/target/rascal-0.41.0-RC3-SNAPSHOT.jar|],
  bin=|target://salix-contrib|,
  classloaders=[
    |target://salix-contrib|,
    |system:///|
  ],
  libs=[|lib://rascal|],
  srcs=[|home:///swat.engineering/rascal/salix-contrib/src/main/rascal|])

DavyLandman

It breaks the behavior of the maven project resolution. All you get is the fallback behavior of an empty path config with some defaults filled in from the project and rascal.mf.

(revering the file merging config back to the original has no effect)

DavyLandman · 2025-01-06T12:22:19Z

It's caused by the logging framework, that tries to (via reflection) load the log class, but that class doesn't exist anymore, as it's been relocated.

java.lang.ClassNotFoundException: org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
        at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:581)
        at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178)
        at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:527)
        at java.base/java.lang.Class.forName0(Native Method)
        at java.base/java.lang.Class.forName(Class.java:315)
        at org.rascalmpl.apache.maven.cli.logging.Slf4jConfigurationFactory.getConfiguration(Slf4jConfigurationFactory.java:61)
        at org.rascalmpl.apache.maven.cli.MavenCli.logging(MavenCli.java:488)
        at org.rascalmpl.apache.maven.cli.MavenCli.doMain(MavenCli.java:274)
        at org.rascalmpl.library.util.Maven.runCommand(Maven.java:55)
        at org.rascalmpl.library.util.Maven.runCommand(Maven.java:72)
        at org.rascalmpl.library.util.PathConfig.getPomXmlCompilerClasspath(PathConfig.java:640)
        at org.rascalmpl.library.util.PathConfig.fromSourceProjectRascalManifest(PathConfig.java:475)
        at org.rascalmpl.shell.ShellEvaluatorFactory.configureProjectEvaluator(ShellEvaluatorFactory.java:72)
        at org.rascalmpl.shell.ShellEvaluatorFactory.getDefaultEvaluator(ShellEvaluatorFactory.java:42)
        at org.rascalmpl.shell.REPLRunner$1.constructEvaluator(REPLRunner.java:51)
        at org.rascalmpl.repl.RascalInterpreterREPL.initialize(RascalInterpreterREPL.java:76)
        at org.rascalmpl.repl.BaseREPL.initialize(BaseREPL.java:158)
        at org.rascalmpl.repl.BaseREPL.<init>(BaseREPL.java:112)
        at org.rascalmpl.repl.BaseREPL.<init>(BaseREPL.java:61)
        at org.rascalmpl.shell.REPLRunner.<init>(REPLRunner.java:36)
        at org.rascalmpl.shell.RascalShell.main(RascalShell.java:80)
[main] WARN org.rascalmpl.apache.maven.cli.logging.impl.UnsupportedSlf4jBindingConfiguration - The SLF4J binding actually used is not supported by Maven: org.slf4j.impl.SimpleLoggerFactory
[main] WARN org.rascalmpl.apache.maven.cli.logging.impl.UnsupportedSlf4jBindingConfiguration - Maven supported bindings are:
[main] ERROR org.rascalmpl.apache.maven.cli.MavenCli - Error executing Maven.
[main] ERROR org.rascalmpl.apache.maven.cli.MavenCli - java.util.NoSuchElementException
      role: org.rascalmpl.apache.maven.eventspy.internal.EventSpyDispatcher
  roleHint:
[main] ERROR org.rascalmpl.apache.maven.cli.MavenCli - Caused by: null
java.lang.ClassNotFoundException: org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
        at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:581)
        at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178)
        at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:527)
        at java.base/java.lang.Class.forName0(Native Method)
        at java.base/java.lang.Class.forName(Class.java:315)
        at org.rascalmpl.apache.maven.cli.logging.Slf4jConfigurationFactory.getConfiguration(Slf4jConfigurationFactory.java:61)
        at org.rascalmpl.apache.maven.cli.MavenCli.logging(MavenCli.java:488)
        at org.rascalmpl.apache.maven.cli.MavenCli.doMain(MavenCli.java:274)
        at org.rascalmpl.library.util.Maven.runCommand(Maven.java:55)
        at org.rascalmpl.library.util.PathConfig.getPomXmlCompilerClasspath(PathConfig.java:644)
        at org.rascalmpl.library.util.PathConfig.fromSourceProjectRascalManifest(PathConfig.java:475)
        at org.rascalmpl.shell.ShellEvaluatorFactory.configureProjectEvaluator(ShellEvaluatorFactory.java:72)
        at org.rascalmpl.shell.ShellEvaluatorFactory.getDefaultEvaluator(ShellEvaluatorFactory.java:42)
        at org.rascalmpl.shell.REPLRunner$1.constructEvaluator(REPLRunner.java:51)
        at org.rascalmpl.repl.RascalInterpreterREPL.initialize(RascalInterpreterREPL.java:76)
        at org.rascalmpl.repl.BaseREPL.initialize(BaseREPL.java:158)
        at org.rascalmpl.repl.BaseREPL.<init>(BaseREPL.java:112)
        at org.rascalmpl.repl.BaseREPL.<init>(BaseREPL.java:61)
        at org.rascalmpl.shell.REPLRunner.<init>(REPLRunner.java:36)
        at org.rascalmpl.shell.RascalShell.main(RascalShell.java:80)

DavyLandman · 2025-01-06T13:44:31Z

I've fix this in a different way. Namely properly pubishing a rascal-unshaded next to rascal. We wanted to try and do this purely via the shade plugin, but that would have never worked.

So I propose we abandon this PR?

jurgenvinju added 2 commits January 3, 2025 15:10

by relocating org.apache.maven and org.codehaus we can run maven inst…

4e47cca

…ance classes twice without collision later in the rascal-maven-plugin

removed the unshaded deployment profile

01a4c2d

jurgenvinju requested review from rodinaarssen and DavyLandman January 3, 2025 14:12

jurgenvinju self-assigned this Jan 3, 2025

DavyLandman reviewed Jan 3, 2025

View reviewed changes

Update build.yaml

6016e9e

Removed unshaded action run

DavyLandman requested changes Jan 6, 2025

View reviewed changes

jurgenvinju closed this Jan 7, 2025

jurgenvinju deleted the shade-and-rewrite-codehaus-and-maven-dependencies branch January 7, 2025 11:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

shade and rewrite codehaus and maven dependencies #2115

shade and rewrite codehaus and maven dependencies #2115

jurgenvinju commented Jan 3, 2025 •

edited

Loading

jurgenvinju commented Jan 3, 2025 •

edited

Loading

codecov bot commented Jan 3, 2025 •

edited

Loading

DavyLandman commented Jan 3, 2025

DavyLandman Jan 3, 2025

jurgenvinju Jan 3, 2025

DavyLandman commented Jan 3, 2025

jurgenvinju commented Jan 3, 2025

DavyLandman commented Jan 4, 2025

DavyLandman commented Jan 6, 2025 •

edited

Loading

DavyLandman commented Jan 6, 2025

DavyLandman left a comment •

edited

Loading

DavyLandman commented Jan 6, 2025

DavyLandman commented Jan 6, 2025

shade and rewrite codehaus and maven dependencies #2115

shade and rewrite codehaus and maven dependencies #2115

Conversation

jurgenvinju commented Jan 3, 2025 • edited Loading

jurgenvinju commented Jan 3, 2025 • edited Loading

codecov bot commented Jan 3, 2025 • edited Loading

Codecov Report

DavyLandman commented Jan 3, 2025

DavyLandman Jan 3, 2025

Choose a reason for hiding this comment

jurgenvinju Jan 3, 2025

Choose a reason for hiding this comment

DavyLandman commented Jan 3, 2025

jurgenvinju commented Jan 3, 2025

DavyLandman commented Jan 4, 2025

DavyLandman commented Jan 6, 2025 • edited Loading

DavyLandman commented Jan 6, 2025

DavyLandman left a comment • edited Loading

Choose a reason for hiding this comment

DavyLandman commented Jan 6, 2025

DavyLandman commented Jan 6, 2025

jurgenvinju commented Jan 3, 2025 •

edited

Loading

jurgenvinju commented Jan 3, 2025 •

edited

Loading

codecov bot commented Jan 3, 2025 •

edited

Loading

DavyLandman commented Jan 6, 2025 •

edited

Loading

DavyLandman left a comment •

edited

Loading