PAYARA-1269-Upgrade-libpam4j-to-v1.7-with-groupid-org-kohsuke (#1951) (…

…#2143)
payara · Nov 21, 2017 · 18a5cc0 · 18a5cc0
1 parent aab8170
commit 18a5cc0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/appserver/packager/external/libpam4j/pom.xml b/appserver/packager/external/libpam4j/pom.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2017] [Payara Foundation and/or its affiliates] -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
@@ -52,7 +53,7 @@
     <artifactId>libpam4j-repackaged</artifactId>
     <packaging>jar</packaging>
     <properties>
-      <libpam4j.version>3.1</libpam4j.version>
+      <libpam4j.version>3.5.0</libpam4j.version>
     </properties>
     <name>libpam4j repackaged as a module</name>
     <description>libpam4j repackaged as a module</description>
@@ -117,10 +118,10 @@
              won't package them. It is sufficient to package the wrapped jar. 
         -->
         <dependency>
-	  <groupId>org.jvnet.libpam4j</groupId>
-  	  <artifactId>libpam4j</artifactId>
-	   <version>1.3</version>
-  	  <optional>true</optional>
+            <groupId>org.kohsuke</groupId>
+            <artifactId>libpam4j</artifactId>
+            <version>1.7</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

diff --git a/appserver/packager/external/pom.xml b/appserver/packager/external/pom.xml
@@ -67,7 +67,7 @@
     <modules>
         <module>ant</module>
         <module>javadb</module>    
-	<module>jmsra</module>
+	    <module>jmsra</module>
         <module>jaxr_ra</module>
         <module>libpam4j</module>
     </modules>

diff --git a/...erver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE-WEB-PROFILE.txt b/...erver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE-WEB-PROFILE.txt
@@ -866,8 +866,9 @@ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFT
 DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------
-libpam4j 1.3
+libpam4j 1.7
 ---------------------------------------------------
+
 The MIT License
 
 Copyright (c) <year> <copyright holders>

diff --git a/appserver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE.txt b/appserver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE.txt
@@ -908,7 +908,7 @@ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFT
 DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------
-libpam4j 1.3
+libpam4j 1.7
 ---------------------------------------------------
 The MIT License