Skip to content

Commit fdfe1b5

Browse files
committed
feat: support new ddmstructure export json format
1 parent 4f9e9b7 commit fdfe1b5

File tree

5 files changed

+196
-347
lines changed

5 files changed

+196
-347
lines changed

.vscode/settings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"java.configuration.runtimes": [
3+
{
4+
"name": "JavaSE-21",
5+
"path": "/etc/jdk21",
6+
"default": true
7+
}
8+
]
9+
}

README.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Liferay Portal DB setup core
22
:liferay-version: 7.4.3.125
3-
:current-db-setup-core-version: 7.4.3125.0
3+
:current-db-setup-core-version: 7.4.3125.1
44
:TOC:
55

66
image:https://maven-badges.herokuapp.com/maven-central/com.ableneo.liferay/com.ableneo.liferay.db.setup.core/badge.svg?color=blue[Maven Central,link=https://search.maven.org/search?q=g:com.ableneo.liferay%20AND%20a:com.ableneo.liferay.db.setup.core]
@@ -15,6 +15,7 @@ Library that allows to automate https://github.com/liferay[Liferay] data setup.
1515
|Liferay Portal version|DB setup core version
1616

1717
|{liferay-version} |{current-db-setup-core-version} link:https://github.com/ableneo/liferay-db-setup-core/tree/master[source]
18+
|7.4.3.125 | 7.4.3125.1 link:https://central.sonatype.com/artifact/com.ableneo.liferay/com.ableneo.liferay.db.setup.core/7.4.3125.1[jar] link:https://github.com/ableneo/liferay-db-setup-core/tree/7.4.3125.1[source]
1819
|7.4.3.86 | 7.4.3861 link:https://central.sonatype.com/artifact/com.ableneo.liferay/com.ableneo.liferay.db.setup.core/7.4.3861[jar] link:https://github.com/ableneo/liferay-db-setup-core/tree/7.4.3861[source]
1920
|7.3.6 | 7.3.605 link:https://central.sonatype.com/artifact/com.ableneo.liferay/com.ableneo.liferay.db.setup.core/7.3.605[jar] link:https://github.com/ableneo/liferay-db-setup-core/tree/7.3.6[source]
2021
|7.3.6 | 7.3.605 link:https://central.sonatype.com/artifact/com.ableneo.liferay/com.ableneo.liferay.db.setup.core/7.3.605[jar] link:https://github.com/ableneo/liferay-db-setup-core/tree/7.3.6[source]
@@ -357,6 +358,10 @@ They are probably not perfect, please let me know if anything feels wrong or inc
357358

358359
== Changelog
359360

361+
=== Version 7.4.3125.1
362+
==== Features & bug fixes
363+
* fixed SetupArticles bug so it works with data definition json export
364+
360365
=== Version 7.4.3125.0
361366

362367
==== Features & bug fixes

pom.xml

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,33 @@
5252
</pluginManagement>
5353

5454
<plugins>
55+
<plugin>
56+
<artifactId>maven-shade-plugin</artifactId>
57+
<version>3.6.0</version>
58+
<executions>
59+
<execution>
60+
<phase>package</phase>
61+
<goals>
62+
<goal>shade</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
<configuration>
67+
<artifactSet>
68+
<includes>
69+
<include>com.liferay:com.liferay.journal.web</include>
70+
</includes>
71+
</artifactSet>
72+
<filters>
73+
<filter>
74+
<artifact>com.liferay:com.liferay.journal.web</artifact>
75+
<includes>
76+
<include>**/DataDefinitionUtil.class</include>
77+
</includes>
78+
</filter>
79+
</filters>
80+
</configuration>
81+
</plugin>
5582
<plugin>
5683
<groupId>org.apache.maven.plugins</groupId>
5784
<artifactId>maven-source-plugin</artifactId>
@@ -104,7 +131,6 @@
104131
<target>21</target>
105132
</configuration>
106133
</plugin>
107-
108134
<plugin>
109135
<groupId>org.codehaus.mojo</groupId>
110136
<artifactId>license-maven-plugin</artifactId>
@@ -238,7 +264,7 @@
238264
<artifactId>prettier-maven-plugin</artifactId>
239265
<version>0.21</version>
240266
<configuration>
241-
<prettierJavaVersion>2.5.0</prettierJavaVersion>
267+
<prettierJavaVersion>2.7.1</prettierJavaVersion>
242268
<printWidth>120</printWidth>
243269
<useTabs>false</useTabs>
244270
<tabWidth>4</tabWidth>
@@ -273,6 +299,15 @@
273299
</execution>
274300
</executions>
275301
</plugin>
302+
<plugin>
303+
<groupId>org.apache.maven.plugins</groupId>
304+
<artifactId>maven-compiler-plugin</artifactId>
305+
<configuration>
306+
<source>21</source>
307+
<target>21</target>
308+
<compilerArgs>--enable-preview</compilerArgs>
309+
</configuration>
310+
</plugin>
276311

277312
</plugins>
278313
</build>
@@ -313,6 +348,11 @@
313348
</dependencies>
314349
</dependencyManagement>
315350
<dependencies>
351+
<dependency>
352+
<groupId>com.liferay</groupId>
353+
<artifactId>com.liferay.journal.web</artifactId>
354+
<version>5.0.191</version>
355+
</dependency>
316356
<!-- TODO remove debug deps start -->
317357
<dependency>
318358
<groupId>com.liferay</groupId>

0 commit comments

Comments
 (0)