Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new course name #56

Merged
merged 2 commits into from
Apr 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[![Java CI with Maven](https://github.com/YourGitHubId/PortlandStateJavaWinter2024/actions/workflows/maven.yml/badge.svg)](https://github.com/YourGitHubId/PortlandStateJavaWinter2024/actions/workflows/maven.yml)
[![Java CI with Maven](https://github.com/YourGitHubId/JoyOfCodingWinter2024/actions/workflows/maven.yml/badge.svg)](https://github.com/YourGitHubId/JoyOfCodingWinter2024/actions/workflows/maven.yml)

# Getting Started with Contemporary Software Development
# Getting Started with The Joy of Coding with Java and Android

This repository helps students in [Contemporary Sotfware Development](http://web.cecs.pdx.edu/~whitlock/) get started with the
This repository helps students in [The Joy of Coding](http://web.cecs.pdx.edu/~whitlock/) get started with the
programming assignments. Most notably, it gives students experience working with Git repositories and removed
the need to install [Apache Maven](https://maven.apache.org/install.html)
on their local machines (or the PSU machines) in order to create and
Expand Down Expand Up @@ -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 "PortlandStateJavaWinter2024".)
repository is named "JoyOfCodingWinter2024".)

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
Expand Down Expand Up @@ -99,7 +99,7 @@ The following command lines assume that you are running in the
directory created by cloning the repository.

```sh
$ cd PortlandStateJavaWinter2024
$ cd JoyOfCodingWinter2024
```

### How do I use the Java Development Kit?
Expand Down Expand Up @@ -232,7 +232,7 @@ clone by adding the directory to git.

```sh
$ ./mvnw clean # Remove files that shouldn't be committed to version control
$ cd .. # to PortlandStateJavaWinter2024 directory
$ cd .. # to JoyOfCodingWinter2024 directory
$ git add student
$ git commit -m "Added source files for student project"
```
Expand Down Expand Up @@ -291,7 +291,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/PortlandStateJavaWinter2024.git
$ git clone https://github.com/YourGitHubId/JoyOfCodingWinter2024.git
```

### How can I get changes that other people make into my clone?
Expand All @@ -305,8 +305,8 @@ First, configure your repository to have this repository to be a
"remote" named "upstream".

```sh
$ cd PortlandStateJavaWinter2024
$ git remote add upstream https://github.com/DavidWhitlock/PortlandStateJavaGettingStarted.git
$ cd JoyOfCodingWinter2024
$ git remote add upstream https://github.com/JoyOfCodingPDX/GettingStarted.git
```

Then, you can "pull" and "merge" changes from the upstream repository
Expand Down Expand Up @@ -449,7 +449,7 @@ 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.cs410J.whitlock:apptbook:jar:1.0.0
[WARNING] 'parent.relativePath' of POM edu.pdx.cs410J.whitlock:apptbook:1.0.0 (PortlandStateJavaWinter2024/apptbook/pom.xml) points at edu.pdx.cs410J.whitlock:PortlandStateJavaWinter2024 instead of io.github.davidwhitlock.cs410J:cs410j, please verify your project structure @ line 3, column 11
[WARNING] 'parent.relativePath' of POM edu.pdx.cs410J.whitlock:apptbook:1.0.0 (JoyOfCodingWinter2024/apptbook/pom.xml) points at edu.pdx.cs410J.whitlock:JoyOfCodingWinter2024 instead of io.github.davidwhitlock.cs410J:cs410j, 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]
Expand Down Expand Up @@ -477,7 +477,7 @@ is my top-level POM) to something like:

```xml
<parent>
<artifactId>PortlandStateJava</artifactId>
<artifactId>JoyOfCoding</artifactId>
<groupId>edu.pdx.cs410J.your-mcecs-user-id</groupId>
<version>1.0.0</version>
</parent>
Expand Down Expand Up @@ -552,12 +552,12 @@ 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 `PortlandStateJavaWinter2024` project in
their parent project is the `JoyOfCodingWinter2024` project in
your group:

```xml
<parent>
<artifactId>PortlandStateJava</artifactId>
<artifactId>JoyOfCoding</artifactId>
<groupId>edu.pdx.cs410J.your-mcecs-user-id</groupId>
<version>1.0.0</version>
</parent>
Expand Down Expand Up @@ -595,12 +595,12 @@ 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/PortlandStateJavaWinter2024
https://yourgithubuser.github.io/JoyOfCodingWinter2024

## How can I improve this repository?

This repository is kind of thrown together, and it ought to evolve to
meet the needs of the students who take Contemporary Software Development.
meet the needs of the students who take The Joy of Coding.

Feel free to [create issues](../../issues) for this repository if you find
something missing or confusing.
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ accordingly
<version>2024.0.1</version>
</parent>
<groupId>edu.pdx.cs410J.YourUserId</groupId>
<artifactId>PortlandStateJava</artifactId>
<artifactId>JoyOfCoding</artifactId>
<version>1.0.0</version>

<packaging>pom</packaging>
<name>PSUJavaWinter2024</name>
<description>Source code written in the Winter 2024 offering of Contemporary Software Development</description>
<url>http://YourGitHubUserInLowerCase.github.io/PortlandStateJavaWinter2024</url>
<description>Source code written in the Summer 2024 offering of The Joy of Coding</description>
<url>http://YourGitHubUserInLowerCase.github.io/JoyOfCodingWinter2024</url>

<modules>
</modules>
Expand All @@ -33,7 +33,7 @@ accordingly
</organization>
<issueManagement>
<system>github</system>
<url>https://github.com/YourGitHubUser/PortlandStateJavaWinter2024/issues</url>
<url>https://github.com/YourGitHubUser/JoyOfCodingWinter2024/issues</url>
</issueManagement>
<licenses>
<license>
Expand Down Expand Up @@ -76,7 +76,7 @@ accordingly
<plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<topSiteURL>scm:git:git@github.com:YourGithubUser/PortlandStateJavaWinter2024.git</topSiteURL>
<topSiteURL>scm:git:git@github.com:YourGithubUser/JoyOfCodingWinter2024.git</topSiteURL>
</configuration>
</plugin>
<plugin>
Expand All @@ -92,7 +92,7 @@ accordingly
</build>

<scm>
<connection>scm:git:git@github.com:YourGithubUser/PortlandStateJavaWinter2024.git</connection>
<connection>scm:git:git@github.com:YourGithubUser/JoyOfCodingWinter2024.git</connection>
</scm>
<distributionManagement>
<snapshotRepository>
Expand All @@ -102,7 +102,7 @@ accordingly
<site>
<id>gh-pages</id>
<name>GitHub Pages</name>
<url>scm:git:git@github.com:YourGithubUser/PortlandStateJavaWinter2024.git</url>
<url>scm:git:git@github.com:YourGithubUser/JoyOfCodingWinter2024.git</url>
</site>
</distributionManagement>

Expand Down
2 changes: 1 addition & 1 deletion src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</googleSearch>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
<gitHub>
<projectId>YourGitHubUser/PortlandStateJavaWinter2024</projectId>
<projectId>YourGitHubUser/JoyOfCodingWinter2024</projectId>
<ribbonOrientation>right</ribbonOrientation>
<ribbonColor>black</ribbonColor>
</gitHub>
Expand Down
Loading