Skip to content

Commit

Permalink
Fix #1457: Executable war
Browse files Browse the repository at this point in the history 
- Clean deps
- Move deps management to root
  • Loading branch information
@jandusil
jandusil committed Oct 30, 2023
1 parent 717e883 commit ee39ec2
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 87 deletions.
17 changes: 17 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@
<moneta.version>1.4.2</moneta.version>
<owasp-java-html-sanitizer.version>20220608.1</owasp-java-html-sanitizer.version>
<logstash.version>7.4</logstash.version>
<tomcat-embeded.version>11.0.0-M13</tomcat-embeded.version>
<spring-boot-starter-tomcat.version>3.1.5</spring-boot-starter-tomcat.version>

<!-- Wultra dependencies -->
<wultra-core.version>1.7.0</wultra-core.version>
Expand Down Expand Up @@ -268,6 +270,21 @@
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash.version}</version>
</dependency>


<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${spring-boot-starter-tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>${tomcat-embeded.version}</version>
<scope>provided</scope>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
6 changes: 0 additions & 6 deletions powerauth-nextstep-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Test Dependencies -->
Expand Down
16 changes: 0 additions & 16 deletions powerauth-nextstep/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,6 @@
<artifactId>powerauth-webflow-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<!-- Spring Boot -->
Expand Down
6 changes: 0 additions & 6 deletions powerauth-tpp-engine-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
15 changes: 0 additions & 15 deletions powerauth-tpp-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,6 @@
<version>1.6.0-SNAPSHOT</version>
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Spring Boot -->
<dependency>
Expand Down
6 changes: 0 additions & 6 deletions powerauth-webflow-authentication/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- PowerAuth Dependencies -->
Expand Down
16 changes: 0 additions & 16 deletions powerauth-webflow-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,6 @@
<groupId>io.getlime.security</groupId>
<version>1.6.0-SNAPSHOT</version>
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<!-- Spring Boot -->
Expand Down
6 changes: 0 additions & 6 deletions powerauth-webflow-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
16 changes: 0 additions & 16 deletions powerauth-webflow/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,6 @@
<name>powerauth-webflow</name>
<description>Federated Authentication and Authorization Server for Web</description>
<packaging>war</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<!-- Spring Dependencies -->
Expand Down

0 comments on commit ee39ec2

Please sign in to comment.