Skip to content

Commit 4bfe1b0

Browse files
authored
Merge pull request #70 from wanjunlei/java
update the default java framework version to 1.0.0
2 parents 0500a97 + 9e1eaae commit 4bfe1b0

File tree

1 file changed

+7
-6
lines changed
  • cmd/java/functions_framework

1 file changed

+7
-6
lines changed

cmd/java/functions_framework/main.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ import (
3232
const (
3333
layerName = "functions-framework"
3434

35-
defaultMavenRepository = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
35+
defaultMavenRepository = "https://repo.maven.apache.org/maven2/"
3636
defaultFrameworkGroup = "dev.openfunction.functions"
3737
defaultFrameworkArtifactID = "functions-framework-invoker"
38-
defaultFrameworkVersion = "1.0.0-SNAPSHOT"
38+
defaultFrameworkVersion = "1.0.0"
3939
)
4040

4141
func main() {
@@ -239,18 +239,19 @@ func installFunctionsFramework(ctx *gcp.Context, layer *libcnb.Layer) error {
239239
}
240240

241241
artifact := fmt.Sprintf("%s-jar-with-dependencies.jar", frameworkArtifactID)
242+
version := frameworkVersion
242243
if strings.HasSuffix(frameworkVersion, "-SNAPSHOT") {
243-
version, err := getSnapshotVersion(ctx, mavenRepository, frameworkGroup, frameworkArtifactID, frameworkVersion)
244+
var err error
245+
version, err = getSnapshotVersion(ctx, mavenRepository, frameworkGroup, frameworkArtifactID, frameworkVersion)
244246
if err != nil {
245247
return err
246248
}
247-
248-
artifact = fmt.Sprintf("%s-%s-jar-with-dependencies.jar", frameworkArtifactID, version)
249249
}
250250

251+
artifact = fmt.Sprintf("%s-%s-jar-with-dependencies.jar", frameworkArtifactID, version)
251252
url := fmt.Sprintf("%s/%s/%s/%s/%s", mavenRepository, frameworkGroup, frameworkArtifactID, frameworkVersion, artifact)
252253

253-
return downloadFramework(ctx, ffName, url)
254+
return downloadFramework(ctx, ffName, strings.ReplaceAll(url, "//", "/"))
254255
}
255256

256257
func downloadFramework(ctx *gcp.Context, name, url string) error {

0 commit comments

Comments
 (0)