Skip to content

Commit d022b1f

Browse files
author
Michael Hörenberg
committed
#55 updated version for local testing purposes
1 parent 0582425 commit d022b1f

File tree

5 files changed

+72
-21
lines changed

5 files changed

+72
-21
lines changed

‎all/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.merkle.oss.aem</groupId>
1111
<artifactId>aem-utils</artifactId>
12-
<version>0.0.2-SNAPSHOT</version>
12+
<version>0.0.3-SNAPSHOT</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

‎core/pom.xml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.merkle.oss.aem</groupId>
1111
<artifactId>aem-utils</artifactId>
12-
<version>0.0.2-SNAPSHOT</version>
12+
<version>0.0.3-SNAPSHOT</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

@@ -40,9 +40,9 @@
4040
</goals>
4141
<configuration>
4242
<bnd><![CDATA[
43-
Bundle-Category: merkle.oss
44-
Bundle-SymbolicName: aem-utils.core-bundle
45-
Import-Package: javax.annotation;version=0.0.0,*
43+
Bundle-Category: merkle.oss
44+
Bundle-SymbolicName: aem-utils.core-bundle
45+
Import-Package: javax.annotation;version=0.0.0,*
4646
]]></bnd>
4747
</configuration>
4848
</execution>
@@ -86,10 +86,6 @@ Import-Package: javax.annotation;version=0.0.0,*
8686
<!-- D E P E N D E N C I E S -->
8787
<!-- ====================================================================== -->
8888
<dependencies>
89-
<dependency>
90-
<groupId>org.jspecify</groupId>
91-
<artifactId>jspecify</artifactId>
92-
</dependency>
9389
<dependency>
9490
<groupId>org.jsoup</groupId>
9591
<artifactId>jsoup</artifactId>
@@ -98,6 +94,14 @@ Import-Package: javax.annotation;version=0.0.0,*
9894
<groupId>com.google.re2j</groupId>
9995
<artifactId>re2j</artifactId>
10096
</dependency>
97+
<dependency>
98+
<groupId>org.jspecify</groupId>
99+
<artifactId>jspecify</artifactId>
100+
</dependency>
101+
<dependency>
102+
<groupId>com.github.ben-manes.caffeine</groupId>
103+
<artifactId>caffeine</artifactId>
104+
</dependency>
101105
<!-- Testing -->
102106
<dependency>
103107
<groupId>org.junit.jupiter</groupId>
@@ -124,6 +128,11 @@ Import-Package: javax.annotation;version=0.0.0,*
124128
<artifactId>gson</artifactId>
125129
<scope>test</scope>
126130
</dependency>
131+
<dependency>
132+
<groupId>org.slf4j</groupId>
133+
<artifactId>slf4j-simple</artifactId>
134+
<scope>test</scope>
135+
</dependency>
127136
<dependency>
128137
<groupId>com.adobe.aem</groupId>
129138
<artifactId>aem-sdk-api</artifactId>

‎pom.xml‎

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<groupId>com.merkle.oss.aem</groupId>
1010
<artifactId>aem-utils</artifactId>
1111
<packaging>pom</packaging>
12-
<version>0.0.2-SNAPSHOT</version>
12+
<version>0.0.3-SNAPSHOT</version>
1313
<name>AEM Utils</name>
1414
<description>Maven Multimodule project for AEM Java Utilities</description>
1515
<url>https://github.com/merkle-open/aem-utils</url>
@@ -121,10 +121,12 @@
121121
<org.jsoup.version>1.22.1</org.jsoup.version>
122122
<google.re2j.version>1.8</google.re2j.version>
123123
<org.jspecify.version>1.0.0</org.jspecify.version>
124+
<caffeine.version>3.2.3</caffeine.version>
124125
<junit.version>6.0.2</junit.version>
125126
<mockito.version>5.21.0</mockito.version>
126127
<io.wcm.testing.aem-mock.junit5.version>5.6.14</io.wcm.testing.aem-mock.junit5.version>
127128
<gson.version>2.13.2</gson.version>
129+
<slf4j-simple.version>2.0.17</slf4j-simple.version>
128130

129131
<java.version>21</java.version>
130132
<aem.sdk.api>2025.9.22758.20250928T092442Z-250900</aem.sdk.api>
@@ -285,21 +287,38 @@
285287
<goal>bnd-process</goal>
286288
</goals>
287289
<configuration>
288-
<bnd>
290+
<bnd><![CDATA[
289291
Bundle-Category: ${componentGroupName}
292+
Bundle-DocURL: https://github.com/merkle-open/aem-utils
290293
291-
-conditionalpackage: org.jspecify.*, org.jsoup.*, com.google.re2j.*
294+
-conditionalpackage: \
295+
org.jspecify.*, \
296+
org.jsoup.*, \
297+
com.google.re2j.*, \
298+
com.github.benmanes.caffeine.*, \
299+
com.google.errorprone.annotations.*
292300
293-
-exportcontents: com.merkle.oss.aem.utils*, org.jspecify.annotations.*
301+
-exportcontents: \
302+
com.merkle.oss.aem.utils.*
303+
304+
# This explicitly prevents these from appearing in Import-Package
305+
Import-Package: \
306+
!org.jspecify.*, \
307+
!org.jsoup.*, \
308+
!com.google.re2j.*, \
309+
!com.github.benmanes.caffeine.*, \
310+
!com.google.errorprone.annotations.*, \
311+
*
312+
313+
-fixupmessages.one: "Export com.merkle.oss.aem.utils.*jspecify.*";is:=ignore
314+
-fixupmessages.two: "Export *, has \\d+, private references"; restrict:=warning; is:=error
294315
295-
# reproducible builds (https://github.com/bndtools/bnd/issues/3521)
296316
-noextraheaders: true
297317
-snapshot: SNAPSHOT
298318
299-
Bundle-DocURL:
300-
-plugin org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin
301-
-plugin org.apache.sling.bnd.models.ModelsScannerPlugin
302-
</bnd>
319+
-plugin.caconfig: org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin
320+
-plugin.models: org.apache.sling.bnd.models.ModelsScannerPlugin
321+
]]></bnd>
303322
</configuration>
304323
</execution>
305324
</executions>
@@ -349,6 +368,12 @@
349368
<groupId>org.apache.maven.plugins</groupId>
350369
<artifactId>maven-surefire-plugin</artifactId>
351370
<version>${mvn.surefire.plugin.version}</version>
371+
<configuration>
372+
<argLine>
373+
-XX:+EnableDynamicAgentLoading
374+
-Xshare:off
375+
</argLine>
376+
</configuration>
352377
</plugin>
353378
<!-- Maven Failsafe Plugin -->
354379
<plugin>
@@ -649,6 +674,12 @@
649674
<version>${org.jspecify.version}</version>
650675
<scope>compile</scope>
651676
</dependency>
677+
<dependency>
678+
<groupId>com.github.ben-manes.caffeine</groupId>
679+
<artifactId>caffeine</artifactId>
680+
<version>${caffeine.version}</version>
681+
<scope>compile</scope>
682+
</dependency>
652683
<dependency>
653684
<groupId>org.junit</groupId>
654685
<artifactId>junit-bom</artifactId>
@@ -692,6 +723,12 @@
692723
<version>${gson.version}</version>
693724
<scope>test</scope>
694725
</dependency>
726+
<dependency>
727+
<groupId>org.slf4j</groupId>
728+
<artifactId>slf4j-simple</artifactId>
729+
<version>${slf4j-simple.version}</version>
730+
<scope>test</scope>
731+
</dependency>
695732
</dependencies>
696733
</dependencyManagement>
697734

‎ui.apps.structure/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.merkle.oss.aem</groupId>
1111
<artifactId>aem-utils</artifactId>
12-
<version>0.0.2-SNAPSHOT</version>
12+
<version>0.0.3-SNAPSHOT</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

@@ -40,7 +40,12 @@
4040
<filters>
4141
<!-- /apps root -->
4242
<filter><root>/apps</root></filter>
43-
<filter><root>/apps/utils</root></filter>
43+
<filter><root>/apps/merkle/utils/config.author</root></filter>
44+
<filter><root>/apps/merkle/utils/config.dev</root></filter>
45+
<filter><root>/apps/merkle/utils/config.prod</root></filter>
46+
<filter><root>/apps/merkle/utils/config.publish</root></filter>
47+
<filter><root>/apps/merkle/utils/config.rde</root></filter>
48+
<filter><root>/apps/merkle/utils/config.stage</root></filter>
4449
</filters>
4550
</configuration>
4651
</plugin>

‎ui.config/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.merkle.oss.aem</groupId>
1111
<artifactId>aem-utils</artifactId>
12-
<version>0.0.2-SNAPSHOT</version>
12+
<version>0.0.3-SNAPSHOT</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

0 commit comments

Comments
 (0)