Skip to content

Commit 979c533

Browse files
ligangtyligangty
authored
Merge pull request #33 from ligangty/master
pom adjustment
2 parents e941a39 + 16f3e5f commit 979c533

File tree

5 files changed

+40
-38
lines changed

5 files changed

+40
-38
lines changed

‎core/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.commonjava.util</groupId>
2323
<artifactId>http-testserver-parent</artifactId>
24-
<version>2.1.1-SNAPSHOT</version>
24+
<version>2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

@@ -41,7 +41,6 @@
4141
<dependency>
4242
<groupId>org.jboss.logging</groupId>
4343
<artifactId>jboss-logging</artifactId>
44-
<version>3.4.0.Final</version>
4544
</dependency>
4645
<dependency>
4746
<groupId>org.jboss.spec.javax.servlet</groupId>
@@ -54,12 +53,10 @@
5453
<dependency>
5554
<groupId>org.slf4j</groupId>
5655
<artifactId>slf4j-api</artifactId>
57-
<version>${slf4j.versoin}</version>
5856
</dependency>
5957
<dependency>
6058
<groupId>org.slf4j</groupId>
6159
<artifactId>jcl-over-slf4j</artifactId>
62-
<version>${slf4j.versoin}</version>
6360
</dependency>
6461
<dependency>
6562
<groupId>commons-lang</groupId>

‎junit4/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.commonjava.util</groupId>
2323
<artifactId>http-testserver-parent</artifactId>
24-
<version>2.1.1-SNAPSHOT</version>
24+
<version>2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

@@ -33,12 +33,10 @@
3333
<dependency>
3434
<groupId>org.commonjava.util</groupId>
3535
<artifactId>http-testserver-core</artifactId>
36-
<version>2.1.1-SNAPSHOT</version>
3736
</dependency>
3837
<dependency>
3938
<groupId>junit</groupId>
4039
<artifactId>junit</artifactId>
41-
<version>4.13.2</version>
4240
<scope>compile</scope>
4341
</dependency>
4442
</dependencies>

‎junit5/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.commonjava.util</groupId>
2323
<artifactId>http-testserver-parent</artifactId>
24-
<version>2.1.1-SNAPSHOT</version>
24+
<version>2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

@@ -33,18 +33,15 @@
3333
<dependency>
3434
<groupId>org.commonjava.util</groupId>
3535
<artifactId>http-testserver-core</artifactId>
36-
<version>2.1.1-SNAPSHOT</version>
3736
</dependency>
3837
<dependency>
3938
<groupId>org.junit.jupiter</groupId>
4039
<artifactId>junit-jupiter</artifactId>
41-
<version>5.9.2</version>
4240
<scope>compile</scope>
4341
</dependency>
4442
<dependency>
4543
<groupId>org.hamcrest</groupId>
4644
<artifactId>hamcrest</artifactId>
47-
<version>2.2</version>
4845
<scope>test</scope>
4946
</dependency>
5047
</dependencies>

‎pom.xml‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
limitations under the License.
1616
1717
-->
18-
<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/xsd/maven-4.0.0.xsd">
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1920
<modelVersion>4.0.0</modelVersion>
2021
<parent>
2122
<groupId>org.commonjava</groupId>
@@ -25,29 +26,37 @@
2526

2627
<groupId>org.commonjava.util</groupId>
2728
<artifactId>http-testserver-parent</artifactId>
28-
<version>2.1.1-SNAPSHOT</version>
29+
<version>2.2-SNAPSHOT</version>
2930
<packaging>pom</packaging>
3031

3132
<name>http-testserver</name>
3233
<inceptionYear>2011-2022</inceptionYear>
33-
34+
3435
<scm>
3536
<connection>scm:git:https://github.com/Commonjava/http-testserver</connection>
3637
<developerConnection>scm:git:https://github.com/Commonjava/http-testserver</developerConnection>
3738
<url>https://github.com/Commonjava/http-testserver</url>
3839
<tag>HEAD</tag>
3940
</scm>
40-
41+
4142
<properties>
4243
<projectOwner>Red Hat, Inc.</projectOwner>
4344
<projectEmail>https://github.com/Commonjava/http-testserver</projectEmail>
4445
<javaVersion>11</javaVersion>
4546
<undertowVersion>2.2.26.Final</undertowVersion>
4647
<slf4j.versoin>1.7.25</slf4j.versoin>
48+
<quarkus.version>2.16.11.Final</quarkus.version>
4749
</properties>
4850

4951
<dependencyManagement>
5052
<dependencies>
53+
<dependency>
54+
<groupId>io.quarkus</groupId>
55+
<artifactId>quarkus-bom</artifactId>
56+
<version>${quarkus.version}</version>
57+
<type>pom</type>
58+
<scope>import</scope>
59+
</dependency>
5160
<dependency>
5261
<groupId>org.commonjava.boms</groupId>
5362
<artifactId>web-commons-bom</artifactId>
@@ -70,9 +79,29 @@
7079
<artifactId>jboss-logging</artifactId>
7180
<version>3.4.0.Final</version>
7281
</dependency>
82+
<dependency>
83+
<groupId>junit</groupId>
84+
<artifactId>junit</artifactId>
85+
<version>4.13.2</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.junit.jupiter</groupId>
89+
<artifactId>junit-jupiter</artifactId>
90+
<version>5.9.2</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.hamcrest</groupId>
94+
<artifactId>hamcrest</artifactId>
95+
<version>2.2</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.commonjava.util</groupId>
99+
<artifactId>http-testserver-core</artifactId>
100+
<version>2.2-SNAPSHOT</version>
101+
</dependency>
73102
</dependencies>
74103
</dependencyManagement>
75-
104+
76105
<modules>
77106
<module>core</module>
78107
<module>junit4</module>

‎quarkus/pom.xml‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.commonjava.util</groupId>
2424
<artifactId>http-testserver-parent</artifactId>
25-
<version>2.1.1-SNAPSHOT</version>
25+
<version>2.2-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
@@ -32,46 +32,27 @@
3232
<quarkus.version>2.16.11.Final</quarkus.version>
3333
</properties>
3434

35-
<dependencyManagement>
36-
<dependencies>
37-
<dependency>
38-
<groupId>io.quarkus</groupId>
39-
<artifactId>quarkus-bom</artifactId>
40-
<version>${quarkus.version}</version>
41-
<type>pom</type>
42-
<scope>import</scope>
43-
</dependency>
44-
</dependencies>
45-
</dependencyManagement>
46-
4735
<dependencies>
4836
<dependency>
4937
<groupId>org.commonjava.util</groupId>
5038
<artifactId>http-testserver-core</artifactId>
51-
<version>2.1.1-SNAPSHOT</version>
5239
</dependency>
5340
<dependency>
5441
<groupId>org.junit.jupiter</groupId>
5542
<artifactId>junit-jupiter</artifactId>
56-
<version>5.9.2</version>
5743
<scope>compile</scope>
5844
</dependency>
5945
<dependency>
6046
<groupId>io.quarkus</groupId>
61-
<artifactId>quarkus-arc-deployment</artifactId>
62-
</dependency>
63-
<dependency>
64-
<groupId>io.quarkus</groupId>
65-
<artifactId>quarkus-mutiny</artifactId>
47+
<artifactId>quarkus-junit5</artifactId>
6648
</dependency>
6749
<dependency>
6850
<groupId>io.quarkus</groupId>
69-
<artifactId>quarkus-junit5</artifactId>
51+
<artifactId>quarkus-arc-deployment</artifactId>
7052
</dependency>
7153
<dependency>
7254
<groupId>org.hamcrest</groupId>
7355
<artifactId>hamcrest</artifactId>
74-
<version>2.2</version>
7556
<scope>test</scope>
7657
</dependency>
7758
</dependencies>

0 commit comments

Comments
 (0)