Skip to content

Commit edaa448

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents d07507d + 956fbca commit edaa448

File tree

5 files changed

+508
-2
lines changed

5 files changed

+508
-2
lines changed

‎.run/Run Demo.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
<option name="Make" enabled="true" />
1414
</method>
1515
</configuration>
16-
</component>
16+
</component>

‎openapi-client-maven-template-demo/pom.xml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>com.xdev-software</groupId>
8+
<<<<<<<< HEAD:sessionize-java-client-demo/pom.xml
9+
<artifactId>sessionize-java-client-demo</artifactId>
10+
<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
15+
<packaging>jar</packaging>
16+
17+
<inceptionYear>2022</inceptionYear>
18+
19+
<organization>
20+
<name>XDEV Software</name>
21+
<url>https://xdev.software</url>
22+
</organization>
23+
24+
<properties>
25+
<javaVersion>17</javaVersion>
26+
<maven.compiler.release>${javaVersion}</maven.compiler.release>
27+
28+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
30+
31+
<mainClass>software.xdev.Application</mainClass>
32+
33+
<log4j2-version>2.20.0</log4j2-version>
34+
</properties>
35+
36+
<dependencies>
37+
<dependency>
38+
<groupId>com.xdev-software</groupId>
39+
<<<<<<<< HEAD:sessionize-java-client-demo/pom.xml
40+
<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
44+
<version>${project.version}</version>
45+
</dependency>
46+
47+
<!-- Logging -->
48+
<!-- SLF4J comes from Apache Httpclient -->
49+
<dependency>
50+
<groupId>org.apache.logging.log4j</groupId>
51+
<artifactId>log4j-core</artifactId>
52+
<version>${log4j2-version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.apache.logging.log4j</groupId>
56+
<artifactId>log4j-slf4j-impl</artifactId>
57+
<version>${log4j2-version}</version>
58+
</dependency>
59+
</dependencies>
60+
61+
<build>
62+
<finalName>${project.artifactId}</finalName>
63+
64+
<plugins>
65+
<plugin>
66+
<groupId>org.apache.maven.plugins</groupId>
67+
<artifactId>maven-compiler-plugin</artifactId>
68+
<version>3.11.0</version>
69+
<configuration>
70+
<release>${maven.compiler.release}</release>
71+
<compilerArgs>
72+
<arg>-proc:none</arg>
73+
</compilerArgs>
74+
</configuration>
75+
</plugin>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-assembly-plugin</artifactId>
79+
<version>3.6.0</version>
80+
<configuration>
81+
<archive>
82+
<manifest>
83+
<mainClass>${mainClass}</mainClass>
84+
</manifest>
85+
<manifestEntries>
86+
<Multi-Release>true</Multi-Release>
87+
</manifestEntries>
88+
</archive>
89+
<descriptorRefs>
90+
<descriptorRef>jar-with-dependencies</descriptorRef>
91+
</descriptorRefs>
92+
<appendAssemblyId>false</appendAssemblyId>
93+
</configuration>
94+
<executions>
95+
<execution>
96+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
97+
<phase>package</phase> <!-- bind to the packaging phase -->
98+
<goals>
99+
<goal>single</goal>
100+
</goals>
101+
</execution>
102+
</executions>
103+
</plugin>
104+
</plugins>
105+
</build>
106+
</project>

0 commit comments

Comments
 (0)