updated version of xml plugin, fix adapter-libs-provided profile in eap6 adapter

This commit is contained in:
vramik 2016-01-04 16:46:47 +01:00
parent c759719e95
commit efa112f820
3 changed files with 14 additions and 9 deletions

View file

@ -34,7 +34,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId> <artifactId>xml-maven-plugin</artifactId>
<version>1.0</version> <version>1.0.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

View file

@ -14,6 +14,7 @@
<properties> <properties>
<app.server.eap6.home>${containers.home}</app.server.eap6.home> <app.server.eap6.home>${containers.home}</app.server.eap6.home>
<adapter.libs.eap6>${containers.home}/keycloak-eap6-adapter-dist</adapter.libs.eap6> <adapter.libs.eap6>${containers.home}/keycloak-eap6-adapter-dist</adapter.libs.eap6>
<skip.configure.adapter.subsystem>false</skip.configure.adapter.subsystem>
</properties> </properties>
<dependencies> <dependencies>
@ -98,6 +99,15 @@
<profiles> <profiles>
<profile> <profile>
<id>prod</id> <id>prod</id>
<activation>
<property>
<name>prod</name>
<value>true</value>
</property>
</activation>
<properties>
<skip.configure.adapter.subsystem>true</skip.configure.adapter.subsystem>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -172,16 +182,11 @@
</profile> </profile>
<profile> <profile>
<id>adapter-libs-provided</id> <id>adapter-libs-provided</id>
<!-- this profile has to be activated directly, the profile cannot be activated <activation>
for prod tests, but we also need to activate adapter-libs-provided from
integration-arquillian-tests-adapters, once new release of xml-maven-plugin
will be available we can resolve this by skipping this particular tranformation
for prod build-->
<!-- <activation>
<property> <property>
<name>!adapter.libs.bundled</name> <name>!adapter.libs.bundled</name>
</property> </property>
</activation>--> </activation>
<properties> <properties>
<adapter.libs.eap6>${app.server.eap6.home}</adapter.libs.eap6> <adapter.libs.eap6>${app.server.eap6.home}</adapter.libs.eap6>
</properties> </properties>
@ -198,6 +203,7 @@
<goal>transform</goal> <goal>transform</goal>
</goals> </goals>
<configuration> <configuration>
<skip>${skip.configure.adapter.subsystem}</skip>
<transformationSets> <transformationSets>
<transformationSet> <transformationSet>
<dir>${app.server.eap6.home}/standalone/configuration</dir> <dir>${app.server.eap6.home}/standalone/configuration</dir>

View file

@ -55,7 +55,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId> <artifactId>xml-maven-plugin</artifactId>
<version>1.0</version>
<executions> <executions>
<execution> <execution>
<id>add-app-server-to-arquillian-xml</id> <id>add-app-server-to-arquillian-xml</id>