Merge pull request #1360 from mstruk/fix-poms
Fixed pom issues that were generating tons of Maven warnings
This commit is contained in:
commit
656b157103
12 changed files with 55 additions and 77 deletions
|
@ -54,7 +54,7 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<changeLogFile>META-INF/jpa-changelog-master.xml</changeLogFile>
|
<changeLogFile>META-INF/jpa-changelog-master.xml</changeLogFile>
|
||||||
|
|
||||||
<url>${url}</url>
|
<url>${project.url}</url>
|
||||||
<driver>${driver}</driver>
|
<driver>${driver}</driver>
|
||||||
<username>${username}</username>
|
<username>${username}</username>
|
||||||
<password>${password}</password>
|
<password>${password}</password>
|
||||||
|
|
|
@ -50,11 +50,6 @@
|
||||||
<artifactId>wildfly-feature-pack</artifactId>
|
<artifactId>wildfly-feature-pack</artifactId>
|
||||||
<type>zip</type>
|
<type>zip</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.keycloak.subsystem</groupId>
|
|
||||||
<artifactId>keycloak-server</artifactId>
|
|
||||||
<type>war</type>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -22,23 +22,23 @@
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- JBoss AS dependency versions -->
|
|
||||||
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
|
||||||
|
|
||||||
<!-- WildFly dependency versions -->
|
|
||||||
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
|
||||||
|
|
||||||
<!-- PicketLink dependency versions -->
|
<!-- PicketLink dependency versions -->
|
||||||
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
||||||
|
|
||||||
<!-- Default target container. -->
|
<!-- Default target container. -->
|
||||||
<target.container>jboss-eap</target.container>
|
<target.container>jboss-eap</target.container>
|
||||||
|
|
||||||
<!-- maven-war-plugin -->
|
|
||||||
<version.war.plugin>2.1.1</version.war.plugin>
|
|
||||||
|
|
||||||
<!-- maven-compiler-plugin -->
|
<!-- maven-compiler-plugin -->
|
||||||
<version.compiler.plugin>3.1</version.compiler.plugin>
|
<version.compiler.plugin>3.1</version.compiler.plugin>
|
||||||
|
<!-- maven-deploy-plugin -->
|
||||||
|
<version.deploy.plugin>2.8.1</version.deploy.plugin>
|
||||||
|
<!-- JBoss AS dependency versions -->
|
||||||
|
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
||||||
|
<!-- maven-war-plugin -->
|
||||||
|
<version.war.plugin>2.1.1</version.war.plugin>
|
||||||
|
<!-- WildFly dependency versions -->
|
||||||
|
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
||||||
|
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.6</maven.compiler.source>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -50,6 +50,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>${version.deploy.plugin}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -22,23 +22,23 @@
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- JBoss AS dependency versions -->
|
|
||||||
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
|
||||||
|
|
||||||
<!-- WildFly dependency versions -->
|
|
||||||
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
|
||||||
|
|
||||||
<!-- PicketLink dependency versions -->
|
<!-- PicketLink dependency versions -->
|
||||||
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
||||||
|
|
||||||
<!-- Default target container. -->
|
<!-- Default target container. -->
|
||||||
<target.container>jboss-eap</target.container>
|
<target.container>jboss-eap</target.container>
|
||||||
|
|
||||||
<!-- maven-war-plugin -->
|
|
||||||
<version.war.plugin>2.1.1</version.war.plugin>
|
|
||||||
|
|
||||||
<!-- maven-compiler-plugin -->
|
<!-- maven-compiler-plugin -->
|
||||||
<version.compiler.plugin>3.1</version.compiler.plugin>
|
<version.compiler.plugin>3.1</version.compiler.plugin>
|
||||||
|
<!-- maven-deploy-plugin -->
|
||||||
|
<version.deploy.plugin>2.8.1</version.deploy.plugin>
|
||||||
|
<!-- JBoss AS dependency versions -->
|
||||||
|
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
||||||
|
<!-- maven-war-plugin -->
|
||||||
|
<version.war.plugin>2.1.1</version.war.plugin>
|
||||||
|
<!-- WildFly dependency versions -->
|
||||||
|
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
||||||
|
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.6</maven.compiler.source>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -58,6 +58,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>${version.deploy.plugin}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -22,23 +22,23 @@
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- JBoss AS dependency versions -->
|
|
||||||
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
|
||||||
|
|
||||||
<!-- WildFly dependency versions -->
|
|
||||||
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
|
||||||
|
|
||||||
<!-- PicketLink dependency versions -->
|
<!-- PicketLink dependency versions -->
|
||||||
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
||||||
|
|
||||||
<!-- Default target container. -->
|
<!-- Default target container. -->
|
||||||
<target.container>jboss-eap</target.container>
|
<target.container>jboss-eap</target.container>
|
||||||
|
|
||||||
<!-- maven-war-plugin -->
|
|
||||||
<version.war.plugin>2.1.1</version.war.plugin>
|
|
||||||
|
|
||||||
<!-- maven-compiler-plugin -->
|
<!-- maven-compiler-plugin -->
|
||||||
<version.compiler.plugin>3.1</version.compiler.plugin>
|
<version.compiler.plugin>3.1</version.compiler.plugin>
|
||||||
|
<!-- maven-deploy-plugin -->
|
||||||
|
<version.deploy.plugin>2.8.1</version.deploy.plugin>
|
||||||
|
<!-- JBoss AS dependency versions -->
|
||||||
|
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
||||||
|
<!-- maven-war-plugin -->
|
||||||
|
<version.war.plugin>2.1.1</version.war.plugin>
|
||||||
|
<!-- WildFly dependency versions -->
|
||||||
|
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
||||||
|
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.6</maven.compiler.source>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -58,6 +58,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>${version.deploy.plugin}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -22,11 +22,6 @@
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- JBoss AS dependency versions -->
|
|
||||||
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
|
||||||
|
|
||||||
<!-- WildFly dependency versions -->
|
|
||||||
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
|
||||||
|
|
||||||
<!-- PicketLink dependency versions -->
|
<!-- PicketLink dependency versions -->
|
||||||
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
||||||
|
@ -34,11 +29,17 @@
|
||||||
<!-- Default target container. -->
|
<!-- Default target container. -->
|
||||||
<target.container>jboss-eap</target.container>
|
<target.container>jboss-eap</target.container>
|
||||||
|
|
||||||
<!-- maven-war-plugin -->
|
|
||||||
<version.war.plugin>2.1.1</version.war.plugin>
|
|
||||||
|
|
||||||
<!-- maven-compiler-plugin -->
|
<!-- maven-compiler-plugin -->
|
||||||
<version.compiler.plugin>3.1</version.compiler.plugin>
|
<version.compiler.plugin>3.1</version.compiler.plugin>
|
||||||
|
<!-- maven-deploy-plugin -->
|
||||||
|
<version.deploy.plugin>2.8.1</version.deploy.plugin>
|
||||||
|
<!-- JBoss AS dependency versions -->
|
||||||
|
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
||||||
|
<!-- maven-war-plugin -->
|
||||||
|
<version.war.plugin>2.1.1</version.war.plugin>
|
||||||
|
<!-- WildFly dependency versions -->
|
||||||
|
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
||||||
|
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.6</maven.compiler.source>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -50,6 +51,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>${version.deploy.plugin}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -22,23 +22,23 @@
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- JBoss AS dependency versions -->
|
|
||||||
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
|
||||||
|
|
||||||
<!-- WildFly dependency versions -->
|
|
||||||
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
|
||||||
|
|
||||||
<!-- PicketLink dependency versions -->
|
<!-- PicketLink dependency versions -->
|
||||||
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
<version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
|
||||||
|
|
||||||
<!-- Default target container. -->
|
<!-- Default target container. -->
|
||||||
<target.container>jboss-eap</target.container>
|
<target.container>jboss-eap</target.container>
|
||||||
|
|
||||||
<!-- maven-war-plugin -->
|
|
||||||
<version.war.plugin>2.1.1</version.war.plugin>
|
|
||||||
|
|
||||||
<!-- maven-compiler-plugin -->
|
<!-- maven-compiler-plugin -->
|
||||||
<version.compiler.plugin>3.1</version.compiler.plugin>
|
<version.compiler.plugin>3.1</version.compiler.plugin>
|
||||||
|
<!-- maven-deploy-plugin -->
|
||||||
|
<version.deploy.plugin>2.8.1</version.deploy.plugin>
|
||||||
|
<!-- JBoss AS dependency versions -->
|
||||||
|
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
|
||||||
|
<!-- maven-war-plugin -->
|
||||||
|
<version.war.plugin>2.1.1</version.war.plugin>
|
||||||
|
<!-- WildFly dependency versions -->
|
||||||
|
<version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
|
||||||
|
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.6</maven.compiler.source>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -58,6 +58,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>${version.deploy.plugin}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -85,19 +85,6 @@
|
||||||
<groupId>org.codehaus.jackson</groupId>
|
<groupId>org.codehaus.jackson</groupId>
|
||||||
<artifactId>jackson-xc</artifactId>
|
<artifactId>jackson-xc</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.tomcat</groupId>
|
|
||||||
<artifactId>tomcat-servlet-api</artifactId>
|
|
||||||
<version>${tomcat.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.tomcat</groupId>
|
|
||||||
<artifactId>tomcat-catalina</artifactId>
|
|
||||||
<version>${tomcat.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-invalidation-cache-infinispan</artifactId>
|
<artifactId>keycloak-invalidation-cache-infinispan</artifactId>
|
||||||
<name>Keycloak Invalidation Cache Infinispan</name>
|
<name>Keycloak Model Invalidation Cache Infinispan</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<version>1.3.0.Final-SNAPSHOT</version>
|
<version>1.3.0.Final-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<name>Model Parent</name>
|
<name>Keycloak Model Invalidation Cache Parent</name>
|
||||||
<description/>
|
<description/>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<version>1.3.0.Final-SNAPSHOT</version>
|
<version>1.3.0.Final-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<name>Model Parent</name>
|
<name>Keycloak Model Parent</name>
|
||||||
<description/>
|
<description/>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|
12
pom.xml
12
pom.xml
|
@ -289,11 +289,6 @@
|
||||||
<artifactId>keycloak-wildfly-adapter-subsystem</artifactId>
|
<artifactId>keycloak-wildfly-adapter-subsystem</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.keycloak</groupId>
|
|
||||||
<artifactId>keycloak-undertow-adapter</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.undertow</groupId>
|
<groupId>io.undertow</groupId>
|
||||||
<artifactId>undertow-servlet</artifactId>
|
<artifactId>undertow-servlet</artifactId>
|
||||||
|
@ -532,11 +527,6 @@
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
<version>${apache.httpcomponents.version}</version>
|
<version>${apache.httpcomponents.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpmime</artifactId>
|
|
||||||
<version>${apache.httpcomponents.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpcore</artifactId>
|
<artifactId>httpcore</artifactId>
|
||||||
|
@ -545,7 +535,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpmime</artifactId>
|
<artifactId>httpmime</artifactId>
|
||||||
<version>${keycloak.apache.httpcomponents.version}</version>
|
<version>${apache.httpcomponents.version}</version>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>commons-logging</groupId>
|
<groupId>commons-logging</groupId>
|
||||||
|
|
Loading…
Reference in a new issue