Merge remote-tracking branch 'origin/main' into migrate-jline3

usethesource · Jan 2, 2025 · fa645ec · fa645ec
2 parents 993af6d + 6c58baa
commit fa645ec
Show file tree

Hide file tree

Showing 176 changed files with 7,727 additions and 7,234 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -93,7 +93,7 @@ jobs:
             tests (buildjet-4vcpu-ubuntu-2204-arm)
           ttl: 15
 
-      - name: Deploy
+      - name: Deploy shaded jar
         if: startsWith(github.ref, 'refs/tags/v')
         uses: usethesource/releases-maven-action@v1
         with:
@@ -105,6 +105,19 @@ jobs:
           ssh-username: ${{ secrets.RELEASE_SSH_USERNAME }}
           ssh-private-key: ${{ secrets.RELEASE_SSH_PRIVATE_KEY }}
 
+      - name: Deploy unshaded jar
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: usethesource/releases-maven-action@v1
+        with:
+          maven-username: ${{ secrets.RELEASE_MAVEN_USERNAME }}
+          maven-password: ${{ secrets.RELEASE_MAVEN_PASSWORD }}
+          maven-local-port: ${{ secrets.RELEASE_MAVEN_LOCAL_PORT }}
+          ssh-hostname: ${{ secrets.RELEASE_SSH_SERVER }}
+          ssh-known-host: ${{ secrets.RELEASE_SSH_KNOWN_HOSTS }}
+          ssh-username: ${{ secrets.RELEASE_SSH_USERNAME }}
+          ssh-private-key: ${{ secrets.RELEASE_SSH_PRIVATE_KEY }}
+          maven-options: -Punshaded
+
       - name: Prepare Draft Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/pom.xml b/pom.xml
@@ -3,12 +3,12 @@
 
     <groupId>org.rascalmpl</groupId>
     <artifactId>rascal</artifactId>
-    <version>0.40.12-SNAPSHOT</version>
+    <version>0.41.0-RC3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
         <developerConnection>scm:git:ssh://[email protected]/usethesource/rascal.git</developerConnection>
-        <tag>v0.40.10</tag>
+        <tag>v0.41.0-RC1</tag>
     </scm>
 
     <!-- dependency resolution configuration (usethesource) -->
@@ -29,10 +29,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lucence-version>7.5.0</lucence-version>
+        <maven-version>3.9.9</maven-version>
         <exec.mainClass>org.rascalmpl.shell.RascalShell</exec.mainClass>
-        <rascal.test.memory>2</rascal.test.memory>
+        <rascal.test.memory>3</rascal.test.memory>
         <maven.compiler.release>11</maven.compiler.release>
-        <rascal-maven.version>0.28.4</rascal-maven.version>
+        <rascal-maven.version>0.28.9-BOOT1</rascal-maven.version>
         <jline.version>3.27.0</jline.version>
     </properties>
 
@@ -104,7 +105,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -169,7 +170,8 @@
                             <goal>package</goal>
                         </goals>
                     </execution>
-                    <execution>
+                        <!-- commented out for bootstrapping purposes; 
+                            <execution>
                         <id>default-cli</id>
                         <phase>compile</phase>
                         <goals>
@@ -190,7 +192,7 @@
                                 <ignore>${project.basedir}/src/org/rascalmpl/library/lang/rascal</ignore>
                             </ignores>
                         </configuration>
-                        </execution>
+                        </execution> -->
                 </executions>
             </plugin>
             <plugin>
@@ -212,7 +214,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.5.2</version>
                 <executions>
                     <execution>
                         <id>test</id>
@@ -260,7 +262,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -276,7 +278,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.1</version>
                 <configuration>
                     <tagNameFormat>v@{project.version}</tagNameFormat>
                     <arguments>-Drascal.compile.skip -Drascal.tutor.skip -DskipTests</arguments>
@@ -285,7 +287,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>2.4.0</version>
+                <version>2.5.0</version>
                 <executions>
                     <execution>
                         <id>download-licenses</id>
@@ -317,10 +319,15 @@
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>org/rascalmpl/uri/resolvers.config</resource>
-                                    <resource>io/usethesource/vallang/type/types.config </resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
+                                <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">
+                                    <resource>META-INF/sisu/javax.inject.Named</resource> <!-- Needed for dependency injection in MavenCli -->
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" /> <!-- Needed for dependency injection in MavenCli -->
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
                                     <addHeader>false</addHeader>
                                 </transformer>
@@ -444,22 +451,22 @@
         <dependency> <!-- used by the compression uri feature-->
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.26.1</version>
+            <version>1.27.1</version>
         </dependency>
         <dependency> <!-- needed by commons-compress for compressed+...://...zst -->
             <groupId>com.github.luben</groupId>
             <artifactId>zstd-jni</artifactId>
-            <version>1.5.5-11</version>
+            <version>1.5.6-8</version>
         </dependency>
         <dependency> <!-- used for base32 encoding in IO and String, needed anyway for commons-compress -->
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.17.0</version>
+            <version>1.17.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency> <!-- line reader/completion/history support -->
             <groupId>org.jline</groupId>
@@ -494,7 +501,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
@@ -534,7 +541,105 @@
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
-            <version>74.2</version>
+            <version>76.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-embedder</artifactId>
+            <version>${maven-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency> <!-- needed for maven-embedder-->
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>1.7.36</version>
+        </dependency>
+        <dependency> <!-- needed for maven-embedder-->
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <version>${maven-version}</version>
+        </dependency>
+        <dependency> <!-- needed for maven-embedder-->
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven-version}</version>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>unshaded</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <version>3.6.0</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>shade</goal>
+                                </goals>
+                                <configuration>
+                                    <transformers>
+                                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                            <manifestEntries>
+                                                <Name>rascal</Name>
+                                                <Main-Class>org.rascalmpl.shell.RascalShell</Main-Class>
+                                                <Specification-Version>${project.version}</Specification-Version>
+                                                <Specification-Vendor>http://www.usethesource.io</Specification-Vendor>
+                                            </manifestEntries>
+                                        </transformer>
+                                    </transformers>
+                                    <relocations>
+                                        <relocation>
+                                            <pattern>org.fusesource.jansi</pattern>
+                                            <shadedPattern>org.rascalmpl.fusesource.jansi</shadedPattern>
+                                            <excludes>
+                                                <exclude>org.fusesource.jansi.internal.*</exclude>
+                                            </excludes>
+                                        </relocation>
+                                        <relocation>
+                                            <pattern>jline</pattern>
+                                            <shadedPattern>org.rascalmpl.jline</shadedPattern>
+                                        </relocation>
+                                    </relocations>
+                                    <filters>
+                                        <filter>
+                                            <artifact>*:*</artifact>
+                                            <excludes>
+                                                <exclude>META-INF/*.SF</exclude>
+                                                <exclude>META-INF/*.DSA</exclude>
+                                                <exclude>META-INF/*.RSA</exclude>
+                                            </excludes>
+                                        </filter>
+                                    </filters>
+                                    <artifactSet>
+                                        <includes>
+                                            <include>jline:*</include>
+                                        </includes>
+                                    </artifactSet>
+                                    <shadedClassifierName>unshaded</shadedClassifierName>
+				    <shadedArtifactAttached>true</shadedArtifactAttached>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>license-maven-plugin</artifactId>
+                        <configuration>
+                            <skipDownloadLicenses>true</skipDownloadLicenses>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+        </profile>
+    </profiles>
 </project>
diff --git a/src/org/rascalmpl/ast/Assignable.java b/src/org/rascalmpl/ast/Assignable.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Assignable extends AbstractAST {
   public Assignable(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Assignment.java b/src/org/rascalmpl/ast/Assignment.java
@@ -59,6 +59,7 @@ protected void addForLineNumber(int $line, java.util.List<AbstractAST> $result)
       if (getLocation().getBeginLine() == $line) {
         $result.add(this);
       }
+      ISourceLocation $l;
 
     }
 

diff --git a/src/org/rascalmpl/ast/Backslash.java b/src/org/rascalmpl/ast/Backslash.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Backslash extends AbstractAST {
   public Backslash(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Body.java b/src/org/rascalmpl/ast/Body.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Body extends AbstractAST {
   public Body(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/BooleanLiteral.java b/src/org/rascalmpl/ast/BooleanLiteral.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class BooleanLiteral extends AbstractAST {
   public BooleanLiteral(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Case.java b/src/org/rascalmpl/ast/Case.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Case extends AbstractAST {
   public Case(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/CaseInsensitiveStringConstant.java b/src/org/rascalmpl/ast/CaseInsensitiveStringConstant.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class CaseInsensitiveStringConstant extends AbstractAST {
   public CaseInsensitiveStringConstant(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Catch.java b/src/org/rascalmpl/ast/Catch.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Catch extends AbstractAST {
   public Catch(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Char.java b/src/org/rascalmpl/ast/Char.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Char extends AbstractAST {
   public Char(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Class.java b/src/org/rascalmpl/ast/Class.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Class extends AbstractAST {
   public Class(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Command.java b/src/org/rascalmpl/ast/Command.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Command extends AbstractAST {
   public Command(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Commands.java b/src/org/rascalmpl/ast/Commands.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Commands extends AbstractAST {
   public Commands(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Comment.java b/src/org/rascalmpl/ast/Comment.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Comment extends AbstractAST {
   public Comment(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

diff --git a/src/org/rascalmpl/ast/Comprehension.java b/src/org/rascalmpl/ast/Comprehension.java
@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Comprehension extends AbstractAST {
   public Comprehension(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);
-Original file line number
+Diff line change
@@ Expand Up @@
           if (getLocation().getBeginLine() == $line) {
             $result.add(this);
           }
+          ISourceLocation $l;
         }
@@ Expand Down @@