Merge branch 'cleanUpRepository'
# Conflicts: # src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock # src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties Conflicts resolved using 'Theirs'
Sem van der Hoeven
@@ -1,37 +0,0 @@
|
||||
# This file is a template, and might need editing before it works on your project.
|
||||
# This is the Gradle build system for JVM applications
|
||||
# https://gradle.org/
|
||||
# https://github.com/gradle/gradle
|
||||
image: gradle:alpine
|
||||
|
||||
# Disable the Gradle daemon for Continuous Integration servers as correctness
|
||||
# is usually a priority over speed in CI environments. Using a fresh
|
||||
# runtime for each build is more reliable since the runtime is completely
|
||||
# isolated from any previous builds.
|
||||
variables:
|
||||
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
|
||||
|
||||
before_script:
|
||||
- export GRADLE_USER_HOME=`pwd`/.gradle
|
||||
|
||||
build:
|
||||
stage: build
|
||||
script: gradle --build-cache assemble
|
||||
cache:
|
||||
key: "$CI_COMMIT_REF_NAME"
|
||||
policy: push
|
||||
paths:
|
||||
- build
|
||||
- .gradle
|
||||
|
||||
|
||||
test:
|
||||
stage: test
|
||||
script: gradle check
|
||||
cache:
|
||||
key: "$CI_COMMIT_REF_NAME"
|
||||
policy: pull
|
||||
paths:
|
||||
- build
|
||||
- .gradle
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
#Wed Mar 06 09:20:30 CET 2019
|
||||
gradle.version=5.2.1
|
||||
@@ -1,51 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration>
|
||||
<fileset id="fileset" name="Spring Application Context" removed="false">
|
||||
<file>file://$MODULE_DIR$/src/Server/src/main/java/hello/Application.java</file>
|
||||
<file>file://$MODULE_DIR$/src/Client/src/main/java/hello/Application.java</file>
|
||||
</fileset>
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/Client/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/Server/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/Client/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/Server/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: junit:junit:4.13-beta-2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.5.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.5.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.9.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.9.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.9.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.9.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.9.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.9.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.9.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.testng:testng:7.0.0-beta3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
56
README.md
@@ -1,20 +1,4 @@
|
||||
# CSE1105 Template Repository
|
||||
|
||||
This a template repository to help you get started on making the best project possible!
|
||||
|
||||
You can download the latest version [here](https://github.com/SERG-Delft/TI1216/releases)
|
||||
|
||||
http://stackoverflow.com/a/6466993
|
||||
|
||||
## How to import into your IDE
|
||||
|
||||
Eclipse:
|
||||
[http://javapapers.com/java/import-maven-project-into-eclipse/](http://javapapers.com/java/import-maven-project-into-eclipse/)
|
||||
|
||||
Intellij:
|
||||
[https://www.jetbrains.com/help/idea/2016.2/importing-project-from-maven-model.html](https://www.jetbrains.com/help/idea/2016.2/importing-project-from-maven-model.html)
|
||||
|
||||
## Getting your weekly reports
|
||||
## Getting your weekly reports
|
||||
|
||||
**Jacoco**:
|
||||
Run `maven install` ([Intellij](https://www.jetbrains.com/help/idea/2016.3/getting-started-with-maven.html#execute_maven_goal)/[Eclipse](http://imgur.com/a/6q7pV))
|
||||
@@ -158,41 +142,3 @@ By working on the project with the chosen programs, I’ll get more experienced
|
||||
|
||||
### W - Will
|
||||
I will reach my goal by working actively together with my teammates using lots of the useful programs given.
|
||||
|
||||
|
||||
# Kristin Peneva (4926587, kpeneva)
|
||||
|
||||
|
||||
## Personal Development Plan
|
||||
|
||||
|
||||
Strong points:
|
||||
1. I believe I am a good leader.
|
||||
2. I am ambitious and hardworking.
|
||||
|
||||
|
||||
Weaker points:
|
||||
1. I prefer to work alone, but If I am working in a team, usually I tend to be bossy
|
||||
2. I easily get lost into details and want to do extra unnecessry things, which results in slowing down my work.
|
||||
|
||||
|
||||
### G - Goal
|
||||
During this course I would like to further develop my teamwork and my time management skills. I would also
|
||||
would like to improve my programming skills and to learn new things. Learning how to communicate and colaborate
|
||||
with other people will be essential for my future career. Furthermore, computer science is one of the most fast-paced areas
|
||||
at the moment,so having strong programming skills will be necessary for successing in the future.
|
||||
|
||||
### R - Reality (Your current situation)
|
||||
with this project I will understand and experience first hand how working on a big programming project is and how to divide
|
||||
all the work but at the same time work efficiently as a team.
|
||||
|
||||
### O - Options
|
||||
|
||||
As a beginer at programming, doing the necessary amount of work will help me keep up with my fellow teammates so we could
|
||||
deliver on time our project.
|
||||
|
||||
### W - Will (Motivation, plan of action)
|
||||
|
||||
I am going to work hard,really hard to achieve my goal and also to make the project successful.During the whole process of
|
||||
creating this project I will stick to the deadlines and do the required workload. I belive by doing so, I will be able to achieve
|
||||
my goal. If however I stumble upon a problem, I will try and ask for help from my fellow teammates.
|
||||
|
||||
|
Before Width: | Height: | Size: 91 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 91 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 91 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 709 B After Width: | Height: | Size: 709 B |
|
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 586 B |
|
Before Width: | Height: | Size: 67 B After Width: | Height: | Size: 67 B |
|
Before Width: | Height: | Size: 91 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 351 B |
|
Before Width: | Height: | Size: 193 B After Width: | Height: | Size: 193 B |
|
Before Width: | Height: | Size: 227 B After Width: | Height: | Size: 227 B |
|
Before Width: | Height: | Size: 91 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 363 B |
|
Before Width: | Height: | Size: 213 B After Width: | Height: | Size: 213 B |
|
Before Width: | Height: | Size: 58 B After Width: | Height: | Size: 58 B |
|
Before Width: | Height: | Size: 354 B After Width: | Height: | Size: 354 B |
|
Before Width: | Height: | Size: 67 B After Width: | Height: | Size: 67 B |
|
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 247 KiB |
|
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 247 KiB |