Merge branch 'main' of github.com:open-component-model/ocm into maven…

…/access2

Dockerfile

@@ -6,7 +6,7 @@ FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build
 WORKDIR /src
 RUN go env -w GOMODCACHE=/root/.cache/go-build
 
-COPY go.mod go.sum ./
+COPY go.mod go.sum *.go VERSION ./
 
 ARG GO_PROXY="https://proxy.golang.org"
 ENV GOPROXY=${GO_PROXY}

cmds/ocm/pkg/output/tableoutput.go

@@ -146,7 +146,7 @@ func (this *TableProcessingOutput) Out() error {
 // a regular string comparison.
 func compareColumn(c int, vers ...bool) CompareFunction {
 	if utils.Optional(vers...) {
-		return _compareColumn(c, semverutils.Compare)
+		return _compareColumn(c, semverutils.VersionCache{}.Compare)
 	} else {
 		return _compareColumn(c, strings.Compare)
 	}

components/helminstaller/Dockerfile

@@ -3,7 +3,7 @@ ARG COMMIT EFFECTIVE_VERSION GIT_TREE_STATE
 ARG TARGETOS TARGETARCH
 
 WORKDIR /go/src/github.com/open-component-model/ocm/
-COPY go.* ./
+COPY go.* *.go VERSION ./
 COPY pkg pkg
 COPY cmds cmds
 COPY hack/generate-docs hack/generate-docs

pkg/version/version.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 
 	"github.com/Masterminds/semver/v3"
+
+	"github.com/open-component-model/ocm"
 )
 
 var (
@@ -16,6 +18,13 @@ var (
 	buildDate    = "1970-01-01T00:00:00Z"
 )
 
+func init() {
+	if gitVersion == "0.0.0-dev" {
+		// gitVersion = strings.TrimSpace(string(MustAsset("../../VERSION")))
+		gitVersion = strings.TrimSpace(ocm.Version)
+	}
+}
+
 type Info struct {
 	Major        string `json:"major"`
 	Minor        string `json:"minor"`

version.go

@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package ocm
+
+import _ "embed"
+
+//go:embed  VERSION
+var Version string