Merge pull request logstash-plugins#16 from ceharris/master

Rework build for Wildfly 11+
sfuhrm · Feb 4, 2019 · be59af7 · be59af7
2 parents 79a84a9 + 2e135ea
commit be59af7
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 395 deletions.
diff --git a/README.md b/README.md
@@ -42,33 +42,10 @@ application's class loader, avoiding any potential for conflict.
 ### Building From Source
 
 Clone this repository and then run Maven at the top level of the source tree.
-
-#### Wildfly 14
-
-Make sure you're using JDK version 8 and run Maven as follows.
-
-```
-mvn -P wildfly-core -P wildfly14 clean install
-```
-
-#### Wildfly 10
-
-Make sure you're using JDK version 8 and run Maven as follows.
-
-```
-mvn -P wildfly-core -P wildfly10 clean install
-```
-
-#### Wildfly 9
-
-```
-mvn -P wildfly-core -P wildfly9 clean install
-```
-
-#### Wildfly 8
+This will create a version of the extension that is compatible with Wildfly 11 and up.
 
 ```
-mvn -P wildfly8 clean install
+mvn clean install
 ```
 
 #### Install the Extension
@@ -78,20 +55,20 @@ tar -C ${WILDFLY_HOME} -zxpvf cas-modules/target/cas-modules-{VERSION}-modules.t
 
 ### Using a Pre-Built Binary
 
-If you don't want to build it yourself, you can download the [latest binary distribution](https://github.com/soulwing/cas-extension/releases/tag/1.0.6)
+If you don't want to build it yourself, you can download the [latest binary distribution](https://github.com/soulwing/cas-extension/releases/tag/2.0.0)
 
 #### Verify the signature on the `tar.gz` binary
 
 ```
-gpg --verify cas-extension-1.0.6-wildfly10.tar.gz.asc
+gpg --verify cas-extension-2.0.0.tar.gz.asc
 ```
 
 You can get my PGP public key from [Keybase] (https://keybase.io/ceharris) or [onename] (https://onename.com/ceharris) or almost any PGP key server (key fingerprint is `5CD3 C1D5 CD3D AC5C 1040  75CC DF48 BD89 3F1F 38CE`). If you don't happen to trust enough to the people who signed my key, I'll be happy to do an online key signing with you using Google Hangouts or Skype.
 
 #### Install the `tar.gz` binary using
 
 ```
-tar -C ${WILDFLY_HOME} -xpvf cas-extension-1.0.6-wildfly10.tar.gz
+tar -C ${WILDFLY_HOME} -xpvf cas-extension-2.0.0.tar.gz
 ```
 
 Configuration

diff --git a/cas-api/pom.xml b/cas-api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.soulwing.cas</groupId>
     <artifactId>cas-extension</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>cas-api</artifactId>
   <name>CAS Extension API</name>

diff --git a/cas-demo/cas-demo-app/pom.xml b/cas-demo/cas-demo-app/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>cas-demo</artifactId>
     <groupId>org.soulwing.cas</groupId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/cas-demo/cas-demo-backend/pom.xml b/cas-demo/cas-demo-backend/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>cas-demo</artifactId>
     <groupId>org.soulwing.cas</groupId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/cas-demo/cas-demo-frontend/pom.xml b/cas-demo/cas-demo-frontend/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>cas-demo</artifactId>
     <groupId>org.soulwing.cas</groupId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/cas-demo/pom.xml b/cas-demo/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>cas-extension</artifactId>
     <groupId>org.soulwing.cas</groupId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/cas-jasig-client/pom.xml b/cas-jasig-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.soulwing.cas</groupId>
     <artifactId>cas-extension</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>cas-jasig-client</artifactId>
   <name>CAS JASIG Client</name>

diff --git a/cas-modules/pom.xml b/cas-modules/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.soulwing.cas</groupId>
     <artifactId>cas-extension</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>cas-modules</artifactId>
   <packaging>pom</packaging>

diff --git a/cas-opensaml/pom.xml b/cas-opensaml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.soulwing.cas</groupId>
     <artifactId>cas-extension</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>cas-opensaml</artifactId>
   <packaging>pom</packaging>

diff --git a/cas-subsystem/pom.xml b/cas-subsystem/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.soulwing.cas</groupId>
     <artifactId>cas-extension</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cas-subsystem</artifactId>
@@ -107,6 +107,21 @@
       <artifactId>wildfly-undertow</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.wildfly.core</groupId>
+      <artifactId>wildfly-controller</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.core</groupId>
+      <artifactId>wildfly-server</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.core</groupId>
+      <artifactId>wildfly-subsystem-test</artifactId>
+      <type>pom</type>
+    </dependency>
     <dependency>
       <groupId>org.jasig.cas.client</groupId>
       <artifactId>cas-client-core</artifactId>
@@ -156,49 +171,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <profiles>
-    <profile>
-      <id>wildfly-core</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.wildfly.core</groupId>
-          <artifactId>wildfly-controller</artifactId>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.wildfly.core</groupId>
-          <artifactId>wildfly-server</artifactId>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.wildfly.core</groupId>
-          <artifactId>wildfly-subsystem-test</artifactId>
-          <type>pom</type>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>wildfly8</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.wildfly</groupId>
-          <artifactId>wildfly-controller</artifactId>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.wildfly</groupId>
-          <artifactId>wildfly-server</artifactId>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.wildfly</groupId>
-          <artifactId>wildfly-subsystem-test</artifactId>
-          <type>pom</type>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -4,25 +4,29 @@
   <parent>
     <groupId>org.soulwing</groupId>
     <artifactId>soulwing-parent</artifactId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <groupId>org.soulwing.cas</groupId>
   <artifactId>cas-extension</artifactId>
-  <version>1.0.7-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>CAS Extension</name>
   <description>
     An extension for Wildfly that supports CAS authentication.
   </description>
   <properties>
+    <java.version>1.8</java.version>
+    <version.org.wildfly>11.0.0.Final</version.org.wildfly>
+    <version.org.wildfly.core>3.0.8.Final</version.org.wildfly.core>
+    <version.io.undertow>1.4.18.Final</version.io.undertow>
     <version.org.jasig.cas.client>3.5.0</version.org.jasig.cas.client>
     <module.name>cas</module.name>
   </properties>
   <scm>
     <connection>scm:git:[email protected]:soulwing/${project.artifactId}.git</connection>
     <developerConnection>${project.scm.connection}</developerConnection>
     <url>https://github.com/soulwing/${project.artifactId}</url>
-    <tag>HEAD</tag>
+    <tag>2.0.2</tag>
   </scm>
   <dependencyManagement>
     <dependencies>
@@ -47,6 +51,23 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-controller</artifactId>
+        <version>${version.org.wildfly.core}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-server</artifactId>
+        <version>${version.org.wildfly.core}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-subsystem-test</artifactId>
+        <type>pom</type>
+        <scope>test</scope>
+        <version>${version.org.wildfly.core}</version>
+      </dependency>
       <dependency>
         <groupId>org.jasig.cas.client</groupId>
         <artifactId>cas-client-core</artifactId>
@@ -69,89 +90,6 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  <profiles>
-    <profile>
-      <id>wildfly14</id>
-      <properties>
-        <java.version>1.8</java.version>
-        <version.org.wildfly>14.0.1.Final</version.org.wildfly>
-        <version.org.wildfly.core>6.0.2.Final</version.org.wildfly.core>
-        <version.io.undertow>2.0.13.Final</version.io.undertow>
-      </properties>
-    </profile>
-    <profile>
-      <id>wildfly10</id>
-      <properties>
-        <java.version>1.8</java.version>
-        <version.org.wildfly>10.0.0.Final</version.org.wildfly>
-        <version.org.wildfly.core>2.1.0.Final</version.org.wildfly.core>
-        <version.io.undertow>1.3.19.Final</version.io.undertow>
-      </properties>
-    </profile>
-    <profile>
-      <id>wildfly9</id>
-      <properties>
-        <version.org.wildfly>9.0.2.Final</version.org.wildfly>
-        <version.org.wildfly.core>1.0.2.Final</version.org.wildfly.core>
-        <version.io.undertow>1.2.9.Final</version.io.undertow>
-      </properties>
-    </profile>
-    <profile>
-      <id>wildfly-core</id>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-controller</artifactId>
-            <version>${version.org.wildfly.core}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-server</artifactId>
-            <version>${version.org.wildfly.core}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-subsystem-test</artifactId>
-            <type>pom</type>
-            <scope>test</scope>
-            <version>${version.org.wildfly.core}</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
-    <profile>
-      <id>wildfly8</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <version.org.wildfly>8.2.1.Final</version.org.wildfly>
-        <version.io.undertow>1.1.8.Final</version.io.undertow>
-      </properties>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-controller</artifactId>
-            <version>${version.org.wildfly}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-server</artifactId>
-            <version>${version.org.wildfly}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-subsystem-test</artifactId>
-            <type>pom</type>
-            <scope>test</scope>
-            <version>${version.org.wildfly}</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
-  </profiles>
   <repositories>
     <repository> 
       <id>jboss</id>