Skip to content

Commit ec1d719

Browse files
committed
Sync poms III
1 parent 192da44 commit ec1d719

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

sessionize-java-client-demo/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>com.xdev-software</groupId>
8-
<<<<<<<< HEAD:sessionize-java-client-demo/pom.xml
98
<artifactId>sessionize-java-client-demo</artifactId>
109
<version>1.0.1-SNAPSHOT</version>
11-
========
12-
<artifactId>openapi-client-maven-template-demo</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
14-
>>>>>>>> origin/update-from-template:openapi-client-maven-template-demo/pom.xml
1510
<packaging>jar</packaging>
1611

1712
<inceptionYear>2022</inceptionYear>
@@ -36,11 +31,7 @@
3631
<dependencies>
3732
<dependency>
3833
<groupId>com.xdev-software</groupId>
39-
<<<<<<<< HEAD:sessionize-java-client-demo/pom.xml
4034
<artifactId>sessionize-java-client</artifactId>
41-
========
42-
<artifactId>openapi-client-maven-template</artifactId>
43-
>>>>>>>> origin/update-from-template:openapi-client-maven-template-demo/pom.xml
4435
<version>${project.version}</version>
4536
</dependency>
4637

sessionize-java-client/pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>com.xdev-software</groupId>
8-
<artifactId>openapi-client-maven-template</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
8+
<artifactId>sessionize-java-client</artifactId>
9+
<version>1.0.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

12-
<name>openapi-client-maven-template</name>
13-
<description>openapi-client-maven-template</description>
14-
<url>https://github.com/xdev-software/openapi-client-maven-template</url>
12+
<name>sessionize-java-client</name>
13+
<description>sessionize-java-client</description>
14+
<url>https://github.com/xdev-software/sessionize-java-client</url>
1515

1616
<scm>
17-
<url>https://github.com/xdev-software/openapi-client-maven-template</url>
18-
<connection>https://github.com/xdev-software/openapi-client-maven-template.git</connection>
17+
<url>https://github.com/xdev-software/sessionize-java-client</url>
18+
<connection>https://github.com/xdev-software/sessionize-java-client.git</connection>
1919
</scm>
2020

2121
<inceptionYear>2023</inceptionYear>
@@ -287,8 +287,7 @@
287287
<properties>
288288
<basePackage>software.xdev.INSERT_NAME_HERE</basePackage>
289289

290-
<generatedDirRelative>src/generated/java</generatedDirRelative>
291-
<generatedDir>${project.basedir}/${generatedDirRelative}</generatedDir>
290+
<generatedDir>${project.basedir}/src/generated/java</generatedDir>
292291
<openApiRelativeGeneratorDir>src/gen</openApiRelativeGeneratorDir>
293292
<openApiGeneratorDir>
294293
${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir}

0 commit comments

Comments
 (0)