Skip to content

Commit c450e7c

Browse files
LinkinStarsLinkinStars
committed
Merge branch 'dev' into test
# Conflicts: # internal/service/user_admin/user_backyard.go
2 parents ac8d027 + 47c6662 commit c450e7c

File tree

294 files changed

+1652
-1647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+1652
-1647
lines changed

‎.goreleaser.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ builds:
3434
- id: build
3535
main: ./cmd/answer/.
3636
binary: answer
37-
ldflags: -s -w -X github.com/apache/incubator-answer/cmd.Version={{.RawVersion}} -X github.com/apache/incubator-answer/cmd.Revision={{.ShortCommit}} -X github.com/apache/incubator-answer/cmd.Time={{.Date}} -X github.com/apache/incubator-answer/cmd.BuildUser=goreleaser
37+
ldflags: -s -w -X github.com/apache/answer/cmd.Version={{.RawVersion}} -X github.com/apache/answer/cmd.Revision={{.ShortCommit}} -X github.com/apache/answer/cmd.Time={{.Date}} -X github.com/apache/answer/cmd.BuildUser=goreleaser
3838
flags: -v
3939
goos:
4040
- linux
@@ -45,7 +45,7 @@ builds:
4545
- id: build-windows
4646
main: ./cmd/answer/.
4747
binary: answer
48-
ldflags: -s -w -X github.com/apache/incubator-answer/cmd.Version={{.RawVersion}} -X github.com/apache/incubator-answer/cmd.Revision={{.ShortCommit}} -X github.com/apache/incubator-answer/cmd.Time={{.Date}} -X github.com/apache/incubator-answer/cmd.BuildUser=goreleaser
48+
ldflags: -s -w -X github.com/apache/answer/cmd.Version={{.RawVersion}} -X github.com/apache/answer/cmd.Revision={{.ShortCommit}} -X github.com/apache/answer/cmd.Time={{.Date}} -X github.com/apache/answer/cmd.BuildUser=goreleaser
4949
flags: -v
5050
goos:
5151
- windows
@@ -57,7 +57,7 @@ builds:
5757

5858
archives:
5959
- name_template: >-
60-
apache-answer-{{ .RawVersion }}-incubating-bin-{{ .Os }}-{{ .Arch }}
60+
apache-answer-{{ .RawVersion }}-bin-{{ .Os }}-{{ .Arch }}
6161
files:
6262
- src: "docs/release/LICENSE"
6363
dst: LICENSE
@@ -81,8 +81,8 @@ changelog:
8181

8282
source:
8383
enabled: true
84-
name_template: apache-answer-{{ .RawVersion }}-incubating-src
85-
prefix_template: "apache-answer-{{ .RawVersion }}-incubating-src/"
84+
name_template: apache-answer-{{ .RawVersion }}-src
85+
prefix_template: "apache-answer-{{ .RawVersion }}-src/"
8686

8787
# goreleaser release --skip-validate --skip-publish --clean
8888

‎.vaunt/config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ version: 0.0.1
1919
achievements:
2020
- achievement:
2121
name: Visionary Architect
22-
icon: https://raw.githubusercontent.com/apache/incubator-answer/main/.vaunt/enhancement.png
22+
icon: https://raw.githubusercontent.com/apache/answer/main/.vaunt/enhancement.png
2323
description: Awarded for bringing up enhancement, dream big!
2424
triggers:
2525
- trigger:
@@ -28,7 +28,7 @@ achievements:
2828
condition: labels in ['enhancement'] & labels in ['LGTM']
2929
- achievement:
3030
name: Bug Hunter
31-
icon: https://raw.githubusercontent.com/apache/incubator-answer/main/.vaunt/bug.png
31+
icon: https://raw.githubusercontent.com/apache/answer/main/.vaunt/bug.png
3232
description: Awarded for identifying real bugs, well spotted!
3333
triggers:
3434
- trigger:

‎DISCLAIMER

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Apache Answer (incubating) is an effort undergoing incubation at the Apache
1+
Apache Answer is an effort undergoing incubation at the Apache
22
Software Foundation (ASF), sponsored by the Apache Incubator PMC.
33

44
Incubation is required of all newly accepted projects until a further review

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ARG GOPROXY
2424

2525
ENV GOPATH /go
2626
ENV GOROOT /usr/local/go
27-
ENV PACKAGE github.com/apache/incubator-answer
27+
ENV PACKAGE github.com/apache/answer
2828
ENV BUILD_DIR ${GOPATH}/src/${PACKAGE}
2929
ENV ANSWER_MODULE ${BUILD_DIR}
3030

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DOCKER_CMD=docker
77

88
GO_ENV=CGO_ENABLED=0 GO111MODULE=on
99
Revision=$(shell git rev-parse --short HEAD 2>/dev/null || echo "")
10-
GO_FLAGS=-ldflags="-X github.com/apache/incubator-answer/cmd.Version=$(VERSION) -X 'github.com/apache/incubator-answer/cmd.Revision=$(Revision)' -X 'github.com/apache/incubator-answer/cmd.Time=`date +%s`' -extldflags -static"
10+
GO_FLAGS=-ldflags="-X github.com/apache/answer/cmd.Version=$(VERSION) -X 'github.com/apache/answer/cmd.Revision=$(Revision)' -X 'github.com/apache/answer/cmd.Time=`date +%s`' -extldflags -static"
1111
GO=$(GO_ENV) "$(shell which go)"
1212

1313
build: generate

‎NOTICE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Apache Answer (incubating)
2-
Copyright 2023-2024 The Apache Software Foundation
1+
Apache Answer
2+
Copyright 2023-2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (https://www.apache.org/).

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ A Q&A platform software for teams at any scales. Whether it’s a community foru
88

99
To learn more about the project, visit [answer.apache.org](https://answer.apache.org).
1010

11-
[![LICENSE](https://img.shields.io/github/license/apache/incubator-answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE)
11+
[![LICENSE](https://img.shields.io/github/license/apache/answer)](https://github.com/apache/answer/blob/main/LICENSE)
1212
[![Language](https://img.shields.io/badge/language-go-blue.svg)](https://golang.org/)
1313
[![Language](https://img.shields.io/badge/language-react-blue.svg)](https://reactjs.org/)
14-
[![Go Report Card](https://goreportcard.com/badge/github.com/apache/incubator-answer)](https://goreportcard.com/report/github.com/apache/incubator-answer)
14+
[![Go Report Card](https://goreportcard.com/badge/github.com/apache/answer)](https://goreportcard.com/report/github.com/apache/answer)
1515
[![Discord](https://img.shields.io/badge/discord-chat-5865f2?logo=discord&logoColor=f5f5f5)](https://discord.gg/Jm7Y4cbUej)
1616

1717
## Screenshots
@@ -65,4 +65,4 @@ See [CONTRIBUTING](https://answer.apache.org/community/contributing) for ways to
6565

6666
## License
6767

68-
[Apache License 2.0](https://github.com/apache/incubator-answer/blob/main/LICENSE)
68+
[Apache License 2.0](https://github.com/apache/answer/blob/main/LICENSE)

‎cmd/answer/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
package main
2323

2424
import (
25-
answercmd "github.com/apache/incubator-answer/cmd"
25+
answercmd "github.com/apache/answer/cmd"
2626
)
2727

2828
// main godoc

‎cmd/command.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
"os"
2525
"strings"
2626

27-
"github.com/apache/incubator-answer/internal/base/conf"
28-
"github.com/apache/incubator-answer/internal/cli"
29-
"github.com/apache/incubator-answer/internal/install"
30-
"github.com/apache/incubator-answer/internal/migrations"
31-
"github.com/apache/incubator-answer/plugin"
27+
"github.com/apache/answer/internal/base/conf"
28+
"github.com/apache/answer/internal/cli"
29+
"github.com/apache/answer/internal/install"
30+
"github.com/apache/answer/internal/migrations"
31+
"github.com/apache/answer/plugin"
3232
"github.com/segmentfault/pacman/log"
3333
"github.com/spf13/cobra"
3434
)

‎cmd/main.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ import (
2525
"os"
2626
"time"
2727

28-
"github.com/apache/incubator-answer/internal/base/conf"
29-
"github.com/apache/incubator-answer/internal/base/constant"
30-
"github.com/apache/incubator-answer/internal/base/cron"
31-
"github.com/apache/incubator-answer/internal/cli"
32-
"github.com/apache/incubator-answer/internal/schema"
28+
"github.com/apache/answer/internal/base/conf"
29+
"github.com/apache/answer/internal/base/constant"
30+
"github.com/apache/answer/internal/base/cron"
31+
"github.com/apache/answer/internal/cli"
32+
"github.com/apache/answer/internal/schema"
3333
"github.com/gin-gonic/gin"
3434
"github.com/segmentfault/pacman"
3535
"github.com/segmentfault/pacman/contrib/log/zap"
3636
"github.com/segmentfault/pacman/contrib/server/http"
3737
"github.com/segmentfault/pacman/log"
3838
)
3939

40-
// go build -ldflags "-X github.com/apache/incubator-answer/cmd.Version=x.y.z"
40+
// go build -ldflags "-X github.com/apache/answer/cmd.Version=x.y.z"
4141
var (
4242
// Name is the name of the project
4343
Name = "answer"

‎cmd/wire.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
package answercmd
2626

2727
import (
28-
"github.com/apache/incubator-answer/internal/base/conf"
29-
"github.com/apache/incubator-answer/internal/base/cron"
30-
"github.com/apache/incubator-answer/internal/base/data"
31-
"github.com/apache/incubator-answer/internal/base/middleware"
32-
"github.com/apache/incubator-answer/internal/base/server"
33-
"github.com/apache/incubator-answer/internal/base/translator"
34-
"github.com/apache/incubator-answer/internal/controller"
35-
"github.com/apache/incubator-answer/internal/controller/template_render"
36-
"github.com/apache/incubator-answer/internal/controller_admin"
37-
"github.com/apache/incubator-answer/internal/repo"
38-
"github.com/apache/incubator-answer/internal/router"
39-
"github.com/apache/incubator-answer/internal/service"
40-
"github.com/apache/incubator-answer/internal/service/service_config"
28+
"github.com/apache/answer/internal/base/conf"
29+
"github.com/apache/answer/internal/base/cron"
30+
"github.com/apache/answer/internal/base/data"
31+
"github.com/apache/answer/internal/base/middleware"
32+
"github.com/apache/answer/internal/base/server"
33+
"github.com/apache/answer/internal/base/translator"
34+
"github.com/apache/answer/internal/controller"
35+
"github.com/apache/answer/internal/controller/template_render"
36+
"github.com/apache/answer/internal/controller_admin"
37+
"github.com/apache/answer/internal/repo"
38+
"github.com/apache/answer/internal/router"
39+
"github.com/apache/answer/internal/service"
40+
"github.com/apache/answer/internal/service/service_config"
4141
"github.com/google/wire"
4242
"github.com/segmentfault/pacman"
4343
"github.com/segmentfault/pacman/log"

‎cmd/wire_gen.go

+85-85
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/release/NOTICE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Apache Answer (incubating)
2-
Copyright 2024 The Apache Software Foundation
1+
Apache Answer
2+
Copyright 2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (https://www.apache.org/).

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
module github.com/apache/incubator-answer
18+
module github.com/apache/answer
1919

2020
go 1.22.0
2121

0 commit comments

Comments
 (0)