Merge pull request #443 from yushan87/general-updates

Updated to 2024, fixed issues with POM and upgraded to Java JDK 17
ClemsonRSRG · Jun 4, 2024 · 8c56530 · 8c56530
2 parents 3c73185 + e61a012
commit 8c56530
Show file tree

Hide file tree

Showing 416 changed files with 442 additions and 438 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,11 +16,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
@@ -36,11 +36,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         java-dist: [ 'corretto', 'liberica', 'microsoft', 'temurin', 'semeru', 'zulu' ]
-        java: [ '11', '17', '21' ]
+        java: [ '17', '21' ]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2023, RESOLVE Software Research Group (RSRG)
+Copyright (c) 2024, RESOLVE Software Research Group (RSRG)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -20,4 +20,4 @@ Developers of this particular test/working-iteration of the `RESOLVE Compiler` i
 
 ## Copyright and license
 
-Copyright © 2023, [RESOLVE Software Research Group (RSRG)](https://www.cs.clemson.edu/resolve/). All rights reserved. The use and distribution terms for this software are covered by the BSD 3-clause license which can be found in the file `LICENSE.txt` at the root of this repository. By using this software in any fashion, you are agreeing to be bound by the terms of this license. You must not remove this notice, or any other, from this software.
+Copyright © 2024, [RESOLVE Software Research Group (RSRG)](https://www.cs.clemson.edu/resolve/). All rights reserved. The use and distribution terms for this software are covered by the BSD 3-clause license which can be found in the file `LICENSE.txt` at the root of this repository. By using this software in any fashion, you are agreeing to be bound by the terms of this license. You must not remove this notice, or any other, from this software.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <artifactId>RESOLVE</artifactId>
     <groupId>edu.clemson.rsrg</groupId>
-    <version>Summer22a</version>
+    <version>Summer24a</version>
     <packaging>jar</packaging>
 
     <name>RESOLVE</name>
@@ -117,8 +117,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -154,26 +154,30 @@
                 <artifactId>license-maven-plugin</artifactId>
                 <version>4.5</version>
                 <configuration>
-                    <header>${license.url}</header>
-                    <excludes>
-                        <exclude>.gitattributes</exclude>
-                        <exclude>.gitignore</exclude>
-                        <exclude>*.md</exclude>
-                        <exclude>*.xml</exclude>
-                        <exclude>*.yml</exclude>
-                        <exclude>LICENSE.txt</exclude>
-                        <exclude>.github/**</exclude>
-                        <exclude>bin/**</exclude>
-                        <exclude>docs/**</exclude>
-                        <exclude>src/antlr4/**</exclude>
-                        <exclude>src/resources/**</exclude>
-                        <exclude>test/resources/**</exclude>
-                    </excludes>
+                    <licenseSets>
+                        <licenseSet>
+                            <header>${license.url}</header>
+                            <excludes>
+                                <exclude>.gitattributes</exclude>
+                                <exclude>.gitignore</exclude>
+                                <exclude>*.md</exclude>
+                                <exclude>*.xml</exclude>
+                                <exclude>*.yml</exclude>
+                                <exclude>LICENSE.txt</exclude>
+                                <exclude>.github/**</exclude>
+                                <exclude>bin/**</exclude>
+                                <exclude>docs/**</exclude>
+                                <exclude>src/antlr4/**</exclude>
+                                <exclude>src/resources/**</exclude>
+                                <exclude>test/resources/**</exclude>
+                            </excludes>
+                        </licenseSet>
+                    </licenseSets>
                     <mapping>
                         <java>SLASHSTAR_STYLE</java>
                     </mapping>
                     <properties>
-                        <year>2023</year>
+                        <year>2024</year>
                     </properties>
                 </configuration>
                 <executions>

diff --git a/src/java/edu/clemson/rsrg/Main.java b/src/java/edu/clemson/rsrg/Main.java
@@ -1,7 +1,7 @@
 /*
  * Main.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/ResolveConceptualElement.java b/src/java/edu/clemson/rsrg/absyn/ResolveConceptualElement.java
@@ -1,7 +1,7 @@
 /*
  * ResolveConceptualElement.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/VirtualListNode.java b/src/java/edu/clemson/rsrg/absyn/VirtualListNode.java
@@ -1,7 +1,7 @@
 /*
  * VirtualListNode.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/clauses/AffectsClause.java b/src/java/edu/clemson/rsrg/absyn/clauses/AffectsClause.java
@@ -1,7 +1,7 @@
 /*
  * AffectsClause.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/clauses/AssertionClause.java b/src/java/edu/clemson/rsrg/absyn/clauses/AssertionClause.java
@@ -1,7 +1,7 @@
 /*
  * AssertionClause.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/Dec.java b/src/java/edu/clemson/rsrg/absyn/declarations/Dec.java
@@ -1,7 +1,7 @@
 /*
  * Dec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/facilitydecl/FacilityDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/facilitydecl/FacilityDec.java
@@ -1,7 +1,7 @@
 /*
  * FacilityDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathAssertionDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathAssertionDec.java
@@ -1,7 +1,7 @@
 /*
  * MathAssertionDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathCategoricalDefinitionDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathCategoricalDefinitionDec.java
@@ -1,7 +1,7 @@
 /*
  * MathCategoricalDefinitionDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathDefVariableDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathDefVariableDec.java
@@ -1,7 +1,7 @@
 /*
  * MathDefVariableDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathDefinitionDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathDefinitionDec.java
@@ -1,7 +1,7 @@
 /*
  * MathDefinitionDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathTypeTheoremDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/mathdecl/MathTypeTheoremDec.java
@@ -1,7 +1,7 @@
 /*
  * MathTypeTheoremDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ConceptModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ConceptModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * ConceptModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ConceptRealizModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ConceptRealizModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * ConceptRealizModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/EnhancementModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/EnhancementModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * EnhancementModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/EnhancementRealizModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/EnhancementRealizModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * EnhancementRealizModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/FacilityModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/FacilityModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * FacilityModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * ModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/PerformanceConceptModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/PerformanceConceptModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * PerformanceConceptModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/PerformanceEnhancementModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/PerformanceEnhancementModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * PerformanceEnhancementModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/PrecisModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/PrecisModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * PrecisModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ShortFacilityModuleDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/moduledecl/ShortFacilityModuleDec.java
@@ -1,7 +1,7 @@
 /*
  * ShortFacilityModuleDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/OperationDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/OperationDec.java
@@ -1,7 +1,7 @@
 /*
  * OperationDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/OperationProcedureDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/OperationProcedureDec.java
@@ -1,7 +1,7 @@
 /*
  * OperationProcedureDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/PerformanceOperationDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/PerformanceOperationDec.java
@@ -1,7 +1,7 @@
 /*
  * PerformanceOperationDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/ProcedureDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/operationdecl/ProcedureDec.java
@@ -1,7 +1,7 @@
 /*
  * ProcedureDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ConceptTypeParamDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ConceptTypeParamDec.java
@@ -1,7 +1,7 @@
 /*
  * ConceptTypeParamDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ConstantParamDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ConstantParamDec.java
@@ -1,7 +1,7 @@
 /*
  * ConstantParamDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ModuleParameter.java b/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ModuleParameter.java
@@ -1,7 +1,7 @@
 /*
  * ModuleParameter.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ModuleParameterDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/ModuleParameterDec.java
@@ -1,7 +1,7 @@
 /*
  * ModuleParameterDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University

diff --git a/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/RealizationParamDec.java b/src/java/edu/clemson/rsrg/absyn/declarations/paramdecl/RealizationParamDec.java
@@ -1,7 +1,7 @@
 /*
  * RealizationParamDec.java
  * ---------------------------------
- * Copyright (c) 2023
+ * Copyright (c) 2024
  * RESOLVE Software Research Group
  * School of Computing
  * Clemson University