Skip to content

Commit 1f2d2c3

Browse files
Merge pull request #4 from dynamiatools/5.2.x
upgrade to DynamiaTools v5.2.0
2 parents 2d7f772 + 1ab3126 commit 1f2d2c3

File tree

7 files changed

+21
-60
lines changed

7 files changed

+21
-60
lines changed

pom.xml

Lines changed: 7 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>dynamia-tools-demos</groupId>
2424
<artifactId>my-book-store</artifactId>
25-
<version>3.1.0</version>
25+
<version>3.2.0</version>
2626
<packaging>jar</packaging>
2727

2828
<name>MyBookStore</name>
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-parent</artifactId>
35-
<version>3.2.5</version>
35+
<version>3.3.3</version>
3636
<relativePath/> <!-- lookup parent from repository -->
3737
</parent>
3838

@@ -47,82 +47,38 @@
4747
<timestamp>${maven.build.timestamp}</timestamp>
4848
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
4949

50-
<tools.version>5.1.1</tools.version>
50+
<tools.version>5.2.0</tools.version>
51+
<security.version>1.0.1</security.version>
5152
</properties>
5253

5354
<dependencies>
5455
<!-- DynamiaTools Dependencies -->
5556
<dependency>
5657
<groupId>tools.dynamia</groupId>
57-
<artifactId>tools.dynamia.app</artifactId>
58+
<artifactId>dynamia-tools-starter</artifactId>
5859
<version>${tools.version}</version>
5960
</dependency>
60-
<dependency>
61-
<groupId>tools.dynamia</groupId>
62-
<artifactId>tools.dynamia.domain.jpa</artifactId>
63-
<version>${tools.version}</version>
64-
</dependency>
65-
66-
<dependency>
67-
<groupId>tools.dynamia</groupId>
68-
<artifactId>tools.dynamia.zk</artifactId>
69-
<version>${tools.version}</version>
70-
</dependency>
71-
7261
<dependency>
7362
<groupId>tools.dynamia.themes</groupId>
7463
<artifactId>tools.dynamia.themes.dynamical</artifactId>
75-
<version>${tools.version}</version>
64+
<version>5.2.0</version>
7665
</dependency>
7766

78-
<dependency>
79-
<groupId>tools.dynamia.modules</groupId>
80-
<artifactId>tools.dynamia.modules.security.ui</artifactId>
81-
<version>1.0.0</version>
82-
</dependency>
67+
8368
<!-- Spring Boot -->
84-
<dependency>
85-
<groupId>org.springframework.boot</groupId>
86-
<artifactId>spring-boot-starter-data-jpa</artifactId>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.springframework.boot</groupId>
90-
<artifactId>spring-boot-starter-data-rest</artifactId>
91-
</dependency>
92-
<dependency>
93-
<groupId>org.springframework.boot</groupId>
94-
<artifactId>spring-boot-starter-web</artifactId>
95-
</dependency>
96-
<dependency>
97-
<groupId>org.springframework.boot</groupId>
98-
<artifactId>spring-boot-starter-actuator</artifactId>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.hibernate.validator</groupId>
102-
<artifactId>hibernate-validator</artifactId>
103-
</dependency>
10469

10570
<dependency>
10671
<groupId>org.hsqldb</groupId>
10772
<artifactId>hsqldb</artifactId>
10873
<scope>runtime</scope>
10974
</dependency>
11075

111-
<dependency>
112-
<groupId>org.mariadb.jdbc</groupId>
113-
<artifactId>mariadb-java-client</artifactId>
114-
</dependency>
115-
11676
<dependency>
11777
<groupId>org.springframework.boot</groupId>
11878
<artifactId>spring-boot-starter-test</artifactId>
11979
<scope>test</scope>
12080
</dependency>
12181

122-
<dependency>
123-
<groupId>com.fasterxml.jackson.dataformat</groupId>
124-
<artifactId>jackson-dataformat-xml</artifactId>
125-
</dependency>
12682

12783
<dependency>
12884
<groupId>org.ehcache</groupId>

src/main/java/mybookstore/InstallCustomSkinCLR.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package mybookstore;
22

3-
import org.springframework.beans.factory.annotation.Autowired;
43
import org.springframework.boot.CommandLineRunner;
5-
import tools.dynamia.templates.ApplicationTemplateSkin;
64
import tools.dynamia.integration.sterotypes.Provider;
5+
import tools.dynamia.templates.ApplicationTemplateSkin;
76
import tools.dynamia.themes.dynamical.DynamicalTemplate;
87

98
@Provider
109
public class InstallCustomSkinCLR implements CommandLineRunner {
1110

12-
@Autowired
13-
private DynamicalTemplate template;
11+
12+
private final DynamicalTemplate template;
13+
14+
public InstallCustomSkinCLR(DynamicalTemplate template) {
15+
this.template = template;
16+
}
1417

1518
@Override
1619
public void run(String... args) throws Exception {

src/main/java/mybookstore/MyBookStoreApplication.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
import tools.dynamia.app.Ehcache3CacheManager;
2828
import tools.dynamia.domain.DefaultEntityReferenceRepository;
2929
import tools.dynamia.domain.EntityReferenceRepository;
30-
import tools.dynamia.app.EnableDynamiaTools;
3130

3231
@SpringBootApplication
33-
@EnableDynamiaTools
3432
@EntityScan({"mybookstore", "tools.dynamia"})
3533
@EnableCaching
3634
public class MyBookStoreApplication { //<1>

src/main/java/mybookstore/domain/Book.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class Book extends SimpleEntity {
3636
private String title;
3737
@Column(length = 1000)
3838
private String sinopsys;
39+
@Column(name = "publication_year")
3940
private int year;
4041
private String isbn;
4142
@ManyToOne

src/main/java/mybookstore/domain/BookReview.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package mybookstore.domain;
22

3-
import jakarta.persistence.Entity;
4-
import jakarta.persistence.FetchType;
5-
import jakarta.persistence.ManyToOne;
3+
import jakarta.persistence.*;
64
import tools.dynamia.domain.jpa.BaseEntity;
75

86

97
@Entity
8+
@Table(name = "reviews")
109
public class BookReview extends BaseEntity {
1110

1211
@ManyToOne(fetch = FetchType.LAZY)
1312
private Book book;
13+
@Column(name = "user_name")
1414
private String user;
1515
private String comment;
1616
private int stars;

src/main/java/mybookstore/domain/CategoryTag.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
import jakarta.persistence.Entity;
44
import jakarta.persistence.FetchType;
55
import jakarta.persistence.ManyToOne;
6+
import jakarta.persistence.Table;
67
import tools.dynamia.domain.Descriptor;
78
import tools.dynamia.domain.contraints.NotEmpty;
89
import tools.dynamia.domain.jpa.SimpleEntity;
910

1011
@Entity
12+
@Table(name = "tags")
1113
@Descriptor(fields = "tag")
1214
public class CategoryTag extends SimpleEntity {
1315

src/main/resources/application.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ spring:
1212
logging:
1313
level:
1414
root: info
15+
org.springframework.security: DEBUG
1516

1617

1718
management:

0 commit comments

Comments
 (0)