Skip to content

Commit 70eb164

Browse files
finkmanAtSapfinkmanAtSap
authored
use new maven dcl compiler plugin (#23)
1 parent f223b8c commit 70eb164

8 files changed

Lines changed: 22 additions & 54 deletions

File tree

‎ams-cap-bookshop/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<sap.cloud.security.ams.version>4.0.7</sap.cloud.security.ams.version>
25+
<sap.cloud.security.ams.dcl-compiler.version>1.1.1</sap.cloud.security.ams.dcl-compiler.version>
2526
</properties>
2627

2728
<modules>

‎ams-cap-bookshop/srv/pom.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,24 +218,25 @@
218218
<basePackage>cds.gen</basePackage>
219219
</configuration>
220220
</execution>
221+
</executions>
222+
</plugin>
221223

222-
<!-- DCL -> DCN compilation before tests -->
224+
<!-- Plugin for DCL -> DCN compilation before tests -->
225+
<plugin>
226+
<groupId>com.sap.cloud.security.ams.dcl</groupId>
227+
<artifactId>dcl-compiler-plugin</artifactId>
228+
<version>${sap.cloud.security.ams.dcl-compiler.version}</version>
229+
<executions>
223230
<execution>
224-
<id>compile-dcl</id>
225231
<goals>
226-
<goal>npx</goal>
232+
<goal>compile</goal>
227233
</goals>
228-
<phase>generate-test-resources</phase>
229234
<configuration>
230-
<arguments>--package=@sap/ams-dev compile-dcl
231-
-d ${project.basedir}/src/main/resources/ams -o
232-
${project.build.directory}/generated-test-resources/ams/dcn
233-
</arguments>
235+
<sourceDirectory>${project.basedir}/src/main/resources/ams</sourceDirectory>
234236
</configuration>
235237
</execution>
236238
</executions>
237239
</plugin>
238-
239240
</plugins>
240241
</build>
241242

‎ams-javalin-shopping/pom.xml‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<jdk.version>17</jdk.version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<sap.cloud.security.ams.version>4.0.7</sap.cloud.security.ams.version>
19+
<sap.cloud.security.ams.dcl-compiler.version>1.1.1</sap.cloud.security.ams.dcl-compiler.version>
1920
<sap.cloud.environment.servicebinding.version>0.21.0</sap.cloud.environment.servicebinding.version>
2021
<javalin.version>6.7.0</javalin.version>
2122
<jackson.version>2.21.1</jackson.version>
@@ -236,32 +237,14 @@
236237

237238
<!-- Plugin for DCL -> DCN compilation before tests -->
238239
<plugin>
239-
<groupId>com.github.eirslett</groupId>
240-
<artifactId>frontend-maven-plugin</artifactId>
241-
<version>1.14.1</version>
240+
<groupId>com.sap.cloud.security.ams.dcl</groupId>
241+
<artifactId>dcl-compiler-plugin</artifactId>
242+
<version>${sap.cloud.security.ams.dcl-compiler.version}</version>
242243
<executions>
243244
<execution>
244-
<id>install node and npm</id>
245245
<goals>
246-
<goal>install-node-and-npm</goal>
246+
<goal>compile</goal>
247247
</goals>
248-
<phase>generate-resources</phase>
249-
<configuration>
250-
<nodeVersion>v24.11.0</nodeVersion>
251-
</configuration>
252-
</execution>
253-
<execution>
254-
<id>compile-dcl</id>
255-
<goals>
256-
<goal>npx</goal>
257-
</goals>
258-
<phase>generate-resources</phase>
259-
<configuration>
260-
<arguments>--package=@sap/ams-dev@2.2.0 compile-dcl
261-
-d src/main/resources/ams/dcl -o
262-
${project.build.directory}/generated-test-resources/ams/dcn
263-
</arguments>
264-
</configuration>
265248
</execution>
266249
</executions>
267250
</plugin>

‎ams-spring-boot-shopping/pom.xml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
<jdk.version>17</jdk.version>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2626
<spring.boot.version>3.5.10</spring.boot.version>
27-
<sap.cloud.security.ams.version>4.0.5</sap.cloud.security.ams.version>
27+
<sap.cloud.security.ams.version>4.0.7</sap.cloud.security.ams.version>
28+
<sap.cloud.security.ams.dcl-compiler.version>1.1.1</sap.cloud.security.ams.dcl-compiler.version>
2829
<sap.cloud.security.version>3.5.7</sap.cloud.security.version>
2930
<sap.cloud.sdk.version>5.24.0</sap.cloud.sdk.version>
3031
<sap.cloud.environment.servicebinding.version>0.21.0</sap.cloud.environment.servicebinding.version>
@@ -239,32 +240,14 @@
239240

240241
<!-- Plugin for DCL -> DCN compilation before tests -->
241242
<plugin>
242-
<groupId>com.github.eirslett</groupId>
243-
<artifactId>frontend-maven-plugin</artifactId>
244-
<version>1.14.1</version>
243+
<groupId>com.sap.cloud.security.ams.dcl</groupId>
244+
<artifactId>dcl-compiler-plugin</artifactId>
245+
<version>${sap.cloud.security.ams.dcl-compiler.version}</version>
245246
<executions>
246247
<execution>
247-
<id>install node and npm</id>
248248
<goals>
249-
<goal>install-node-and-npm</goal>
249+
<goal>compile</goal>
250250
</goals>
251-
<phase>generate-test-resources</phase>
252-
<configuration>
253-
<nodeVersion>v24.11.0</nodeVersion>
254-
</configuration>
255-
</execution>
256-
<execution>
257-
<id>compile-dcl</id>
258-
<goals>
259-
<goal>npx</goal>
260-
</goals>
261-
<phase>generate-test-resources</phase>
262-
<configuration>
263-
<arguments>--package=@sap/ams-dev compile-dcl
264-
-d ${project.basedir}/src/main/resources/dcl
265-
-o ${project.build.directory}/generated-test-resources/ams/dcn
266-
</arguments>
267-
</configuration>
268251
</execution>
269252
</executions>
270253
</plugin>

ams-spring-boot-shopping/src/main/resources/dcl/internal/internalPolicies.dcl renamed to ams-spring-boot-shopping/src/main/resources/ams/dcl/internal/internalPolicies.dcl

File renamed without changes.

ams-spring-boot-shopping/src/main/resources/dcl/local/adminPolicies.dcl renamed to ams-spring-boot-shopping/src/main/resources/ams/dcl/local/adminPolicies.dcl

File renamed without changes.

ams-spring-boot-shopping/src/main/resources/dcl/schema.dcl renamed to ams-spring-boot-shopping/src/main/resources/ams/dcl/schema.dcl

File renamed without changes.

ams-spring-boot-shopping/src/main/resources/dcl/shopping/basePolicies.dcl renamed to ams-spring-boot-shopping/src/main/resources/ams/dcl/shopping/basePolicies.dcl

File renamed without changes.

0 commit comments

Comments
 (0)