Migrate poms

Author: AB-xdev

pom.xml

@@ -32,7 +32,7 @@
 		<connection>scm:git:https://github.com/xdev-software/template-placeholder.git</connection>
 	</scm>
 
-	<inceptionYear>2026</inceptionYear>
+	<inceptionYear>2023</inceptionYear>
 
 	<organization>
 		<name>XDEV Software</name>

src/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>src</artifactId>

src/sessionize-java-client/pom.xml

@@ -4,56 +4,17 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-<<<<<<<< HEAD:sessionize-java-client/pom.xml
-	<groupId>software.xdev</groupId>
-	<artifactId>sessionize-java-client</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>sessionize-java-client</name>
-	<description>sessionize-java-client</description>
-	<url>https://github.com/xdev-software/sessionize-java-client</url>
-
-	<scm>
-		<url>https://github.com/xdev-software/sessionize-java-client</url>
-		<connection>scm:git:https://github.com/xdev-software/sessionize-java-client.git</connection>
-	</scm>
-
-	<inceptionYear>2023</inceptionYear>
-
-	<organization>
-		<name>XDEV Software</name>
-		<url>https://xdev.software</url>
-	</organization>
-
-	<developers>
-		<developer>
-			<name>XDEV Software</name>
-			<organization>XDEV Software</organization>
-			<url>https://xdev.software</url>
-		</developer>
-	</developers>
-
-	<licenses>
-		<license>
-			<name>Apache-2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-========
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>src</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>template-placeholder</artifactId>
+	<artifactId>sessionize-java-client</artifactId>
 	<packaging>jar</packaging>
 
-	<name>template-placeholder</name>
-	<description>template-placeholder</description>
->>>>>>>> origin/update-from-template-github_com_xdev-software_openapi-client-maven-template_master:src/template-placeholder/pom.xml
+	<name>sessionize-java-client</name>
+	<description>sessionize-java-client</description>
 
 	<properties>
 		<generatedDirRelative>src/generated/java</generatedDirRelative>