Merge branch 'version_4.4.1' of https://github.com/GluuFederation/oxAuth

into version_4.4.1
GluuFederation · Jul 6, 2022 · af3c1fc · af3c1fc
2 parents 7610f35 + 6675f62
commit af3c1fc
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 26 deletions.
diff --git a/Client/pom.xml b/Client/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.gluu</groupId>
 		<artifactId>oxauth</artifactId>
-		<version>4.4.1-SNAPSHOT</version>
+		<version>4.4.1.Final</version>
 	</parent>
 
 	<prerequisites>
@@ -103,13 +103,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Multi-Release>true</Multi-Release>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -142,7 +135,7 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
+							<appendAssemblyId>true</appendAssemblyId>
 							<descriptorRefs>
 								<descriptorRef>jar-with-dependencies</descriptorRef>
 							</descriptorRefs>
@@ -154,7 +147,6 @@
 									<Multi-Release>true</Multi-Release>
 								</manifestEntries>
 							</archive>
-							<finalName>${project.artifactId}-jar-with-dependencies</finalName>
 						</configuration>
 					</execution>
 
@@ -165,7 +157,7 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
+							<appendAssemblyId>true</appendAssemblyId>
 							<descriptors>
 								<descriptor>src/main/assembly/jar-without-provider-dependencies.xml</descriptor>
 							</descriptors>
@@ -177,7 +169,6 @@
 									<Multi-Release>true</Multi-Release>
 								</manifestEntries>
 							</archive>
-							<finalName>${project.artifactId}-jar-without-provider-dependencies</finalName>
 						</configuration>
 					</execution>
 				</executions>

diff --git a/Model/pom.xml b/Model/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.gluu</groupId>
 		<artifactId>oxauth</artifactId>
-		<version>4.4.1-SNAPSHOT</version>
+		<version>4.4.1.Final</version>
 	</parent>
 
 	<prerequisites>

diff --git a/Server/pom.xml b/Server/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.gluu</groupId>
 		<artifactId>oxauth</artifactId>
-		<version>4.4.1-SNAPSHOT</version>
+		<version>4.4.1.Final</version>
 	</parent>
 
 	<prerequisites>

diff --git a/common/pom.xml b/common/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.gluu</groupId>
 		<artifactId>oxauth</artifactId>
-		<version>4.4.1-SNAPSHOT</version>
+		<version>4.4.1.Final</version>
 	</parent>
 
 	<prerequisites>

diff --git a/oxAuthStatic/pom.xml b/oxAuthStatic/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.gluu</groupId>
 	<artifactId>oxauth-static</artifactId>
-	<version>4.4.1-SNAPSHOT</version>
+	<version>4.4.1.Final</version>
 	<packaging>jar</packaging>
 
 	<name>oxauth-static</name>

diff --git a/persistence-model/pom.xml b/persistence-model/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.gluu</groupId>
 		<artifactId>oxauth</artifactId>
-		<version>4.4.1-SNAPSHOT</version>
+		<version>4.4.1.Final</version>
 	</parent>
 	<artifactId>oxauth-persistence-model</artifactId>
 	<name>Persistence model</name>

diff --git a/pom.xml b/pom.xml
@@ -5,19 +5,19 @@
 	<groupId>org.gluu</groupId>
 	<artifactId>oxauth</artifactId>
 	<packaging>pom</packaging>
-	<version>4.4.1-SNAPSHOT</version>
+	<version>4.4.1.Final</version>
 	<name>oxAuth</name>
 	<url>https://www.gluu.org</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.min-version>3.3.9</maven.min-version>
 
-		<oxcore.version>4.4.1-SNAPSHOT</oxcore.version>
-		<oxeleven.version>4.4.1-SNAPSHOT</oxeleven.version>
-		<oxnotify.version>4.4.1-SNAPSHOT</oxnotify.version>
-		<oxlicense.version>4.4.1-SNAPSHOT</oxlicense.version>
-		<fido2.version>4.4.1-SNAPSHOT</fido2.version>
+		<oxcore.version>4.4.1.Final</oxcore.version>
+		<oxeleven.version>4.4.1.Final</oxeleven.version>
+		<oxnotify.version>4.4.1.Final</oxnotify.version>
+		<oxlicense.version>4.4.1.Final</oxlicense.version>
+		<fido2.version>4.4.1.Final</fido2.version>
 
 		<json.version>20180813</json.version>
 		<jackson.version>2.10.1</jackson.version>
@@ -106,7 +106,7 @@
             <dependency>
                 <groupId>org.gluu</groupId>
                 <artifactId>gluu-core-bom</artifactId>
-                <version>4.4.1-SNAPSHOT</version>
+                <version>4.4.1.Final</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -554,7 +554,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>2.5.1</version>
+					<version>3.0.0-M1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>

diff --git a/server-fips/pom.xml b/server-fips/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.gluu</groupId>
 		<artifactId>oxauth</artifactId>
-		<version>4.4.1-SNAPSHOT</version>
+		<version>4.4.1.Final</version>
 	</parent>
 
 	<prerequisites>