File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed
java-shared-dependencies/third-party-dependencies Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 1919#
2020# The default upper-bound dependencies file is `dependencies.txt` located in the root
2121# of sdk-platform-java. The upper-bound dependencies file will be in the format of:
22- # ${dependency.name}=${dependency. version}
22+ # {groupId}:{artifactId}={version} or {artifactId}={ version}
2323
2424set -ex
2525
@@ -36,7 +36,10 @@ function add_dependency_to_maven_command() {
3636 echo " Malformed dependency string: ${dep_pair} . Expected format: dependency=version"
3737 exit 1
3838 fi
39- local dependency=$( echo " ${dep_pair} " | cut -d' =' -f1 | tr -d ' [:space:]' )
39+ local full_dependency=$( echo " ${dep_pair} " | cut -d' =' -f1 | tr -d ' [:space:]' )
40+ # The dependency can be in the format of {groupId}:{artifactId} or {artifactId}
41+ # We only want the artifactId
42+ local dependency=$( echo " ${full_dependency} " | awk -F' :' ' {print $NF}' )
4043 local version=$( echo " ${dep_pair} " | cut -d' =' -f2 | sed ' s/^[[:space:]]*//;s/[[:space:]]*$//' )
4144 MAVEN_COMMAND+=" -D${dependency} .version=${version} "
4245}
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ com.fasterxml.jackson:jackson-bom=2.19.2
3333commons-codec:commons-codec=1.19.0
3434org.apache.httpcomponents:httpclient=4.5.14
3535org.apache.httpcomponents:httpcore=4.4.16
36- org.apache.httpcomponents.client5:httpclient5-5 =5.5
36+ org.apache.httpcomponents.client5:httpclient5=5.5
3737org.apache.httpcomponents.core5:httpcore5=5.3.4
3838io.perfmark:perfmark-api=0.27.0
3939# Note: This is the google opentelemetry exporter and not the general opentelemetry project
Original file line number Diff line number Diff line change 3232 <commons-codec .version>1.18.0</commons-codec .version>
3333 <httpcore .version>4.4.16</httpcore .version>
3434 <httpclient .version>4.5.14</httpclient .version>
35- <httpclient5-5 .version>5.3.1</httpclient5-5 .version>
3635 <httpcore5 .version>5.2.5</httpcore5 .version>
36+ <httpclient5 .version>5.3.1</httpclient5 .version>
3737 <!-- ensure checker-qual version matches what Guava uses -->
3838 <checker-qual .version>3.49.0</checker-qual .version>
3939 <perfmark-api .version>0.27.0</perfmark-api .version>
8383 <dependency >
8484 <groupId >org.apache.httpcomponents.client5</groupId >
8585 <artifactId >httpclient5</artifactId >
86- <version >${httpclient5-5 .version} </version >
86+ <version >${httpclient5.version} </version >
8787 </dependency >
8888 <dependency >
8989 <groupId >org.threeten</groupId >
You can’t perform that action at this time.
0 commit comments