Skip to content

Commit aa5038c

Browse files
authored
chore: fixing library release date retrieval script (#5892)
chore: fixing script
1 parent 2e77ef2 commit aa5038c

File tree

3 files changed

+29
-16
lines changed

3 files changed

+29
-16
lines changed

.kokoro/nightly/create-versions-csv.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
# Fail on any error.
1010
set -e
1111
# Display commands being run.
12-
#set -x
12+
set -x
1313

14-
cd github/java-cloud-bom/libraries-release-data
14+
cd github/java-cloud-bom
1515

16-
# M2_HOME is not used since Maven 3.5.0 https://maven.apache.org/docs/3.5.0/release-notes.html
1716
mvn -B clean install
1817

18+
cd libraries-release-data
19+
20+
mvn compile
21+
1922
list=$(mvn -B exec:java -Dexec.mainClass="com.google.cloud.dashboard.GenerateLibrariesList")
2023

2124

@@ -28,10 +31,7 @@ sort unfiltered-libraries.txt | uniq > libraries.txt
2831
rm -f unfiltered-libraries.txt
2932

3033

31-
cd github/java-cloud-bom
32-
33-
34-
cat libraries-release-data/libraries.txt | while read line; do
34+
cat libraries.txt | while read line; do
3535

3636
group_id=${line%:*}
3737
artifact_id=${line#*:}
@@ -44,17 +44,17 @@ cat libraries-release-data/libraries.txt | while read line; do
4444

4545
URL=https://repo1.maven.org/maven2/$new_group_id/$artifact_id
4646

47-
.kokoro/nightly/fetch-library-data.sh $URL $artifact_id $service_name
47+
../.kokoro/nightly/fetch-library-data.sh $URL $artifact_id $service_name
4848

4949
done
5050

51-
rm -f libraries-release-data/libraries.txt
51+
rm -f libraries.txt
5252

53-
sed 's/ \+/,/g' cloud_java_client_library_release_dates_tsv.txt > ./cloud_java_client_library_release_dates.csv
54-
sed -i '1s/^/version,release_date,artifact_id,service_name\n/' ./cloud_java_client_library_release_dates.csv
53+
sed 's/ \+/,/g' cloud_java_client_library_release_dates_tsv.txt > cloud_java_client_library_release_dates.csv
54+
sed -i '1s/^/version,release_date,artifact_id,service_name\n/' cloud_java_client_library_release_dates.csv
5555

5656
echo "Inserting client_library_versions.cloud_java_client_library_release_dates. First 10 lines:"
57-
head ./cloud_java_client_library_release_dates.csv
57+
head cloud_java_client_library_release_dates.csv
5858
echo "===================="
5959

6060
bq load --autodetect --project_id=cloud-java-metrics --source_format=CSV \

libraries-release-data/pom.xml

+17-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
56
<parent>
67
<artifactId>java-cloud-bom-root</artifactId>
78
<groupId>com.google.cloud</groupId>
89
<version>0.1.0</version>
910
</parent>
10-
<modelVersion>4.0.0</modelVersion>
11-
1211
<artifactId>libraries-release-data</artifactId>
1312
<dependencies>
1413
<dependency>
@@ -20,8 +19,22 @@
2019
</dependencies>
2120

2221
<properties>
23-
<maven.compiler.source>11</maven.compiler.source>
24-
<maven.compiler.target>11</maven.compiler.target>
22+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23+
<maven.compiler.source>1.8</maven.compiler.source>
24+
<maven.compiler.target>1.8</maven.compiler.target>
2525
</properties>
2626

27+
<build>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.codehaus.mojo</groupId>
31+
<artifactId>exec-maven-plugin</artifactId>
32+
<configuration>
33+
<skip>false</skip>
34+
<mainClass>com.google.cloud.dashboard.GenerateLibrariesList</mainClass>
35+
</configuration>
36+
</plugin>
37+
</plugins>
38+
</build>
39+
2740
</project>

0 commit comments

Comments
 (0)