Skip to content

Commit c543315

Browse files
Fix Maven build of sample-spring-boot
The profile activation by missing files does no support Maven properties. The directories must be given in plain text. The pom.xml was changed accordingly. By default activation will only activate a profile if none other profile is active. Backend selection was therefore migrated to activation by system property. The documentation was adjusted accordingly.
1 parent 75bdd0e commit c543315

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,11 @@ description about how to apply this feature can be found
307307
Stacktraces can be logged within one log message. Further details can be found
308308
[here](https://github.com/SAP/cf-java-logging-support/wiki/Logging-Stack-Traces).
309309

310-
## Sample Application
310+
## Sample Applications
311311

312-
In order to illustrate how the different features are used, this repository includes a simple application in the [./sample folder](./sample).
312+
In order to illustrate how the different features are used, this repository includes two sample applications:
313+
* a Jersey implementation in the [./sample folder](./sample)
314+
* a Spring Boot implementaiton in the [./sample-spring-boot folder](./sample-spring-boot)
313315

314316
## Documentation
315317

sample-spring-boot/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<filtering>true</filtering>
106106
</resource>
107107
<resource>
108-
<directory>${project.build.directory}/generated-resources/keystore</directory>
108+
<directory>${basedir}/target/generated-resources/keystore</directory>
109109
</resource>
110110
</resources>
111111

@@ -130,8 +130,7 @@
130130
<id>initialze-keystore</id>
131131
<activation>
132132
<file>
133-
<missing>${project.build.directory}/generated-resources/keystore/token_keystore.jks
134-
</missing>
133+
<missing>${basedir}/target/generated-resources/keystore/token_keystore.jks</missing>
135134
</file>
136135
</activation>
137136
<build>
@@ -150,8 +149,7 @@
150149
</execution>
151150
</executions>
152151
<configuration>
153-
<keystore>${project.build.directory}/generated-resources/keystore/token_keystore.jks
154-
</keystore>
152+
<keystore>${basedir}/target/generated-resources/keystore/token_keystore.jks</keystore>
155153
<storepass>${keystore.token.store_password}</storepass>
156154
<keypass>${keystore.token.key_password}</keypass>
157155
<alias>${keystore.token.key_alias}</alias>
@@ -169,7 +167,9 @@
169167
<profile>
170168
<id>logback</id>
171169
<activation>
172-
<activeByDefault>true</activeByDefault>
170+
<property>
171+
<name>!log4j2</name>
172+
</property>
173173
</activation>
174174
<dependencies>
175175
<dependency>
@@ -186,7 +186,9 @@
186186
<profile>
187187
<id>log4j2</id>
188188
<activation>
189-
<activeByDefault>false</activeByDefault>
189+
<property>
190+
<name>log4j2</name>
191+
</property>
190192
</activation>
191193
<dependencies>
192194
<dependency>

0 commit comments

Comments
 (0)