Changes for Winter 2025

.github/workflows/codeql-analysis.yml

@@ -53,7 +53,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -78,4 +78,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/maven.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '17', '22' ]
+        java: [ '17', '22' ]
     name: JDK ${{ matrix.Java }}
     steps:
     - uses: actions/checkout@v4

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,19 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

examples/pom.xml

@@ -3,23 +3,23 @@
   <parent>
     <artifactId>joy</artifactId>
     <groupId>io.github.davidwhitlock.joy</groupId>
-    <version>1.1.1</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>examples</artifactId>
   <name>examples</name>
-  <version>1.2.1</version>
+  <version>1.3.0</version>
   <url>https://www.cs.pdx.edu/~whitlock</url>
   <dependencies>
     <dependency>
       <groupId>io.github.davidwhitlock.joy</groupId>
       <artifactId>family</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2</version>
     </dependency>
     <dependency>
       <groupId>io.github.davidwhitlock.joy</groupId>
       <artifactId>projects</artifactId>
-      <version>2.1.1</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.sun.mail</groupId>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>io.github.davidwhitlock.joy</groupId>
       <artifactId>projects</artifactId>
-      <version>2.1.1</version>
+      <version>3.0.0</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>

family/pom.xml

@@ -3,20 +3,20 @@
   <parent>
     <artifactId>joy</artifactId>
     <groupId>io.github.davidwhitlock.joy</groupId>
-    <version>1.1.1</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>family</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <name>Family Tree Application</name>
   <description>An Family Tree application for The Joy of Coding</description>
   <url>https://www.cs.pdx.edu/~whitlock</url>
   <dependencies>
     <dependency>
       <groupId>io.github.davidwhitlock.joy</groupId>
       <artifactId>projects</artifactId>
-      <version>2.1.1</version>
+      <version>3.0.0</version>
     </dependency>
   </dependencies>
   <build>

grader/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <artifactId>joy</artifactId>
     <groupId>io.github.davidwhitlock.joy</groupId>
-    <version>1.1.1</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grader</artifactId>
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>io.github.davidwhitlock.joy</groupId>
       <artifactId>projects</artifactId>
-      <version>2.1.1</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.opencsv</groupId>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.6</version>
+      <version>1.5.12</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>

grader/src/it/java/edu/pdx/cs/joy/grader/SubmitAndroidProjectIT.java

@@ -1,12 +1,24 @@
 package edu.pdx.cs.joy.grader;
 
+import edu.pdx.cs.joy.grader.gradebook.Assignment;
+import edu.pdx.cs.joy.grader.gradebook.Grade;
+import edu.pdx.cs.joy.grader.gradebook.GradeBook;
+import edu.pdx.cs.joy.grader.gradebook.Student;
+import jakarta.mail.MessagingException;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
-public class SubmitAndroidProjectIT extends  SubmitIT {
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
+
+public class SubmitAndroidProjectIT extends SubmitIT {
 
   @BeforeEach
   @Override
@@ -32,6 +44,8 @@ public void createFilesToSubmit() throws IOException {
       this.filesToSubmit.add(createEmptyFile(wrapperDir, fileName));
     }
 
+    File dotGradleDir = createDirectories(".gradle");
+    this.filesToSubmit.add(createEmptyFile(dotGradleDir, "config.properties"));
   }
 
   @Override
@@ -45,4 +59,37 @@ protected Submit getSubmitProgram() {
       return new SubmitAndroidProject(() -> submitTime);
     }
   }
+
+  @Test
+  void dotGradleFilesAreNotSubmitted() throws MessagingException, IOException {
+    submitter().submitFiles();
+
+    GradeBook gradeBook = new GradeBook("SubmitIT");
+    gradeBook.addStudent(new Student(studentLoginId));
+    gradeBook.addAssignment(new Assignment(projectName, 3.5));
+
+    GraderEmailAccount account = new GraderEmailAccount(emailServerHost, imapsPort, graderEmail, imapPassword, true, m -> { });
+    FetchAndProcessGraderEmail.fetchAndProcessGraderEmails("projects", account, this.tempDirectory, gradeBook);
+
+    Grade grade = gradeBook.getStudent(studentLoginId).get().getGrade(projectName);
+    assertThat(grade, is(notNullValue()));
+    assertThat(grade.getScore(), equalTo(Grade.NO_GRADE));
+    assertThat(grade.getSubmissionTimes().size(), equalTo(1));
+
+    File zipFile = findNewestZipFileInTempDirectory();
+    assertThat(zipFile, is(notNullValue()));
+    List<String> entryNames = getZipFileEntryNames(zipFile);
+    assertThat(entryNames, not(empty()));
+
+    assertThat(entryNames, not(hasItem(".gradle")));
+    assertThat(entryNames, not(hasItem(".gradle/config.properties")));
+  }
+
+  @Override
+  protected Collection<File> getExpectedFilesToSubmit() {
+    Collection<File> allFiles = super.getExpectedFilesToSubmit();
+    return allFiles.stream()
+      .filter(file -> !file.getPath().contains(".gradle"))
+      .toList();
+  }
 }

grader/src/it/java/edu/pdx/cs/joy/grader/SubmitIT.java

@@ -42,8 +42,8 @@ public class SubmitIT extends EmailSenderIntegrationTestCase {
   private final String studentName = studentFirstName + " " + studentLastName;
   protected final Collection<File> filesToSubmit = new ArrayList<>();
   protected final String studentLoginId = "student";
-  private final String projectName = "Project";
-  private final String graderEmail = TA_EMAIL.getAddress();
+  protected final String projectName = "Project";
+  protected final String graderEmail = TA_EMAIL.getAddress();
 
   @BeforeEach
   public void createFilesToSubmit() throws IOException {
@@ -145,13 +145,17 @@ private void assertZipFileContainsFilesInProjectDirectories() throws IOException
     List<String> entryNames = getZipFileEntryNames(zipFile);
     assertThat(entryNames, not(empty()));
 
-    filesToSubmit.forEach(file -> {
+    getExpectedFilesToSubmit().forEach(file -> {
       String filePath = file.getPath().substring(this.tempDirectory.getPath().length() + 1);
       assertThat(entryNames, hasItem(filePath));
     });
   }
 
-  private List<String> getZipFileEntryNames(File zipFile) throws IOException {
+  protected Collection<File> getExpectedFilesToSubmit() {
+    return filesToSubmit;
+  }
+
+  protected List<String> getZipFileEntryNames(File zipFile) throws IOException {
     List<String> entryNames = new ArrayList<>();
     FileInputStream stream = new FileInputStream(zipFile);
     try (
@@ -166,7 +170,7 @@ private List<String> getZipFileEntryNames(File zipFile) throws IOException {
     return entryNames;
   }
 
-  private File findNewestZipFileInTempDirectory() {
+  protected File findNewestZipFileInTempDirectory() {
     File[] zipFiles = this.tempDirectory.listFiles((dir, name) -> name.endsWith(".zip"));
     if (zipFiles == null) {
       return null;
@@ -201,7 +205,7 @@ public ProjectSubmitter setSendReceipt(boolean sendReceipt) {
       return this;
     }
 
-    private void submitFiles() throws IOException, MessagingException {
+    protected void submitFiles() throws IOException, MessagingException {
       Student student = new Student(studentLoginId);
       student.setEmail(studentEmail);
       student.setFirstName(studentFirstName);