Skip to content

Commit 014a203

Browse files
musicdb
Co-authored-by: Johan Jansson <Johan.Jansson@iths.se> Co-authored-by: Emma Travljanin <emma.travljanin@iths.se>
1 parent e478e3b commit 014a203

19 files changed

Lines changed: 886 additions & 745 deletions

.gitignore

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,56 @@
1+
# Maven
12
target/
2-
/.idea/
3-
src/main/resources/META-INF/persistence.xml
4-
*.db
5-
*.mv.db
6-
*.trace.db
3+
pom.xml.tag
4+
pom.xml.releaseBackup
5+
pom.xml.versionsBackup
6+
pom.xml.next
7+
release.properties
8+
dependency-reduced-pom.xml
9+
buildNumber.properties
10+
.mvn/timing.properties
11+
.mvn/wrapper/maven-wrapper.jar
12+
13+
# IntelliJ IDEA
714
.idea/
815
*.iml
916
*.iws
10-
target/
17+
*.ipr
18+
out/
19+
20+
# VS Code
21+
.vscode/
22+
23+
# OS
24+
.DS_Store
25+
Thumbs.db
26+
desktop.ini
27+
28+
# Logs
29+
*.log
30+
logs/
31+
32+
# Database files
33+
*.db
34+
*.mv.db
35+
*.trace.db
36+
37+
# Docker override
38+
docker-compose.override.yml
39+
40+
# Environment files
41+
.env
42+
.env.local
43+
.env.*.local
44+
45+
# Configuration files - VIKTIGAST!
46+
src/main/resources/META-INF/persistence.xml
47+
src/main/resources/application.properties
48+
src/main/resources/application.yml
49+
src/main/resources/application.yaml
50+
51+
# Temp files
52+
*.tmp
53+
*.temp
54+
*.bak
55+
*.swp
56+
*~

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ services:
1616
- mysql-data:/var/lib/mysql
1717
command:
1818
- --default-authentication-plugin=mysql_native_password
19+
- --character-set-server=utf8mb4
20+
- --collation-server=utf8mb4_unicode_ci
1921

2022
phpmyadmin:
2123
image: phpmyadmin/phpmyadmin

pom.xml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5+
http://maven.apache.org/xsd/maven-4.0.0.xsd">
56
<modelVersion>4.0.0</modelVersion>
6-
77
<groupId>org.example</groupId>
88
<artifactId>JavaJPA</artifactId>
99
<version>1.0-SNAPSHOT</version>
1010

1111
<properties>
12-
<maven.compiler.release>17</maven.compiler.release>
12+
<maven.compiler.source>17</maven.compiler.source>
13+
<maven.compiler.target>17</maven.compiler.target>
1314
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1415
<hibernate.version>5.6.15.Final</hibernate.version>
1516
<mysql.version>8.0.33</mysql.version>
@@ -21,24 +22,15 @@
2122
<artifactId>hibernate-core</artifactId>
2223
<version>${hibernate.version}</version>
2324
</dependency>
24-
2525
<dependency>
2626
<groupId>javax.persistence</groupId>
2727
<artifactId>javax.persistence-api</artifactId>
2828
<version>2.2</version>
2929
</dependency>
30-
3130
<dependency>
3231
<groupId>mysql</groupId>
3332
<artifactId>mysql-connector-java</artifactId>
3433
<version>${mysql.version}</version>
3534
</dependency>
36-
37-
<dependency>
38-
<groupId>org.junit.jupiter</groupId>
39-
<artifactId>junit-jupiter</artifactId>
40-
<version>5.10.0</version>
41-
<scope>test</scope>
42-
</dependency>
4335
</dependencies>
4436
</project>

src/main/java/org/example/App.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)