File tree Expand file tree Collapse file tree 2 files changed +5
-29
lines changed Expand file tree Collapse file tree 2 files changed +5
-29
lines changed Original file line number Diff line number Diff line change @@ -74,11 +74,11 @@ RUN powershell Invoke-WebRequest -Uri https://github.com/facebook/zstd/releases/
7474RUN powershell Expand-Archive -Path $Env:TEMP\zstd-v1.5.4-win64.zip -DestinationPath "C:\ZStd"
7575RUN setx PATH "%PATH%;C:\ZStd"
7676
77- # Install libopenssl 3.1.1 needed for rsync 3.2.7.
78- RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libopenssl-3.1.2 -1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libopenssl-3.1.2 -1-x86_64.pkg.tar.zst
79- RUN powershell zstd -d $Env:TEMP\libopenssl-3.1.2 -1-x86_64.pkg.tar.zst -o $Env:TEMP\libopenssl-3.1.1 -1-x86_64.pkg.tar
77+ # Install libopenssl 3.1.4 needed for rsync 3.2.7.
78+ RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libopenssl-3.1.4 -1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libopenssl-3.1.4 -1-x86_64.pkg.tar.zst
79+ RUN powershell zstd -d $Env:TEMP\libopenssl-3.1.4 -1-x86_64.pkg.tar.zst -o $Env:TEMP\libopenssl-3.1.4 -1-x86_64.pkg.tar
8080RUN powershell mkdir "C:\LibOpenSSL"
81- RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.1 -1-x86_64.pkg.tar -C "C:\LibOpenSSL"
81+ RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.4 -1-x86_64.pkg.tar -C "C:\LibOpenSSL"
8282
8383# Install libxxhash 0.8.3 needed for rsync 3.2.7.
8484RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libxxhash-0.8.3-1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libxxhash-0.8.3-1-x86_64.pkg.tar.zst
Original file line number Diff line number Diff line change 154154
155155 <protobuf-compile .version>3.5.1</protobuf-compile .version>
156156 <grpc .version>1.10.0</grpc .version>
157- <os-maven-plugin .version>1.7.0 </os-maven-plugin .version>
157+ <os-maven-plugin .version>1.7.1 </os-maven-plugin .version>
158158
159159 <!-- define the Java language version used by the compiler -->
160160 <javac .version>1.8</javac .version>
25792579 </build >
25802580
25812581 <profiles >
2582- <profile >
2583- <id >os.linux</id >
2584- <activation >
2585- <os >
2586- <family >!Mac</family >
2587- </os >
2588- </activation >
2589- <properties >
2590- <build .platform>${os.name} -${os.arch} -${sun.arch.data.model} </build .platform>
2591- </properties >
2592- </profile >
2593- <profile >
2594- <id >os.mac</id >
2595- <activation >
2596- <os >
2597- <family >Mac</family >
2598- </os >
2599- </activation >
2600- <properties >
2601- <build .platform>Mac_OS_X-${sun.arch.data.model} </build .platform>
2602- <!-- To make protoc work on Apple Silicon via fallback -->
2603- <os .detected.classifier>osx-x86_64</os .detected.classifier>
2604- </properties >
2605- </profile >
26062582 <profile >
26072583 <id >native-win</id >
26082584 <activation >
You can’t perform that action at this time.
0 commit comments