Skip to content

Commit

Permalink
Manual merge of pom.xmls
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Jan 22, 2025
1 parent ddd1b43 commit aeb70d8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 19 deletions.
12 changes: 0 additions & 12 deletions guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,6 @@ com.google.common.*;version="${version.guava.osgi}",
<artifactId>guava</artifactId>
<version>${version.guava}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion pcollections/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ PCollections (http://pcollections.org/) types
</contributors>

<properties>
<version.pcollections>4.0.1</version.pcollections>
<version.pcollections>4.0.2</version.pcollections>

<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>tools/jackson/datatype/pcollections</packageVersion.dir>
Expand Down
5 changes: 4 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down Expand Up @@ -134,7 +138,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-test-sources</id>
Expand Down
5 changes: 0 additions & 5 deletions primitive-collections-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,4 @@
<email>[email protected]</email>
</contributor>
</contributors>

<build>
<plugins>
</plugins>
</build>
</project>

0 comments on commit aeb70d8

Please sign in to comment.