Skip to content

Commit

Permalink
merge poms
Browse files Browse the repository at this point in the history
  • Loading branch information
mustangxu committed Jun 1, 2024
1 parent ef9dcfc commit 4b370c6
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
21 changes: 12 additions & 9 deletions java-playground/docker/parent-pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.jayxu.playground</groupId>
<artifactId>playground-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<url>https://github.com/mustangxu/playground</url>
<name>Java coding playground</name>
<description>A playground project for all the open source projects I am interested in. Always bases on the lastest Spring Boot</description>
<description>A playground project for all the open source projects I am
interested in. Always bases on the lastest Spring Boot</description>
<contributors>
<contributor>
<name>Jay Xu</name>
Expand Down Expand Up @@ -41,13 +44,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.1</version>
<version>1.26.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.26.1</version>
<version>4.27.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.antlr</groupId>-->
Expand All @@ -73,11 +76,11 @@
<artifactId>commons-fileupload</artifactId>
<version>1.5</version>
</dependency>
<!--dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
Expand Down
1 change: 0 additions & 1 deletion java-playground/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
1 change: 0 additions & 1 deletion lambda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
</dependency>
</dependencies>
<build>
Expand Down
17 changes: 10 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.jayxu.playground</groupId>
<artifactId>playground-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<url>https://github.com/mustangxu/playground</url>
<name>Java coding playground</name>
<description>A playground project for all the open source projects I am interested in. Always bases on the lastest Spring Boot</description>
<description>A playground project for all the open source projects I am
interested in. Always bases on the lastest Spring Boot</description>
<contributors>
<contributor>
<name>Jay Xu</name>
Expand Down Expand Up @@ -73,11 +76,11 @@
<artifactId>commons-fileupload</artifactId>
<version>1.5</version>
</dependency>
<!--dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
Expand Down

0 comments on commit 4b370c6

Please sign in to comment.