Skip to content

Commit

Permalink
Merge branch 'release/2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
denis-yuen committed Nov 5, 2024
2 parents ee38dfa + 4e71976 commit 5670f58
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions THIRD-PARTY-LICENSES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

Lists of 26 third-party dependencies.
(Apache-2.0) Apache Avro (org.apache.avro:avro:1.11.3 - https://avro.apache.org)
(Apache-2.0) Apache Avro (org.apache.avro:avro:1.11.4 - https://avro.apache.org)
(Apache License, Version 2.0) Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/)
(Apache License, Version 2.0) Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/)
(Apache License, Version 2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.21 - https://commons.apache.org/proper/commons-compress/)
Expand All @@ -11,7 +11,7 @@ Lists of 26 third-party dependencies.
(The Apache Software License, Version 2.0) Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/)
(Apache License, Version 2.0) Apache Commons Text (org.apache.commons:commons-text:1.10.0 - https://commons.apache.org/proper/commons-text)
(The MIT License) Checker Qual (org.checkerframework:checker-qual:3.38.0 - https://checkerframework.org/)
(Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.0.4.9-SNAPSHOT - no url defined)
(Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.0.4.10-SNAPSHOT - no url defined)
(Apache 2.0) error-prone annotations (com.google.errorprone:error_prone_annotations:2.22.0 - https://errorprone.info/error_prone_annotations)
(The Apache Software License, Version 2.0) FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
(Apache-2.0) Gson (com.google.code.gson:gson:2.9.0 - https://github.com/google/gson/gson)
Expand Down
6 changes: 3 additions & 3 deletions cwlavro-generated/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>cwlavro-generated</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.0.4.10-SNAPSHOT</version>

<parent>
<groupId>io.cwl</groupId>
<artifactId>cwlavro</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.0.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.3</version>
<version>1.11.4</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
8 changes: 4 additions & 4 deletions cwlavro-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>cwlavro-tools</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.0.4.10-SNAPSHOT</version>

<parent>
<groupId>io.cwl</groupId>
<artifactId>cwlavro</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.0.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>io.cwl</groupId>
<artifactId>cwlavro-generated</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.0.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<artifactId>cwlavro</artifactId>
<name>CWL Avro</name>
<groupId>io.cwl</groupId>
<version>2.1.0-SNAPSHOT</version>
<version>2.0.4.10-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down

0 comments on commit 5670f58

Please sign in to comment.