Skip to content

Commit

Permalink
SDK-287 Switch order of flatten and shade plugin due to mojohaus/flat…
Browse files Browse the repository at this point in the history 
…ten-maven-plugin#100
  • Loading branch information
@bwand
bwand committed May 30, 2022
1 parent 762a2e8 commit eed82f1
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 9 deletions.
28 changes: 27 additions & 1 deletion njams-sdk-communication-cloud/pom.xml
View file
Expand Up @@ -6,11 +6,12 @@
<groupId>com.faizsiegeln.njams</groupId>
<artifactId>njams4-sdk-communication-cloud</artifactId>
<name>njams4-sdk-communication-cloud</name>
<version>${sdk.version}</version>

<parent>
<groupId>com.faizsiegeln</groupId>
<artifactId>njams4-sdk-root</artifactId>
<version>4.2.2-SNAPSHOT${changelist}</version>
<version>dev</version>
</parent>

<build>
Expand Down Expand Up @@ -60,6 +61,31 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<configuration>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>package</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion njams-sdk-sample-app/pom.xml
View file
Expand Up @@ -4,11 +4,12 @@
<groupId>com.im.sdk</groupId>
<artifactId>njams-sdk-sample-app</artifactId>
<packaging>war</packaging>
<version>${sdk.version}</version>

<parent>
<groupId>com.faizsiegeln</groupId>
<artifactId>njams4-sdk-root</artifactId>
<version>4.2.2-SNAPSHOT${changelist}</version>
<version>dev</version>
</parent>

<build>
Expand Down
3 changes: 2 additions & 1 deletion njams-sdk-sample-client/pom.xml
View file
Expand Up @@ -5,11 +5,12 @@
<groupId>com.faizsiegeln</groupId>
<artifactId>njams4-sdk-sample-client</artifactId>
<packaging>jar</packaging>
<version>${sdk.version}</version>

<parent>
<groupId>com.faizsiegeln</groupId>
<artifactId>njams4-sdk-root</artifactId>
<version>4.2.2-SNAPSHOT${changelist}</version>
<version>dev</version>
</parent>

<properties>
Expand Down
36 changes: 31 additions & 5 deletions njams-sdk/pom.xml
View file
Expand Up @@ -3,16 +3,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.faizsiegeln.njams</groupId>
<artifactId>njams4-sdk</artifactId>
<name>njams4-sdk</name>

<parent>
<groupId>com.faizsiegeln</groupId>
<artifactId>njams4-sdk-root</artifactId>
<version>4.2.2-SNAPSHOT${changelist}</version>
<version>dev</version>
</parent>

<groupId>com.faizsiegeln.njams</groupId>
<artifactId>njams4-sdk</artifactId>
<name>njams4-sdk</name>
<version>${sdk.version}</version>

<profiles>
<profile>
<id>checkstyle</id>
Expand Down Expand Up @@ -319,6 +320,31 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<configuration>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>package</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
28 changes: 27 additions & 1 deletion pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.faizsiegeln</groupId>
<artifactId>njams4-sdk-root</artifactId>
<version>4.2.2-SNAPSHOT${changelist}</version>
<version>dev</version>

<packaging>pom</packaging>
<name>njams4-sdk-root</name>
Expand All @@ -27,6 +27,7 @@
<properties>
<!-- Sane default when no revision property is passed in from the commandline -->
<!-- <revision>0-SNAPSHOT</revision>-->
<sdk.version>4.2.2-SNAPSHOT${changelist}</sdk.version>
<changelist></changelist>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
Expand Down Expand Up @@ -178,6 +179,31 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<configuration>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit eed82f1

Please sign in to comment.