diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d58dfb7..0ea42ff 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 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 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/README.md b/README.md index 3fb50c9..ae7f259 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Java CI with Maven](https://github.com/YourGitHubId/JoyOfCodingSummer2025/actions/workflows/maven.yml/badge.svg)](https://github.com/YourGitHubId/JoyOfCodingSummer2025/actions/workflows/maven.yml) +[![Java CI with Maven](https://github.com/YourGitHubId/JoyOfCodingWinter2026/actions/workflows/maven.yml/badge.svg)](https://github.com/YourGitHubId/JoyOfCodingWinter2026/actions/workflows/maven.yml) # Getting Started with The Joy of Coding with Java and Android @@ -71,7 +71,7 @@ developer"](https://education.github.com/pack) account that gives you free private repositories. Then [create a private GitHub repository from this "template" repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template) for your source code for this course. (In this example, the -repository is named "JoyOfCodingSummer2025".) +repository is named "JoyOfCodingWinter2026".) Again, please ensure that all of your code for the assignments is in a **private** GitHub repository. GitHub makes it very easy for people to @@ -99,7 +99,7 @@ The following command lines assume that you are running in the directory created by cloning the repository. ```sh -$ cd JoyOfCodingSummer2025 +$ cd JoyOfCodingWinter2026 ``` ### How do I use the Java Development Kit? @@ -229,7 +229,7 @@ clone by adding the directory to git. ```sh $ ./mvnw clean # Remove files that shouldn't be committed to version control -$ cd .. # to JoyOfCodingSummer2025 directory +$ cd .. # to JoyOfCodingWinter2026 directory $ git add student $ git commit -m "Added source files for student project" ``` @@ -288,7 +288,7 @@ After `ssh`ing to one of the CS Department's Linux machines, you can make a clone of your GitHub repository using with: ``` -$ git clone https://github.com/YourGitHubId/JoyOfCodingSummer2025.git +$ git clone https://github.com/YourGitHubId/JoyOfCodingWinter2026.git ``` ### How can I get changes that other people make into my clone? @@ -302,7 +302,7 @@ First, configure your repository to have this repository to be a "remote" named "upstream". ```sh -$ cd JoyOfCodingSummer2025 +$ cd JoyOfCodingWinter2026 $ git remote add upstream https://github.com/JoyOfCodingPDX/GettingStarted.git ``` @@ -380,7 +380,7 @@ After your code has been successfully submitted, the `submit.sh` script will [tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) the current revision of your git repository. The name of the tag indicates which project was submitted and the date/time it was submitted. For example, submitting Project1 at 9 AM on May 1st -would tag the current revision of the repository with `submit-Project1-20250117T09:00:58`. +would tag the current revision of the repository with `submit-Project1-20260117T09:00:58`. This tag allows you to create a [branch](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging) from the specific revision of your code that was submitted, which makes debugging problems in submitted code much easier. Note that the `submit.sh` will issue an error if there are @@ -399,13 +399,13 @@ $ git push --tags Or push an individual tag: ```shell -$ git push origin submit-Project1-20250117T09:00:58 +$ git push origin submit-Project1-20260117T09:00:58 ``` To fix a bug in submitted code, create a new branch of your repository from the `submit` tag on your development system: ```shell $ git fetch # Fetch the tag(s) from GitHub ("origin") into your local clone -$ git checkout -b fix-Project1 submit-Project1-20250117T09:00:58 # Create a branch to make fixes +$ git checkout -b fix-Project1 submit-Project1-20260117T09:00:58 # Create a branch to make fixes $ git push --set-upstream origin fix-Project1 # Push the branch to GitHub # Make code changes, commit them to git, and push them to the fix-Project1 branch ``` @@ -431,13 +431,13 @@ The following is a summary of the data gathered to date. | | App Classes | Text File | Pretty Print | Koans | XML | REST | Android | |:-----------|------------:|----------:|-------------:|----------:|---------:|----------:|---------:| -| Count | 142 | 142 | 138 | 122 | 80 | 129 | 130 | -| Average | 21 hours | 20 hours | 23 hours | 19 hours | 24 hours | 30 hours | 26 hours | +| Count | 168 | 169 | 164 | 145 | 80 | 154 | 152 | +| Average | 21 hours | 20 hours | 22 hours | 19 hours | 24 hours | 30 hours | 26 hours | | Maximum | 60 hours | 120 hours | 76 hours | 100 hours | 60 hours | 129 hours | 90 hours | -| Top 25% | 25 hours | 25 hours | 30 hours | 23 hours | 30 hours | 40 hours | 30 hours | -| Median | 20 hours | 20 hours | 20 hours | 16 hours | 20 hours | 25 hours | 24 hours | +| Top 25% | 25 hours | 25 hours | 30 hours | 22 hours | 30 hours | 40 hours | 30 hours | +| Median | 20 hours | 20 hours | 20 hours | 15 hours | 20 hours | 25 hours | 24 hours | | Bottom 25% | 12 hours | 12 hours | 12 hours | 10 hours | 15 hours | 16 hours | 17 hours | -| Minimum | 3 hours | 0 hours | 2 hours | 4 hours | 6 hours | 7 hours | 5 hours | +| Minimum | 3 hours | 0 hours | 2 hours | 4 hours | 6 hours | 6 hours | 5 hours | You may want to consider it as you plan your projects. Recall, though, that this data is self-reported. Your experience might be different from that @@ -467,8 +467,8 @@ As you create Maven projects in this repository, you may encounter warnings like ``` [WARNING] -[WARNING] Some problems were encountered while building the effective model for edu.pdx.cs.joy.whitlock:apptbook:jar:1.0.0 -[WARNING] 'parent.relativePath' of POM edu.pdx.cs.joy.whitlock:apptbook:1.0.0 (JoyOfCodingSummer2025/apptbook/pom.xml) points at edu.pdx.cs.joy.whitlock:JoyOfCodingSummer2025 instead of io.github.davidwhitlock.joy:joy, please verify your project structure @ line 3, column 11 +[WARNING] Some problems were encountered while building the effective model for edu.pdx.cs.joy.whitlock:phonebill:jar:1.0.0 +[WARNING] 'parent.relativePath' of POM edu.pdx.cs.joy.whitlock:phonebill:1.0.0 (JoyOfCodingWinter2026/phonebill/pom.xml) points at edu.pdx.cs.joy.whitlock:JoyOfCodingWinter2026 instead of io.github.davidwhitlock.joy:joy, please verify your project structure @ line 3, column 11 [WARNING] [WARNING] It is highly recommended to fix these problems because they threaten the stability of your build. [WARNING] @@ -576,7 +576,7 @@ Running `mvn site` from the root directory of this repository will generate a website that provides lots of information (reports, etc.) about the Maven projects. Note that in order for your multi-project Maven site to generate correctly, the subprojects must specify that -their parent project is the `JoyOfCodingSummer2025` project in +their parent project is the `JoyOfCodingWinter2026` project in your group: ```xml @@ -619,7 +619,7 @@ You can open `target/staging/index.html` in your web browse to see what your site will look like. Verify that your website is available at a URL like: -https://yourgithubuser.github.io/JoyOfCodingSummer2025 +https://yourgithubuser.github.io/JoyOfCodingWinter2026 ## How can I improve this repository? diff --git a/createFirstProject.sh b/createFirstProject.sh index b2cfa24..56dc02b 100755 --- a/createFirstProject.sh +++ b/createFirstProject.sh @@ -13,4 +13,4 @@ else fi fi -createProjectFromArchetype ${loginId} "apptbook" "2.2.2" +createProjectFromArchetype ${loginId} "phonebill" "2.3.0" diff --git a/createKataProject.sh b/createKataProject.sh index c7cbc13..f8cd4d8 100755 --- a/createKataProject.sh +++ b/createKataProject.sh @@ -15,4 +15,4 @@ fi projectName=$1 teamName=$2 -createProjectFromArchetype ${teamName} "kata" "2.2.2" ${projectName} +createProjectFromArchetype ${teamName} "kata" "2.2.5" ${projectName} diff --git a/createKoansProject.sh b/createKoansProject.sh index 55f2d9f..133d42e 100755 --- a/createKoansProject.sh +++ b/createKoansProject.sh @@ -13,4 +13,4 @@ else fi fi -createProjectFromArchetype ${loginId} "java-koans" "2.2.3" "koans" +createProjectFromArchetype ${loginId} "java-koans" "2.2.5" "koans" diff --git a/createRESTProject.sh b/createRESTProject.sh index 8d4921f..507912e 100755 --- a/createRESTProject.sh +++ b/createRESTProject.sh @@ -13,4 +13,4 @@ else fi fi -createProjectFromArchetype ${loginId} "apptbook-web" "3.0.2" +createProjectFromArchetype ${loginId} "phonebill-web" "3.0.4" diff --git a/createStudentProject.sh b/createStudentProject.sh index aa94164..239c857 100755 --- a/createStudentProject.sh +++ b/createStudentProject.sh @@ -13,5 +13,5 @@ else fi fi -createProjectFromArchetype ${loginId} "student" "2.3.3" +createProjectFromArchetype ${loginId} "student" "2.3.5" diff --git a/pom.xml b/pom.xml index a0a2632..1ff42ac 100644 --- a/pom.xml +++ b/pom.xml @@ -12,28 +12,28 @@ accordingly joy io.github.davidwhitlock.joy - 1.2.2 + 1.2.4 edu.pdx.cs.joy.YourUserId JoyOfCoding 1.0.0 pom - JoyOfCodingSummer2025 - Source code written in the Summer 2025 offering of The Joy of Coding - http://YourGitHubUserInLowerCase.github.io/JoyOfCodingSummer2025 + JoyOfCodingWinter2026 + Source code written in the Winter 2026 offering of The Joy of Coding + http://YourGitHubUserInLowerCase.github.io/JoyOfCodingWinter2026 - 2025 + 2026 Portland State University http://www.pdx.edu github - https://github.com/YourGitHubUser/JoyOfCodingSummer2025/issues + https://github.com/YourGitHubUser/JoyOfCodingWinter2026/issues @@ -76,7 +76,7 @@ accordingly maven-site-plugin - scm:git:git@github.com:YourGithubUser/JoyOfCodingSummer2025.git + scm:git:git@github.com:YourGithubUser/JoyOfCodingWinter2026.git @@ -92,7 +92,7 @@ accordingly - scm:git:git@github.com:YourGithubUser/JoyOfCodingSummer2025.git + scm:git:git@github.com:YourGithubUser/JoyOfCodingWinter2026.git @@ -102,7 +102,7 @@ accordingly gh-pages GitHub Pages - scm:git:git@github.com:YourGithubUser/JoyOfCodingSummer2025.git + scm:git:git@github.com:YourGithubUser/JoyOfCodingWinter2026.git diff --git a/src/site/site.xml b/src/site/site.xml index 4ff9e58..5735740 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -17,7 +17,7 @@ true - YourGitHubUser/JoyOfCodingSummer2025 + YourGitHubUser/JoyOfCodingWinter2026 right black diff --git a/submit.sh b/submit.sh index ccbd668..17bed4a 100755 --- a/submit.sh +++ b/submit.sh @@ -29,16 +29,16 @@ elif [[ "$project" == "koans" ]]; then directory="koans" mavenGoals="clean exec:java" -elif [[ "$project" == "Project4" ]]; then - directory="apptbook-web" - elif [[ "$project" == "Project5" ]]; then - directory="apptbook-android" + directory="phonebill-web" + +elif [[ "$project" == "Project6" ]]; then + directory="phonebill-android" submitClass="SubmitAndroidProject" srcDirectory="." else - directory="apptbook" + directory="phonebill" fi if [ $# -gt 1 ]; then