Skip to content

Commit

Permalink
Merge branch 'release/1.86'
Browse files Browse the repository at this point in the history
  • Loading branch information
circleci committed Jul 4, 2023
2 parents d6ae49b + d053f38 commit eadd99f
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 55 deletions.
50 changes: 35 additions & 15 deletions pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>no.entur</groupId>
<artifactId>schema2proto-parent</artifactId>
<version>1.85</version>
<version>1.86</version>
<packaging>pom</packaging>
<name>Schema 2 proto parent pom</name>
<description>Schema2proto - XSD schema to protobuf.</description>
Expand All @@ -15,24 +15,44 @@
<module>schema2proto-xsom</module>
</modules>
<properties>
<kotlin.version>1.8.10</kotlin.version>
<assertj.version>3.24.2</assertj.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-io.version>2.13.0</commons-io.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-text.version>1.10.0</commons-text.version>
<gson.version>2.10.1</gson.version>
<guava.version>32.1.1-jre</guava.version>
<java-diff-utils.version>4.12</java-diff-utils.version>
<jimfs.version>1.2</jimfs.version>
<junit.jupiter.version>5.9.3</junit.jupiter.version>
<junit.version>4.13.2</junit.version>
<kotlin.version>1.8.22</kotlin.version>
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-plugin-annotations.version>3.9.0</maven-plugin-annotations.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.version>3.9.0</maven.version>
<owasp-dependency-check.version>8.1.2</owasp-dependency-check.version>
<maven.version>3.9.2</maven.version>
<okio.version>3.3.0</okio.version>
<owasp-dependency-check.version>8.3.1</owasp-dependency-check.version>
<pgv-java-stub.version>0.10.1</pgv-java-stub.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.35.0</spotless.version>
<protobuf.version>3.23.3</protobuf.version>
<relaxng.version>4.0.3</relaxng.version>
<slf4j.version>2.0.7</slf4j.version>
<snakeyaml.version>1.33</snakeyaml.version>
<spotless.version>2.37.0</spotless.version>
<urnlib.version>2.0.1</urnlib.version>
<wire.version>3.7.1</wire.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
<configuration>
<organizationName>Entur</organizationName>
<inceptionYear>2019</inceptionYear>
Expand Down Expand Up @@ -65,15 +85,15 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.8.1</version>
<version>3.9.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -85,18 +105,18 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<configuration>
<deployAtEnd>true</deployAtEnd>
</configuration>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -146,7 +166,7 @@
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
<configuration>
<allowSnapshots>false</allowSnapshots>
<verbose>true</verbose>
Expand Down Expand Up @@ -252,7 +272,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
32 changes: 14 additions & 18 deletions schema2proto-lib/pom.xml
View file
Expand Up @@ -4,19 +4,15 @@
<parent>
<groupId>no.entur</groupId>
<artifactId>schema2proto-parent</artifactId>
<version>1.85</version>
<version>1.86</version>
</parent>
<artifactId>schema2proto-lib</artifactId>
<packaging>jar</packaging>
<properties>
<junit.jupiter.version>5.9.2</junit.jupiter.version>
<protobuf.version>3.22.2</protobuf.version>
</properties>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -26,22 +22,22 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.6</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.6</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>no.entur</groupId>
Expand All @@ -61,23 +57,23 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>${commons-lang3.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.5.0</version>
<version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>build.buf.protoc-gen-validate</groupId>
<artifactId>pgv-java-stub</artifactId>
<version>0.9.1</version>
<version>${pgv-java-stub.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<version>${commons-text.version}</version>
</dependency>
<dependency>
<groupId>no.entur</groupId>
Expand All @@ -87,17 +83,17 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>${gson.version}</version>
</dependency>
<dependency>
<groupId>de.slub-dresden</groupId>
<artifactId>urnlib</artifactId>
<version>2.0.1</version>
<version>${urnlib.version}</version>
</dependency>
<dependency>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils</artifactId>
<version>4.12</version>
<version>${java-diff-utils.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -128,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
<executions>
<execution>
<goals>
Expand Down
8 changes: 4 additions & 4 deletions schema2proto-maven-plugin/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>no.entur</groupId>
<artifactId>schema2proto-parent</artifactId>
<version>1.85</version>
<version>1.86</version>
</parent>
<artifactId>schema2proto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.8.1</version>
<version>${maven-plugin-annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -54,7 +54,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -114,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
19 changes: 7 additions & 12 deletions schema2proto-wire/pom.xml
View file
Expand Up @@ -4,15 +4,10 @@
<parent>
<groupId>no.entur</groupId>
<artifactId>schema2proto-parent</artifactId>
<version>1.85</version>
<version>1.86</version>
</parent>
<artifactId>schema2proto-wire</artifactId>
<packaging>jar</packaging>
<properties>
<junit.jupiter.version>5.9.2</junit.jupiter.version>
<kotlin.version>1.8.10</kotlin.version>
<wire.version>3.7.1</wire.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand All @@ -22,12 +17,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>${commons-lang3.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -38,18 +33,18 @@
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>3.3.0</version>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils</artifactId>
<version>4.12</version>
<version>${java-diff-utils.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -61,7 +56,7 @@
<dependency>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
<version>1.2</version>
<version>${jimfs.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion schema2proto-xsdproto/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>no.entur</groupId>
<artifactId>schema2proto-parent</artifactId>
<version>1.85</version>
<version>1.86</version>
</parent>
<artifactId>schema2proto-xsdproto</artifactId>
<packaging>jar</packaging>
Expand Down
9 changes: 4 additions & 5 deletions schema2proto-xsom/pom.xml
View file
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>no.entur</groupId>
<artifactId>schema2proto-parent</artifactId>
<version>1.85</version>
<version>1.86</version>
</parent>
<artifactId>schema2proto-xsom</artifactId>
<name>schema2proto-XSOM</name>
Expand All @@ -26,7 +26,6 @@
<copyright.exclude.file>${project.basedir}/copyright-exclude</copyright.exclude.file>
<copyright.template.file>${project.basedir}/copyright.txt</copyright.template.file>
<findbugs.exclude>${project.basedir}/exclude-xsom.xml</findbugs.exclude>
<relaxng.version>4.0.2</relaxng.version>
</properties>
<dependencies>
<dependency>
Expand All @@ -37,7 +36,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -89,7 +88,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>copy-relaxng-to-mp</id>
Expand All @@ -103,7 +102,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<configuration>
<rules>
<requireJavaVersion>
Expand Down

0 comments on commit eadd99f

Please sign in to comment.