Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed wrong filtering of resources

This commit is contained in:
Robert von Burg 2017-08-18 09:46:54 +02:00
parent 5efb426f10
commit 2863a5746b
10 changed files with 102 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
li.strolch.agent/pom.xml
View File

@ -32,6 +32,16 @@
<build> <build>
<resources> <resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/agentVersion.properties</exclude>
</excludes>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>

12
li.strolch.model/pom.xml
View File

@ -35,11 +35,21 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
<excludes>
<exclude>**/componentVersion.properties</exclude>
</excludes>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
</includes> </includes>
</resource> </resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/componentVersion.properties</include>
</includes>
</resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>

13
li.strolch.performancetest/pom.xml
View File

@ -56,17 +56,20 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
<excludes>
<exclude>**/appVersion.properties</exclude>
</excludes>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>false</filtering> <filtering>true</filtering>
<excludes> <includes>
<exclude>**/*.properties</exclude> <include>**/appVersion.properties</include>
</excludes> </includes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>

16
li.strolch.persistence.postgresql/pom.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
@ -48,17 +47,20 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
<excludes>
<exclude>**/componentVersion.properties</exclude>
</excludes>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>false</filtering> <filtering>true</filtering>
<excludes> <includes>
<exclude>**/componentVersion.properties</exclude> <include>**/componentVersion.properties</include>
</excludes> </includes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>

14
li.strolch.planningwebapp/pom.xml
View File

@ -55,20 +55,24 @@
<build> <build>
<finalName>${warFinalName}</finalName> <finalName>${warFinalName}</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
<excludes>
<exclude>**/appVersion.properties</exclude>
</excludes>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>false</filtering> <filtering>true</filtering>
<excludes> <includes>
<exclude>**/*.properties</exclude> <include>**/appVersion.properties</include>
</excludes> </includes>
</resource> </resource>
</resources> </resources>

14
li.strolch.privilege/pom.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -23,6 +22,17 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

14
li.strolch.rest/pom.xml
View File

@ -90,15 +90,27 @@
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
<excludes>
<exclude>**/componentVersion.properties</exclude>
</excludes>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
</includes> </includes>
</resource> </resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/componentVersion.properties</include>
</includes>
</resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>

13
li.strolch.service/pom.xml
View File

@ -51,12 +51,23 @@
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/componentVersion.properties</exclude>
</excludes>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
<includes> <includes>
<include>**/*.properties</include> <include>**/componentVersion.properties</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>

15
li.strolch.tutorialapp/pom.xml
View File

@ -38,22 +38,27 @@
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
<excludes>
<exclude>**/appVersion.properties</exclude>
</excludes>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>false</filtering> <filtering>true</filtering>
<excludes> <includes>
<exclude>**/*.properties</exclude> <include>**/appVersion.properties</include>
</excludes> </includes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>

13
li.strolch.tutorialwebapp/pom.xml
View File

@ -60,17 +60,20 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
<excludes>
<exclude>**/appVersion.properties</exclude>
</excludes>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>false</filtering> <filtering>true</filtering>
<excludes> <includes>
<exclude>**/*.properties</exclude> <include>**/appVersion.properties</include>
</excludes> </includes>
</resource> </resource>
</resources> </resources>