Commit 97a65114 authored by Riegel's avatar Riegel
Browse files

Merge branch 'dev' into 'master'

Version 3.15.0

See merge request !8
parents 99c8f6a8 5950ea5f
Pipeline #10106 passed with stage
in 3 minutes and 15 seconds
/CityDoctorParent/.idea/.gitignore
/CityDoctorParent/.idea/compiler.xml
/CityDoctorParent/.idea/encodings.xml
/CityDoctorParent/.idea/jarRepositories.xml
/CityDoctorParent/.idea/misc.xml
/CityDoctorParent/.idea/vcs.xml
......@@ -4,7 +4,7 @@ image: maven:3.8.6-eclipse-temurin-17
build:
script:
- cd CityDoctorParent
- mvn verify
- mvn verify -U
artifacts:
when: always
reports:
......
# Title: Summary, imperative, start upper case, don't end with a period
# No more than 50 chars. #### 50 chars is here: #
# Remember blank line between title and body.
# Body: Explain *what* and *why* (not *how*). Include task ID (Jira issue).
# Wrap at 72 chars. ################################## which is here: #
# At the end: Include Co-authored-by for all contributors.
# Include at least one empty line before it. Format:
# Co-authored-by: name <user@users.noreply.github.com>
#
# How to Write a Git Commit Message:
# https://chris.beams.io/posts/git-commit/
#
# 1. Separate subject from body with a blank line
# 2. Limit the subject line to 50 characters
# 3. Capitalize the subject line
# 4. Do not end the subject line with a period
# 5. Use the imperative mood in the subject line
# 6. Wrap the body at 72 characters
# 7. Use the body to explain what and why vs. how
\ No newline at end of file
## Classification Score
Disclosed vulnerabilities are evaluated by using the [Common Vulnerability Scoring System](https://www.first.org/cvss/v4.0/user-guide).
The calculator can be found [here](https://www.first.org/cvss/calculator/4.0).
## Vulnerability Severities
**Critical:** ~"Vulnerability::Critical" Vulnerabilities with a Score >= 9, or vulnerabilities which enable remote code execution.
**High:** ~"Vulnerability::High" Vulnerabilities with a Score >= 5.
**Minor:** ~"Vulnerability::Minor" Vulnerabilities with a Score < 5, or which require physical access to the system.
\ No newline at end of file
---
# Settings for generating changelogs using the GitLab API. See
# https://docs.gitlab.com/ee/api/repositories.html#generate-changelog-data for
# more information.
categories:
added: Added
fixed: Fixed
changed: Changed
deprecated: Deprecated
removed: Removed
security: Security
performance: Performance
other: Other
template: |
{% if categories %}
{% each categories %}
### {{ title }} ({% if single_change %}1 change{% else %}{{ count }} changes{% end %})
{% each entries %}
- [{{ title }}]({{ commit.web_url }})\
{% if author.credit %} by {{ author.reference }}{% end %}\
{% if commit.trailers.MR %}\
([merge request]({{ commit.trailers.MR }}))\
{% else %}\
{% if merge_request %}\
([merge request]({{ merge_request.web_url }}))\
{% end %}\
{% end %}\
{% if commit.trailers.EE %}\
**GitLab Enterprise Edition**\
{% end %}
{% end %}
{% end %}
{% else %}
No changes.
{% end %}
## Summary
<!--Summarize the bug encountered concisely -->
## Steps to reproduce
<!--How one can reproduce the issue - this is very important-->
## What is the current bug behavior?
<!--What actually happens-->
## What is the expected correct behavior?
<!--What you should see instead-->
## Relevant logs and/or screenshots
<!--Paste any relevant logs - use code blocks (```) to format console output, logs, and code, as
it's very hard to read otherwise.-->
## Possible cause
<!--If you can, link to the line of code that might be responsible for the problem-->
/label Bug
\ No newline at end of file
## Short description
<!--Short description of what needs to be documented -->
## Content
<!--Clarify what should be contained in the documentation-->
## Location
<!--How should the documentation be made accessible-->
/label Type::Documentation
\ No newline at end of file
## Summary
<!--Give a short summary of the requested feature-->
## What is the function?
<!--Give a detailed description of how the feature should work and the required steps and actors-->
## Why is it requested?
<!--Explain why and how the described feature would be useful-->
/label Type::Feature Request
\ No newline at end of file
## Description
<!--Give the User Story -->
**As a:** <!--Role-->
**I want:** <!--Functionality X-->
**So that:** <!--Goal Y can be realized-->
## Acceptance Criteria
<!--Detail the scenarios needed to fulfill the User Story-->
**Scenario X: Title of scenario**
---
**Given** <!--An action is done-->
**When** <!--Some conditions apply-->
**Then** <!--Detailed description of expected behavior.-->
/label Type::Feature Request
\ No newline at end of file
## Summary
<!--Summarize the vulnerability -->
## Steps to reproduce
<!--How one can reproduce the issue - this is very important-->
## What is the current bug behavior?
<!--What actually happens-->
## What is the expected correct behavior?
<!--What you should see instead-->
## Relevant logs and/or screenshots
<!--Paste any relevant logs - use code blocks (```) to format console output, logs, and code, as
it's very hard to read otherwise.-->
## Possible cause
<!--If you can, link to the line of code that might be responsible for the problem-->
/label Type::Bug Vulnerability::Unclassified
/confidential
\ No newline at end of file
<!-- After merging changes to this template, update the `Default description template for merge requests` -->
<!-- found under Settings - General Merge Requests -->
## What does this MR do?
<!-- Briefly describe what this MR is about. -->
## Related issues
<!-- Link related issues below. Insert the issue link or reference.-->
## Checklist
- [ ] Commits squashed, following the message-template and containing changelog-trailers
- [ ] MR title and description are up to date, accurate, and descriptive.
- [ ] MR targeting the appropriate branch.
- [ ] Latest Merge Result pipeline is green.
# Changelog
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [3.15.0] (2024-09-03)
### Added (7 changes)
- Add CityDoctorAutoPro extension.
- Add CityDoctorGUI extension.
- Add CityDoctorHealer extension.
- Add CityDoctorHealerGUI extension.
- Add CityDoctorHealerGenetic extension.
- Add CityDoctorWebService extension.
- Add Documentation for extension modules.
### Fixed (1 change)
- Fix false positives for Solid self-intersections.
### Changed (1 change)
- Update Maven dependencies: Include JavaFX
### Security (1 change)
- Upgrade SnakeYAML to version 2.0
## [3.14.0] (2024-03-20)
Official Release of CityDoctor2
......@@ -304,3 +304,8 @@ gradle-app.setting
*.hprof
# End of https://www.toptal.com/developers/gitignore/api/gradle
/CityDoctorWebService/CityDoctorWebService.iml
/Extensions/CityDoctorWebService/CityDoctorWebService.iml
/.idea/codeStyles/codeStyleConfig.xml
/GUISettings.properties
/.idea/inspectionProfiles/Project_Default.xml
<?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorParent</artifactId>
<version>3.14.1</version>
<version>3.15.0</version>
</parent>
<artifactId>CityDoctorCheckResult</artifactId>
<dependencies>
......
......@@ -18,8 +18,11 @@
*/
package de.hft.stuttgart.citydoctor2.checkresult.utility;
import java.io.Serial;
public class CheckReportParseException extends Exception {
@Serial
private static final long serialVersionUID = 6043371305010386110L;
public CheckReportParseException() {
......
......@@ -18,8 +18,11 @@
*/
package de.hft.stuttgart.citydoctor2.checkresult.utility;
import java.io.Serial;
public class CheckReportWriteException extends Exception {
@Serial
private static final long serialVersionUID = 1769358555887675233L;
public CheckReportWriteException() {
......
......@@ -34,7 +34,7 @@ public class IndentationXmlStreamWriter implements XMLStreamWriter {
private static final String INDENTATION = " ";
private XMLStreamWriter writer;
private final XMLStreamWriter writer;
private int depth = -1;
boolean sameElement = true;
......
<?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorParent</artifactId>
<version>3.14.1</version>
<version>3.15.0</version>
</parent>
<artifactId>CityDoctorEdge</artifactId>
<dependencies>
......
......@@ -18,6 +18,7 @@
*/
package de.hft.stuttgart.citydoctor2.edge;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
......@@ -25,8 +26,8 @@ import java.util.Set;
public class BaseEntity {
private List<BaseEntity> parents = new ArrayList<>(2);
private List<BaseEntity> children = new ArrayList<>(2);
private final List<BaseEntity> parents = new ArrayList<>(2);
private final List<BaseEntity> children = new ArrayList<>(2);
public void addChild(BaseEntity e) {
children.add(e);
......
......@@ -20,8 +20,8 @@ package de.hft.stuttgart.citydoctor2.edge;
public class Box2d {
private Point2d mMin;
private Point2d mMax;
private final Point2d mMin;
private final Point2d mMax;
public Box2d(Point2d min, Point2d max) {
mMin = min;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment