Skip to content

Commit cb3a82b

Browse files
marioserrano09marioserrano09
authored
Merge pull request #7 from dynamiatools/7.x
7.x
2 parents 1bd1915 + e5a40c0 commit cb3a82b

File tree

6 files changed

+43
-41
lines changed

6 files changed

+43
-41
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ metadata are store in the database in table `mod_entity_files` using JPA entity
2323
<dependency>
2424
<groupId>tools.dynamia.modules</groupId>
2525
<artifactId>tools.dynamia.modules.entityfiles</artifactId>
26-
<version>7.0.2</version>
26+
<version>7.1.0</version>
2727
</dependency>
2828

2929
<dependency>
3030
<groupId>tools.dynamia.modules</groupId>
3131
<artifactId>tools.dynamia.modules.entityfiles.ui</artifactId>
32-
<version>7.0.2</version>
32+
<version>7.1.0</version>
3333
</dependency>
3434
</dependencies>
3535
```
@@ -39,16 +39,16 @@ metadata are store in the database in table `mod_entity_files` using JPA entity
3939
<dependency>
4040
<groupId>tools.dynamia.modules</groupId>
4141
<artifactId>tools.dynamia.modules.entityfiles.s3</artifactId>
42-
<version>7.0.2</version>
42+
<version>7.1.0</version>
4343
</dependency>
4444
```
4545

4646
### Gradle
4747

4848
```groovy
49-
compile 'tools.dynamia.modules:tools.dynamia.modules.entityfiles:7.0.2'
50-
compile 'tools.dynamia.modules:tools.dynamia.modules.entityfiles.ui:7.0.2'
51-
compile 'tools.dynamia.modules:tools.dynamia.modules.entityfiles.s3:7.0.2'
49+
compile 'tools.dynamia.modules:tools.dynamia.modules.entityfiles:7.1.0'
50+
compile 'tools.dynamia.modules:tools.dynamia.modules.entityfiles.ui:7.1.0'
51+
compile 'tools.dynamia.modules:tools.dynamia.modules.entityfiles.s3:7.1.0'
5252
```
5353

5454
## Usage

‎sources/core/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<artifactId>tools.dynamia.modules.entityfiles.parent</artifactId>
2424
<groupId>tools.dynamia.modules</groupId>
25-
<version>7.0.2</version>
25+
<version>7.1.2</version>
2626
</parent>
2727
<name>Dynamia Modules - EntityFiles - Core</name>
2828
<artifactId>tools.dynamia.modules.entityfiles</artifactId>
29-
<version>7.0.2</version>
29+
<version>7.1.2</version>
3030
<url>https://www.dynamia.tools/modules/entityfiles</url>
3131

3232
<build>
@@ -38,7 +38,8 @@
3838
<configuration>
3939
<source>${java.version}</source>
4040
<target>${java.version}</target>
41-
<encoding>${source.encoding}</encoding>
41+
<encoding>${source.encoding}</encoding>
42+
<parameters>true</parameters>
4243
</configuration>
4344
</plugin>
4445
</plugins>

‎sources/pom.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<groupId>tools.dynamia.modules</groupId>
2323
<artifactId>tools.dynamia.modules.entityfiles.parent</artifactId>
2424
<packaging>pom</packaging>
25-
<version>7.0.2</version>
25+
<version>7.1.2</version>
2626
<name>Dynamia Modules - EntityFiles</name>
2727
<url>https://dynamia.tools/modules/entityfiles</url>
2828
<description>DynamiaTools extension to attach files to entities</description>
@@ -63,11 +63,11 @@
6363

6464
<properties>
6565
<file.encoding>UTF-8</file.encoding>
66-
<dynamiatools.version>5.0.8</dynamiatools.version>
67-
<springboot.version>3.0.12</springboot.version>
68-
<aws.version>1.12.657</aws.version>
66+
<dynamiatools.version>5.2.0</dynamiatools.version>
67+
<springboot.version>3.3.3</springboot.version>
68+
<aws.version>1.12.771</aws.version>
6969
<java.version>17</java.version>
70-
<maven.compiler>3.11.0</maven.compiler>
70+
<maven.compiler>3.13.0</maven.compiler>
7171
<source.encoding>UTF-8</source.encoding>
7272
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7373
</properties>
@@ -81,7 +81,8 @@
8181
<configuration>
8282
<source>${java.version}</source>
8383
<target>${java.version}</target>
84-
<encoding>${source.encoding}</encoding>
84+
<encoding>${source.encoding}</encoding>
85+
<parameters>true</parameters>
8586
</configuration>
8687
</plugin>
8788
<plugin>
@@ -121,7 +122,7 @@
121122
<dependency>
122123
<groupId>commons-io</groupId>
123124
<artifactId>commons-io</artifactId>
124-
<version>2.15.0</version>
125+
<version>2.15.1</version>
125126
</dependency>
126127

127128
<dependency>

‎sources/s3/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>tools.dynamia.modules</groupId>
2525
<artifactId>tools.dynamia.modules.entityfiles.parent</artifactId>
26-
<version>7.0.2</version>
26+
<version>7.1.2</version>
2727
</parent>
2828

2929
<name>Dynamia Modules - EntityFiles - S3</name>
3030
<artifactId>tools.dynamia.modules.entityfiles.s3</artifactId>
31-
<version>7.0.2</version>
31+
<version>7.1.2</version>
3232
<url>https://www.dynamia.tools/modules/entityfiles</url>
3333

3434
<build>

‎sources/ui/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<artifactId>tools.dynamia.modules.entityfiles.parent</artifactId>
2424
<groupId>tools.dynamia.modules</groupId>
25-
<version>7.0.2</version>
25+
<version>7.1.2</version>
2626
</parent>
2727
<name>Dynamia Modules - EntityFiles UI</name>
2828
<artifactId>tools.dynamia.modules.entityfiles.ui</artifactId>
29-
<version>7.0.2</version>
29+
<version>7.1.2</version>
3030
<url>https://www.dynamia.tools/modules/entityfiles</url>
3131

3232
<build>

‎sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/EntityFileActionEvent.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,39 @@
1717

1818
package tools.dynamia.modules.entityfile.ui.actions;
1919

20-
import java.util.Map;
21-
2220
import tools.dynamia.crud.CrudActionEvent;
2321
import tools.dynamia.crud.CrudControllerAPI;
24-
import tools.dynamia.crud.GenericCrudView;
22+
import tools.dynamia.crud.CrudViewComponent;
2523
import tools.dynamia.modules.entityfile.domain.EntityFile;
2624

25+
import java.util.Map;
26+
2727
public class EntityFileActionEvent extends CrudActionEvent {
2828

29-
/**
29+
/**
3030
*
3131
*/
32-
private static final long serialVersionUID = 1L;
32+
private static final long serialVersionUID = 1L;
3333

34-
private Object targetEntity;
34+
private Object targetEntity;
3535

36-
public EntityFileActionEvent(Object targetEntity, Object data, Object source, GenericCrudView view, CrudControllerAPI controller) {
37-
super(data, source, view, controller);
38-
this.targetEntity = targetEntity;
39-
}
36+
public EntityFileActionEvent(Object targetEntity, Object data, Object source, CrudViewComponent view, CrudControllerAPI controller) {
37+
super(data, source, view, controller);
38+
this.targetEntity = targetEntity;
39+
}
4040

41-
public EntityFileActionEvent(Object targetEntity, Object data, Object source, Map<String, Object> params, GenericCrudView view,
42-
CrudControllerAPI controller) {
43-
super(data, source, params, view, controller);
44-
this.targetEntity = targetEntity;
45-
}
41+
public EntityFileActionEvent(Object targetEntity, Object data, Object source, Map<String, Object> params, CrudViewComponent view,
42+
CrudControllerAPI controller) {
43+
super(data, source, params, view, controller);
44+
this.targetEntity = targetEntity;
45+
}
4646

47-
public EntityFile getEntityFile() {
48-
return (EntityFile) getData();
49-
}
47+
public EntityFile getEntityFile() {
48+
return (EntityFile) getData();
49+
}
5050

51-
public Object getTargetEntity() {
52-
return targetEntity;
53-
}
51+
public Object getTargetEntity() {
52+
return targetEntity;
53+
}
5454

5555
}

0 commit comments

Comments
 (0)