Add openid-connect release descriptors, rename oauth2 to oauth2-core …

…and make sure the release zips of oauth2 modules only contains the advertised bits
geoserver · Jul 10, 2018 · 67a0065 · 67a0065
1 parent bd35495
commit 67a0065
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 24 deletions.
diff --git a/src/community/pom.xml b/src/community/pom.xml
@@ -76,6 +76,7 @@
           <descriptor>release/ext-oauth2-google.xml</descriptor>
           <descriptor>release/ext-oauth2-github.xml</descriptor>
           <descriptor>release/ext-oauth2-geonode.xml</descriptor>
+          <descriptor>release/ext-oauth2-openid-connect.xml</descriptor>
           <descriptor>release/ext-keycloak.xml</descriptor>
           <descriptor>release/ext-backup-restore.xml</descriptor>
           <descriptor>release/ext-wmts-multi-dimensional.xml</descriptor> 
@@ -241,10 +242,11 @@
         <module>web-resource</module>
         <module>gwc-sqlite</module>
         <module>security</module>
-        <module>security/oauth2</module>
+        <module>security/oauth2-core</module>
         <module>security/oauth2-google</module>
         <module>security/oauth2-github</module>
         <module>security/oauth2-geonode</module>
+        <module>security/oauth2-openid-connect</module>
         <module>wmts-multi-dimensional</module>
         <module>onelogin</module>
         <module>notification</module>
@@ -508,28 +510,28 @@
     <profile>
       <id>oauth2-google</id>
       <modules>
-        <module>security/oauth2</module>
+        <module>security/oauth2-core</module>
         <module>security/oauth2-google</module>
       </modules>
     </profile>
     <profile>
       <id>oauth2-github</id>
       <modules>
-        <module>security/oauth2</module>
+        <module>security/oauth2-core</module>
         <module>security/oauth2-github</module>
       </modules>
     </profile>
     <profile>
       <id>oauth2-geonode</id>
       <modules>
-        <module>security/oauth2</module>
+        <module>security/oauth2-core</module>
         <module>security/oauth2-geonode</module>
       </modules>
     </profile>
     <profile>
       <id>oauth2-openid-connect</id>
       <modules>
-        <module>security/oauth2</module>
+        <module>security/oauth2-core</module>
         <module>security/oauth2-openid-connect</module>
       </modules>
     </profile>

diff --git a/src/community/release/ext-oauth2-geonode.xml b/src/community/release/ext-oauth2-geonode.xml
@@ -9,7 +9,7 @@
       <directory>release/target/dependency</directory>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>gs-sec-oauth2*</include>
+        <include>gs-sec-oauth2-core*</include>
         <include>gs-sec-oauth2-geonode*</include>
         <include>spring-security*</include>
         <include>spring-security-oauth2*</include>

diff --git a/src/community/release/ext-oauth2-github.xml b/src/community/release/ext-oauth2-github.xml
@@ -9,7 +9,7 @@
       <directory>release/target/dependency</directory>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>gs-sec-oauth2*</include>
+        <include>gs-sec-oauth2-core*</include>
         <include>gs-sec-oauth2-github*</include>
         <include>spring-security*</include>
         <include>spring-security-oauth2*</include>

diff --git a/src/community/release/ext-oauth2-google.xml b/src/community/release/ext-oauth2-google.xml
@@ -9,7 +9,7 @@
       <directory>release/target/dependency</directory>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>gs-sec-oauth2*</include>
+        <include>gs-sec-oauth2-core*</include>
         <include>gs-sec-oauth2-google*</include>
         <include>spring-security*</include>
         <include>spring-security-oauth2*</include>

diff --git a/src/community/release/ext-oauth2-openid-connect.xml b/src/community/release/ext-oauth2-openid-connect.xml
@@ -0,0 +1,27 @@
+<assembly>
+  <id>sec-oauth2-openid-connect-plugin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>release/target/dependency</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>gs-sec-oauth2-core*</include>
+        <include>gs-sec-oauth2-openid-connect*</include>
+        <include>spring-security*</include>
+        <include>spring-security-oauth2*</include>
+        <include>commons-codec*</include>
+        <include>jackson*</include>
+        <include>jettison*</include>
+        <include>json*</include>
+        <include>org.json*</include>
+        <include>spring-aop*</include>
+        <include>spring-context*</include>
+        <include>spring-webmvc*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/community/release/pom.xml b/src/community/release/pom.xml
@@ -233,6 +233,11 @@
      <artifactId>gs-sec-oauth2-geonode</artifactId>
      <version>${project.version}</version>
    </dependency>
+   <dependency>
+     <groupId>org.geoserver.community</groupId>
+     <artifactId>gs-sec-oauth2-openid-connect</artifactId>
+     <version>${project.version}</version>
+   </dependency>
    <dependency>
      <groupId>org.geoserver.community</groupId>
      <artifactId>gs-onelogin</artifactId>

diff --git a/src/community/security/keycloak/pom.xml b/src/community/security/keycloak/pom.xml
@@ -64,7 +64,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>

diff --git a/src/community/security/oauth2/pom.xml → src/community/security/oauth2-core/pom.xml b/src/community/security/oauth2/pom.xml → src/community/security/oauth2-core/pom.xml
@@ -14,10 +14,10 @@
 	</parent>
 
 	<groupId>org.geoserver.community</groupId>
-	<artifactId>gs-sec-oauth2</artifactId>
+	<artifactId>gs-sec-oauth2-core</artifactId>
 	<packaging>jar</packaging>
 	<version>2.14-SNAPSHOT</version>
-	<name>GeoServer OAuth2 Connect Security Module</name>
+	<name>GeoServer OAuth2 Connect Security Module - Core</name>
 
 	<properties>
 		<spring.security.jwt.version>1.0.2.RELEASE</spring.security.jwt.version>

diff --git a/...uth2/src/main/java/applicationContext.xml → ...core/src/main/java/applicationContext.xml b/...uth2/src/main/java/applicationContext.xml → ...core/src/main/java/applicationContext.xml
diff --git a/...oauth2/GeoServerAccessTokenConverter.java → ...oauth2/GeoServerAccessTokenConverter.java b/...oauth2/GeoServerAccessTokenConverter.java → ...oauth2/GeoServerAccessTokenConverter.java
diff --git a/...y/oauth2/GeoServerOAuth2FilterConfig.java → ...y/oauth2/GeoServerOAuth2FilterConfig.java b/...y/oauth2/GeoServerOAuth2FilterConfig.java → ...y/oauth2/GeoServerOAuth2FilterConfig.java
diff --git a/...GeoServerOAuth2SecurityConfiguration.java → ...GeoServerOAuth2SecurityConfiguration.java b/...GeoServerOAuth2SecurityConfiguration.java → ...GeoServerOAuth2SecurityConfiguration.java
diff --git a/...2/GeoServerOAuthAuthenticationFilter.java → ...2/GeoServerOAuthAuthenticationFilter.java b/...2/GeoServerOAuthAuthenticationFilter.java → ...2/GeoServerOAuthAuthenticationFilter.java
diff --git a/...GeoServerOAuthAuthenticationProvider.java → ...GeoServerOAuthAuthenticationProvider.java b/...GeoServerOAuthAuthenticationProvider.java → ...GeoServerOAuthAuthenticationProvider.java
diff --git a/...h2/GeoServerOAuthRemoteTokenServices.java → ...h2/GeoServerOAuthRemoteTokenServices.java b/...h2/GeoServerOAuthRemoteTokenServices.java → ...h2/GeoServerOAuthRemoteTokenServices.java
diff --git a/...GeoServerUserAuthenticationConverter.java → ...GeoServerUserAuthenticationConverter.java b/...GeoServerUserAuthenticationConverter.java → ...GeoServerUserAuthenticationConverter.java
diff --git a/...y/oauth2/OAuth2AccessTokenURLMangler.java → ...y/oauth2/OAuth2AccessTokenURLMangler.java b/...y/oauth2/OAuth2AccessTokenURLMangler.java → ...y/oauth2/OAuth2AccessTokenURLMangler.java
diff --git a/...r/security/oauth2/OAuth2FilterConfig.java → ...r/security/oauth2/OAuth2FilterConfig.java b/...r/security/oauth2/OAuth2FilterConfig.java → ...r/security/oauth2/OAuth2FilterConfig.java
diff --git a/...y/oauth2/OAuth2FilterConfigException.java → ...y/oauth2/OAuth2FilterConfigException.java b/...y/oauth2/OAuth2FilterConfigException.java → ...y/oauth2/OAuth2FilterConfigException.java
diff --git a/...y/oauth2/OAuth2FilterConfigValidator.java → ...y/oauth2/OAuth2FilterConfigValidator.java b/...y/oauth2/OAuth2FilterConfigValidator.java → ...y/oauth2/OAuth2FilterConfigValidator.java
diff --git a/...y/oauth2/OAuth2SecurityConfiguration.java → ...y/oauth2/OAuth2SecurityConfiguration.java b/...y/oauth2/OAuth2SecurityConfiguration.java → ...y/oauth2/OAuth2SecurityConfiguration.java
diff --git a/...th2/GeoServerOAuth2AuthProviderPanel.html → ...th2/GeoServerOAuth2AuthProviderPanel.html b/...th2/GeoServerOAuth2AuthProviderPanel.html → ...th2/GeoServerOAuth2AuthProviderPanel.html
diff --git a/...th2/GeoServerOAuth2AuthProviderPanel.java → ...th2/GeoServerOAuth2AuthProviderPanel.java b/...th2/GeoServerOAuth2AuthProviderPanel.java → ...th2/GeoServerOAuth2AuthProviderPanel.java
diff --git a/...resources/GeoServerApplication.properties → ...resources/GeoServerApplication.properties b/...resources/GeoServerApplication.properties → ...resources/GeoServerApplication.properties
diff --git a/...ources/GeoServerApplication_ko.properties → ...ources/GeoServerApplication_ko.properties b/...ources/GeoServerApplication_ko.properties → ...ources/GeoServerApplication_ko.properties
diff --git a/...n/resources/GeoServerException.properties → ...n/resources/GeoServerException.properties b/...n/resources/GeoServerException.properties → ...n/resources/GeoServerException.properties
diff --git a/...auth2/AbstractOAuth2RestTemplateTest.java → ...auth2/AbstractOAuth2RestTemplateTest.java b/...auth2/AbstractOAuth2RestTemplateTest.java → ...auth2/AbstractOAuth2RestTemplateTest.java
diff --git a/src/community/security/oauth2-geonode/pom.xml b/src/community/security/oauth2-geonode/pom.xml
@@ -34,7 +34,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
@@ -68,7 +68,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>

diff --git a/src/community/security/oauth2-github/pom.xml b/src/community/security/oauth2-github/pom.xml
@@ -34,7 +34,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
@@ -68,7 +68,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>

diff --git a/src/community/security/oauth2-google/pom.xml b/src/community/security/oauth2-google/pom.xml
@@ -34,7 +34,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
@@ -46,7 +46,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>

diff --git a/src/community/security/oauth2-openid-connect/pom.xml b/src/community/security/oauth2-openid-connect/pom.xml
@@ -37,7 +37,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
@@ -71,7 +71,7 @@
 
 		<dependency>
 			<groupId>org.geoserver.community</groupId>
-			<artifactId>gs-sec-oauth2</artifactId>
+			<artifactId>gs-sec-oauth2-core</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>

diff --git a/src/community/security/pom.xml b/src/community/security/pom.xml
@@ -26,23 +26,23 @@
     <profile>
       <id>oauth2-google</id>
       <modules>
-        <module>oauth2</module>
+        <module>oauth2-core</module>
         <module>oauth2-google</module>
       </modules>
     </profile>
 
     <profile>
       <id>oauth2-github</id>
       <modules>
-        <module>oauth2</module>
+        <module>oauth2-core</module>
         <module>oauth2-github</module>
       </modules>
     </profile>
 
     <profile>
       <id>oauth2-geonode</id>
       <modules>
-        <module>oauth2</module>
+        <module>oauth2-core</module>
         <module>oauth2-geonode</module>
       </modules>
     </profile>
@@ -57,15 +57,15 @@
     <profile>
       <id>oauth2-openid-connect</id>
       <modules>
-        <module>oauth2</module>
+        <module>oauth2-core</module>
         <module>oauth2-openid-connect</module>
       </modules>
     </profile>
 
     <profile>
       <id>oauth2-all</id>
       <modules>
-        <module>oauth2</module>
+        <module>oauth2-core</module>
         <module>oauth2-google</module>
         <module>oauth2-github</module>
         <module>oauth2-geonode</module>