Commit e01988e5 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

grpc-java 1.14.0 should be used to build conductor

parent 76275594
all: grpc-java conductor clean
grpc-java:
$(MAKE) -C ../grpc-java temporary
$(MAKE) -C ../grpc-java temporary-1-14-0
clean:
$(MAKE) -C ../grpc-java clean
$(MAKE) -C ../grpc-java clean-1-14-0
conductor: conductor-config log4j-config conductor-service
tar xf mender-v2.2.0-1.tar.gz
......@@ -13,6 +13,7 @@ conductor: conductor-config log4j-config conductor-service
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-no-grpc-healthcheck.patch
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-dependencies_fix.patch
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-no_jcenter.patch
tar xf local-repo.tar.xz -C conductor-mender-v2.2.0-1
dd if=/dev/zero of=swap bs=1048576 count=1024
chmod 600 swap
......
diff -uNr conductor-mender-v2.2.0-1/build.gradle conductor-mender-v2.2.0-1-no_jcenter/build.gradle
--- conductor-mender-v2.2.0-1/build.gradle 2019-03-04 21:50:40.000000000 +1030
+++ conductor-mender-v2.2.0-1-no_jcenter/build.gradle 2022-02-08 14:51:56.356370114 +1030
@@ -1,6 +1,6 @@
+++ conductor-mender-v2.2.0-1-no_jcenter/build.gradle 2025-01-02 15:55:19.492288130 +1030
@@ -1,6 +1,9 @@
buildscript {
repositories {
- repositories {
- jcenter()
+ repositories {
+ maven {
+ url uri("local-repo")
+ }
+ mavenCentral()
}
dependencies {
@@ -25,11 +25,19 @@
@@ -25,11 +28,23 @@
apply plugin: 'eclipse'
repositories {
- jcenter()
+ maven {
+ url uri("local-repo")
+ }
+
+ mavenCentral()
// oss-candidate for -rc.* verions:
......@@ -31,3 +39,15 @@ diff -uNr conductor-mender-v2.2.0-1/build.gradle conductor-mender-v2.2.0-1-no_jc
}
}
}
diff -uNr conductor-mender-v2.2.0-1/common/build.gradle conductor-mender-v2.2.0-1-no_jcenter/common/build.gradle
--- conductor-mender-v2.2.0-1/common/build.gradle 2019-03-04 21:50:40.000000000 +1030
+++ conductor-mender-v2.2.0-1-no_jcenter/common/build.gradle 2025-01-02 15:50:04.906000000 +1030
@@ -1,5 +1,8 @@
buildscript {
repositories {
+ maven {
+ url uri("../local-repo")
+ }
jcenter()
}
dependencies {
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment