Skip to content
This repository has been archived by the owner on Jul 25, 2018. It is now read-only.

Commit

Permalink
Merge pull request #802 from sw360/fix/799-fix-rest-build
Browse files Browse the repository at this point in the history 
fix(rest): seperate creation of rest fatjars to maven profile

review-by: external.maximilian.huber2@bosch-si.com
tested-by: thomas.maier@evosoft.com
  • Loading branch information
@maierthomas
maierthomas committed Apr 5, 2018
2 parents 61a70d6 + 62c0351 commit 243ebc6
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 32 deletions.
42 changes: 23 additions & 19 deletions rest/authorization-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,6 @@
</dependencies>
</dependencyManagement>

<build>
<finalName>authorization</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
Expand All @@ -158,11 +140,14 @@
</pluginRepository>
</pluginRepositories>

<build>
<finalName>authorization</finalName>
</build>

<profiles>
<profile>
<id>deploy</id>
<build>
<finalName>authorization</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -174,6 +159,25 @@
</plugins>
</build>
</profile>
<profile>
<id>fatjar</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
32 changes: 19 additions & 13 deletions rest/resource-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,18 +250,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -280,7 +268,6 @@
<profile>
<id>deploy</id>
<build>
<finalName>resource</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -292,6 +279,25 @@
</plugins>
</build>
</profile>
<profile>
<id>fatjar</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>

0 comments on commit 243ebc6

Please sign in to comment.