Skip to content

Commit

Permalink
Upgraded to protoc 3.6.1 in integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergei-ivanov
sergei-ivanov committed Sep 30, 2018
1 parent d2b2450 commit 435ba06
Show file tree
Hide file tree
Showing 56 changed files with 248 additions and 538 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install:
# Download all dependencies that integration tests might need later
# These include protoc and grpc plugin executables being referenced in toolchains.xml
- cmd: mvnw.cmd -B -V -Dstyle.color=always -Djansi.passthrough=true dependency:go-offline -f src/it/dependencies/pom.xml -P protoc-3.4.0
- cmd: mvnw.cmd -B -V -Dstyle.color=always -Djansi.passthrough=true dependency:go-offline -f src/it/dependencies/pom.xml -P protoc-3.5.1
- cmd: mvnw.cmd -B -V -Dstyle.color=always -Djansi.passthrough=true dependency:go-offline -f src/it/dependencies/pom.xml -P protoc-3.6.1
- cmd: mvnw.cmd -B -V -Dstyle.color=always -Djansi.passthrough=true dependency:go-offline -P run-its

build_script:
Expand Down
4 changes: 2 additions & 2 deletions .appveyor/toolchains.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
<toolchain>
<type>protobuf</type>
<provides>
<version>3.5.1</version>
<version>3.6.1</version>
</provides>
<configuration>
<protocExecutable>
C:/Users/appveyor/.m2/repository/com/google/protobuf/protoc/3.5.1/protoc-3.5.1-windows-x86_64.exe
C:/Users/appveyor/.m2/repository/com/google/protobuf/protoc/3.6.1/protoc-3.6.1-windows-x86_64.exe
</protocExecutable>
</configuration>
</toolchain>
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ before_install:
install:
# Download all dependencies that integration tests might need later
- ./mvnw -B -V -Dstyle.color=always dependency:go-offline -f src/it/dependencies/pom.xml -P protoc-3.4.0
- ./mvnw -B -V -Dstyle.color=always dependency:go-offline -f src/it/dependencies/pom.xml -P protoc-3.5.1
- ./mvnw -B -V -Dstyle.color=always dependency:go-offline -f src/it/dependencies/pom.xml -P protoc-3.6.1
- ./mvnw -B -V -Dstyle.color=always dependency:go-offline -P run-its

before_script:
# These protoc executables were downloaded in the previous phase and are being referenced in toolchains.xml
- chmod +x $HOME/.m2/repository/com/google/protobuf/protoc/3.4.0/protoc-3.4.0-linux-x86_64.exe
- chmod +x $HOME/.m2/repository/com/google/protobuf/protoc/3.5.1/protoc-3.5.1-linux-x86_64.exe
- chmod +x $HOME/.m2/repository/com/google/protobuf/protoc/3.6.1/protoc-3.6.1-linux-x86_64.exe

script:
# Finally, run the build with integration tests
Expand Down
4 changes: 2 additions & 2 deletions .travis/toolchains.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
<toolchain>
<type>protobuf</type>
<provides>
<version>3.5.1</version>
<version>3.6.1</version>
</provides>
<configuration>
<protocExecutable>
/home/travis/.m2/repository/com/google/protobuf/protoc/3.5.1/protoc-3.5.1-linux-x86_64.exe
/home/travis/.m2/repository/com/google/protobuf/protoc/3.6.1/protoc-3.6.1-linux-x86_64.exe
</protocExecutable>
</configuration>
</toolchain>
Expand Down
4 changes: 4 additions & 0 deletions src/it/TEST-1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@

<name>Integration Test 1</name>

<properties>
<protobufVersion>[3.4.0,3.5.0)</protobufVersion>
</properties>

<build>
<plugins>
<plugin>
Expand Down
42 changes: 14 additions & 28 deletions src/it/TEST-10/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,19 @@
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<id>protobuf-toolchain</id>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
<configuration>
<toolchains>
<protobuf>
<version>${protobufVersion}</version>
</protobuf>
</toolchains>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
1 change: 0 additions & 1 deletion src/it/TEST-10/project1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
Expand Down
1 change: 0 additions & 1 deletion src/it/TEST-10/project2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
Expand Down
42 changes: 14 additions & 28 deletions src/it/TEST-11/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,19 @@
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<id>protobuf-toolchain</id>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
<configuration>
<toolchains>
<protobuf>
<version>${protobufVersion}</version>
</protobuf>
</toolchains>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
1 change: 0 additions & 1 deletion src/it/TEST-11/project1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
Expand Down
1 change: 0 additions & 1 deletion src/it/TEST-11/project2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
Expand Down
42 changes: 14 additions & 28 deletions src/it/TEST-12/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,19 @@
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<id>protobuf-toolchain</id>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
<configuration>
<toolchains>
<protobuf>
<version>${protobufVersion}</version>
</protobuf>
</toolchains>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
1 change: 0 additions & 1 deletion src/it/TEST-12/project1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
Expand Down
1 change: 0 additions & 1 deletion src/it/TEST-12/project2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
Expand Down
26 changes: 5 additions & 21 deletions src/it/TEST-13/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,10 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<id>protobuf-toolchain</id>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
<configuration>
<toolchains>
<protobuf>
<version>${protobufVersion}</version>
</protobuf>
</toolchains>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
Expand All @@ -68,6 +47,11 @@
</goals>
</execution>
</executions>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
26 changes: 5 additions & 21 deletions src/it/TEST-14/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,10 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<id>protobuf-toolchain</id>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
<configuration>
<toolchains>
<protobuf>
<version>${protobufVersion}</version>
</protobuf>
</toolchains>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
Expand All @@ -68,6 +47,11 @@
</goals>
</execution>
</executions>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
26 changes: 5 additions & 21 deletions src/it/TEST-15/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,10 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<id>protobuf-toolchain</id>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
<configuration>
<toolchains>
<protobuf>
<version>${protobufVersion}</version>
</protobuf>
</toolchains>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
Expand All @@ -70,6 +49,11 @@
</configuration>
</execution>
</executions>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit 435ba06

Please sign in to comment.