Merge latest WildFly Elytron integration changes.

wildfly · Jan 4, 2017 · 271daa6 · 271daa6
2 parents e4ad93a + ebbbbf7
commit 271daa6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/feature-pack/src/main/resources/configuration/domain/subsystems-elytron.xml b/feature-pack/src/main/resources/configuration/domain/subsystems-elytron.xml
@@ -24,7 +24,7 @@
       <subsystem>resource-adapters.xml</subsystem>
       <subsystem>request-controller.xml</subsystem>
       <subsystem>sar.xml</subsystem>
-      <subsystem supplement="domain">elytron.xml</subsystem>
+      <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
       <subsystem>security.xml</subsystem>
       <subsystem>security-manager.xml</subsystem>
       <subsystem>transactions.xml</subsystem>
@@ -57,7 +57,7 @@
       <subsystem>resource-adapters.xml</subsystem>
       <subsystem>request-controller.xml</subsystem>
       <subsystem>sar.xml</subsystem>
-      <subsystem supplement="domain">elytron.xml</subsystem>
+      <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
       <subsystem>security.xml</subsystem>
       <subsystem>security-manager.xml</subsystem>
       <subsystem>singleton.xml</subsystem>
@@ -92,7 +92,7 @@
       <subsystem>resource-adapters.xml</subsystem>
       <subsystem>request-controller.xml</subsystem>
       <subsystem>sar.xml</subsystem>
-      <subsystem supplement="domain">elytron.xml</subsystem>
+      <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
       <subsystem>security.xml</subsystem>
       <subsystem>security-manager.xml</subsystem>
       <subsystem>transactions.xml</subsystem>
@@ -128,7 +128,7 @@
       <subsystem>resource-adapters.xml</subsystem>
       <subsystem>request-controller.xml</subsystem>
       <subsystem>sar.xml</subsystem>
-      <subsystem supplement="domain">elytron.xml</subsystem>
+      <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
       <subsystem>security.xml</subsystem>
       <subsystem>security-manager.xml</subsystem>
       <subsystem>singleton.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-elytron.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-elytron.xml
@@ -25,7 +25,7 @@
       <subsystem>request-controller.xml</subsystem>
       <subsystem>sar.xml</subsystem>
       <subsystem>security-manager.xml</subsystem>
-      <subsystem>elytron.xml</subsystem>
+      <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
       <subsystem>security.xml</subsystem>
       <subsystem>transactions.xml</subsystem>
       <subsystem supplement="elytron">undertow.xml</subsystem>

diff --git a/pom.xml b/pom.xml
@@ -219,7 +219,7 @@
         <version.org.wildfly.core>3.0.0.Alpha17</version.org.wildfly.core>
         <version.org.wildfly.arquillian>2.0.2.Final</version.org.wildfly.arquillian>
         <version.org.wildfly.naming-client>1.0.0.Beta6</version.org.wildfly.naming-client>
-        <version.org.wildfly.security.elytron-subsystem>1.0.0.Alpha17</version.org.wildfly.security.elytron-subsystem>
+        <version.org.wildfly.security.elytron-subsystem>1.0.0.Alpha18</version.org.wildfly.security.elytron-subsystem>
         <version.org.yaml.snakeyaml>1.15</version.org.yaml.snakeyaml>
         <version.sun.jaxb>2.2.11.jbossorg-1</version.sun.jaxb>
         <version.sun.saaj-impl>1.3.16-jbossorg-1</version.sun.saaj-impl>