From 7031f902f4b9054b87dc5b9e10b10ba0ec470f1d Mon Sep 17 00:00:00 2001 From: Florian Zschocke Date: Fri, 9 Dec 2022 20:05:33 +0100 Subject: [PATCH] Adjust path after moving from "gitblit" to "gitblit-org" on Github --- .gitbugtraq | 4 ++-- .github/workflows/nightly-build.yml | 4 ++-- README.markdown | 6 +++--- build.moxie | 12 ++++++------ build.xml | 14 +++++++------- src/main/distrib/data/defaults.properties | 2 +- src/main/distrib/data/groovy/youtrack-readme.md | 2 +- src/site/design.mkd | 3 +-- src/site/federation.mkd | 2 +- src/site/plugins_extensions.mkd | 2 +- src/site/plugins_overview.mkd | 2 +- src/site/releasehistory.mkd | 2 +- src/site/releases.mkd | 2 +- src/site/rpc.mkd | 2 +- src/site/setup_authentication.mkd | 6 +++--- src/site/setup_bugtraq.mkd | 2 +- src/site/setup_go.mkd | 2 +- src/site/siteindex.mkd | 2 +- src/test/config/test-ui-gitblit.properties | 2 +- 19 files changed, 36 insertions(+), 37 deletions(-) diff --git a/.gitbugtraq b/.gitbugtraq index 38fef9bd..75e2f96d 100644 --- a/.gitbugtraq +++ b/.gitbugtraq @@ -1,10 +1,10 @@ [bugtraq "issues"] - url = https://github.com/gitblit/gitblit/issues/%BUGID% + url = https://github.com/gitblit-org/gitblit/issues/%BUGID% loglinkregex = "[Ii]ssue[-#:\\s]{1}\\d+" logregex = "\\d+" loglinktext = issue-%BUGID% [bugtraq "pullrequests"] - url = "https://github.com/gitblit/gitblit/pull/%BUGID%" + url = "https://github.com/gitblit-org/gitblit/pull/%BUGID%" loglinkregex = "(?:pull request|pull|pr)\\s*[-#]?[0-9]+" logregex = "\\d+" loglinktext = "pull request #%BUGID%" diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 05a75845..ad2723f6 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -127,7 +127,7 @@ jobs: if: needs.secret-gate.outputs.build_docker == 'true' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') needs: secret-gate env: - GH_ORG: gitblit + GH_ORG: gitblit-org GITBLIT_VERSION: SNAPSHOT steps: @@ -215,7 +215,7 @@ jobs: # Delete the artifact unless this is the official Gitblit repo - uses: geekyeggo/delete-artifact@v2 - if: ${{ github.repository != 'gitblit/gitblit' }} + if: ${{ github.repository != 'gitblit-org/gitblit' }} with: name: gitblit-nightly failOnError: false diff --git a/README.markdown b/README.markdown index 1cd14889..bc9638d9 100644 --- a/README.markdown +++ b/README.markdown @@ -5,9 +5,9 @@ Gitblit is an open source, pure Java Git solution for managing, viewing, and ser More information about Gitblit can be found [here](http://gitblit.com). -download badge +download badge nightly docker badge -![License](https://img.shields.io/github/license/gitblit/gitblit?color=%23f29024) +![License](https://img.shields.io/github/license/gitblit-org/gitblit?color=%23f29024) License ------- @@ -18,7 +18,7 @@ The text of the license is included in the file LICENSE in the root of the proje Java Runtime Requirement ------------------------------------ -Gitblit requires at Java 8 Runtime Environment (JRE) or a Java 8 Development Kit (JDK). +Gitblit requires a Java 8 Runtime Environment (JRE) or a Java 8 Development Kit (JDK). Getting help ------------ diff --git a/build.moxie b/build.moxie index 346e5788..2c007c90 100644 --- a/build.moxie +++ b/build.moxie @@ -19,10 +19,10 @@ releaseDate: 2022-02-05 # Project urls url: 'http://gitblit.com' -issuesUrl: 'https://github.com/gitblit/gitblit' +issuesUrl: 'https://github.com/gitblit-org/gitblit' socialNetworkUrl: 'https://plus.google.com/114464678392593421684' forumUrl: 'http://groups.google.com/group/gitblit' -mavenUrl: 'http://gitblit.github.io/gitblit-maven' +mavenUrl: 'http://gitblit-org.github.io/gitblit-maven' # Licenses section included for POM generation licenses: @@ -44,9 +44,9 @@ developers: # SCM section included for POM generation scm: { - connection: 'scm:git:git://github.com/gitblit/gitblit.git' - developerConnection: 'scm:git:https://github.com/gitblit/gitblit.git' - url: 'https://github.com/gitblit/gitblit' + connection: 'scm:git:git://github.com/gitblit-org/gitblit.git' + developerConnection: 'scm:git:https://github.com/gitblit-org/gitblit.git' + url: 'https://github.com/gitblit-org/gitblit' tag: HEAD } @@ -98,7 +98,7 @@ registeredRepositories: - { id: mavencentral, url: 'https://repo1.maven.org/maven2' } - { id: eclipse, url: 'https://repo.eclipse.org/content/groups/releases' } - { id: eclipse-snapshots, url: 'https://repo.eclipse.org/content/groups/snapshots' } -- { id: gitblit, url: 'http://gitblit.github.io/gitblit-maven' } +- { id: gitblit, url: 'http://gitblit-org.github.io/gitblit-maven' } # Source all dependencies from the following repositories in the specified order repositories: central, eclipse-snapshots, eclipse, gitblit diff --git a/build.xml b/build.xml index ec2cf63f..d729cbf2 100644 --- a/build.xml +++ b/build.xml @@ -35,7 +35,7 @@ - + @@ -646,9 +646,9 @@ - - - + + + @@ -1114,9 +1114,9 @@ GBLT_RELEASE_TAG=${project.tag} - - - + + + diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties index b62285fd..b34fea50 100644 --- a/src/main/distrib/data/defaults.properties +++ b/src/main/distrib/data/defaults.properties @@ -69,7 +69,7 @@ git.searchExclusions = # List of regex url patterns for extracting a repository name when locating # submodules. # e.g. git.submoduleUrlPatterns = .*?://github.com/(.*) will extract -# *gitblit/gitblit.git* from *git://github.com/gitblit/gitblit.git* +# *gitblit-org/gitblit.git* from *git://github.com/gitblit-org/gitblit.git* # If no matches are found then the submodule repository name is assumed to be # whatever trails the last / character. (e.g. gitblit.git). # diff --git a/src/main/distrib/data/groovy/youtrack-readme.md b/src/main/distrib/data/groovy/youtrack-readme.md index 1a6f9136..81a2c4ea 100644 --- a/src/main/distrib/data/groovy/youtrack-readme.md +++ b/src/main/distrib/data/groovy/youtrack-readme.md @@ -27,4 +27,4 @@ Due to limited authentication options when using the YouTrack REST API, you have ## Attribution -Much of this script was cobbled together from the example receive hooks in the official [GitBlit](https://github.com/gitblit/gitblit) distribution. +Much of this script was cobbled together from the example receive hooks in the official [GitBlit](https://github.com/gitblit-org/gitblit) distribution. diff --git a/src/site/design.mkd b/src/site/design.mkd index 619880ea..9bb16d4d 100644 --- a/src/site/design.mkd +++ b/src/site/design.mkd @@ -87,6 +87,5 @@ Contributions must be your own original work and must licensed under the [Apache [jgit]: http://eclipse.org/jgit "Eclipse JGit Site" [git]: http://git-scm.com "Official Git Site" -[gitbltsrc]: http://github.com/gitblit "gitblit git repository" -[googlecode]: http://code.google.com/p/gitblit "gitblit project management" +[gitbltsrc]: http://github.com/gitblit-org/gitblit "gitblit git repository" [apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0" diff --git a/src/site/federation.mkd b/src/site/federation.mkd index 9fdcf4c6..b7935a9e 100644 --- a/src/site/federation.mkd +++ b/src/site/federation.mkd @@ -313,7 +313,7 @@ The repositories will be put in *git.repositoriesFolder*/example4. ## Federation Client -Instead of setting up a full-blown pulling Gitblit instance, you can also use the [federation client](https://github.com/gitblit/gitblit/releases/latest) command-line utility. This is a packaged subset of the federation feature in a smaller, simpler command-line only tool. +Instead of setting up a full-blown pulling Gitblit instance, you can also use the [federation client](https://github.com/gitblit-org/gitblit/releases/latest) command-line utility. This is a packaged subset of the federation feature in a smaller, simpler command-line only tool. The *federation client* relies on many of the same dependencies as Gitblit and will download them on first execution. diff --git a/src/site/plugins_extensions.mkd b/src/site/plugins_extensions.mkd index 82dd30bc..ed2f2ec9 100644 --- a/src/site/plugins_extensions.mkd +++ b/src/site/plugins_extensions.mkd @@ -2,7 +2,7 @@ Gitblit offers several extension points for enhancing and customizing it's runtime behavior. -Each available extension point has a sample implementation in the [gitblit-cookbook-plugin (Maven project)](https://github.com/gitblit/gitblit-cookbook-plugin). +Each available extension point has a sample implementation in the [gitblit-cookbook-plugin (Maven project)](https://github.com/gitblit-org/gitblit-cookbook-plugin). **NOTE:** Gitblit does not yet offer a comprehensize dependency injection architecture. This will be addressed in a subsequent release. For now you may access all of Gitblit's core managers through a static singleton app context: diff --git a/src/site/plugins_overview.mkd b/src/site/plugins_overview.mkd index 14192f17..c5f307fb 100644 --- a/src/site/plugins_overview.mkd +++ b/src/site/plugins_overview.mkd @@ -53,7 +53,7 @@ Gitblit provides a simple default registry of plugins. The registry is a JSON fi plugins.registry = http://plugins.gitblit.com/plugins.json -The [default plugins registry](http://plugins.gitblit.com) is currently hosted in a [Git repository on Github](https://github.com/gitblit/gitblit-registry). You can view the default registry file [here](http://plugins.gitblit.com/plugins.json). The default plugin registry is also a Maven-2 compatible repository. +The [default plugins registry](http://plugins.gitblit.com) is currently hosted in a [Git repository on Github](https://github.com/gitblit-org/gitblit-registry). You can view the default registry file [here](http://plugins.gitblit.com/plugins.json). The default plugin registry is also a Maven-2 compatible repository. ### Contributing Plugins to the Default Registry diff --git a/src/site/releasehistory.mkd b/src/site/releasehistory.mkd index 7ea76766..6c822b99 100644 --- a/src/site/releasehistory.mkd +++ b/src/site/releasehistory.mkd @@ -139,7 +139,7 @@ If you are updating from an earlier release AND you have indexed branches with t - Preliminary bare repository submodule support
**New:** *git.submoduleUrlPatterns=* - *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url.
- For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git*
+ For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit-org/gitblit.git* from *git://github.git/gitblit-org/gitblit.git*
**Note:** You may not need this control to work with submodules, but it is there if you do. - If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)* - Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails. diff --git a/src/site/releases.mkd b/src/site/releases.mkd index 7dd6b174..70bc64cc 100644 --- a/src/site/releases.mkd +++ b/src/site/releases.mkd @@ -201,7 +201,7 @@ If you are updating from an earlier release AND you have indexed branches with t - Preliminary bare repository submodule support
**New:** *git.submoduleUrlPatterns=* - *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url.
- For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git*
+ For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit-org/gitblit.git* from *git://github.git/gitblit-org/gitblit.git*
**Note:** You may not need this control to work with submodules, but it is there if you do. - If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)* - Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails. diff --git a/src/site/rpc.mkd b/src/site/rpc.mkd index 0e0093e8..43845104 100644 --- a/src/site/rpc.mkd +++ b/src/site/rpc.mkd @@ -16,7 +16,7 @@ The Gitblit JSON RPC mechanism, like the Gitblit JGit servlet, syndication/feed The Gitblit Manager is an example Java/Swing application that allows remote management (repository and user objects) and administration (server settings) of a Gitblit server. -This application uses a combination of RSS feeds and the JSON RPC interface, both of which are part of the [Gitblit API](https://github.com/gitblit/gitblit/releases/latest) library, to present live information from a Gitblit server. Some JSON RPC methods from the utility class `com.gitblit.utils.RpcUtils` are not currently used by the Gitblit Manager. +This application uses a combination of RSS feeds and the JSON RPC interface, both of which are part of the [Gitblit API](https://github.com/gitblit-org/gitblit/releases/latest) library, to present live information from a Gitblit server. Some JSON RPC methods from the utility class `com.gitblit.utils.RpcUtils` are not currently used by the Gitblit Manager. **NOTE:** Gitblit Manager stores your login credentials **INSECURELY** in homedir/.gitblit/config. diff --git a/src/site/setup_authentication.mkd b/src/site/setup_authentication.mkd index b199c769..068dc6a7 100644 --- a/src/site/setup_authentication.mkd +++ b/src/site/setup_authentication.mkd @@ -25,7 +25,7 @@ To use the *LdapUserService* set *realm.authenticationProviders=ldap* in your `g #### Example LDAP Layout ![block diagram](ldapSample.png "LDAP Sample") -Please see [ldapUserServiceSampleData.ldif](https://github.com/gitblit/gitblit/blob/master/src/test/resources/ldap/sampledata.ldif) to see the data in LDAP that reflects the above picture. +Please see [ldapUserServiceSampleData.ldif](https://github.com/gitblit-org/gitblit/blob/master/src/test/resources/ldap/sampledata.ldif) to see the data in LDAP that reflects the above picture. #### Gitblit Settings for Example LDAP Layout The following are the settings required to configure Gitblit to authenticate against the example LDAP server with LDAP-controlled team memberships. @@ -137,7 +137,7 @@ If you are using the WAR variant and deploying into your own servlet container w This is the simplest choice where you implement custom authentication and delegate all other standard user and team operations to one of Gitblit's user service implementations. This choice insulates your customization from changes in User and Team model classes and additional API that may be added to IUserService. -Please subclass [com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider](https://github.com/gitblit/gitblit/blob/master/src/main/java/com/gitblit/auth/AuthenticationProvider.java). +Please subclass [com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider](https://github.com/gitblit-org/gitblit/blob/master/src/main/java/com/gitblit/auth/AuthenticationProvider.java). You may use your subclass by specifying its fully qualified classname in the *realm.authenticationProviders* setting. @@ -150,5 +150,5 @@ Instead of maintaining a `users.conf` file, you may want to integrate Gitblit in You may use your own custom *com.gitblit.IUserService* implementation by specifying its fully qualified classname in the *realm.userService* setting. Your user service class must be on Gitblit's classpath and must have a public default constructor. -Please see the following interface definition [com.gitblit.IUserService](https://github.com/gitblit/gitblit/blob/master/src/main/java/com/gitblit/IUserService.java). +Please see the following interface definition [com.gitblit.IUserService](https://github.com/gitblit-org/gitblit/blob/master/src/main/java/com/gitblit/IUserService.java). diff --git a/src/site/setup_bugtraq.mkd b/src/site/setup_bugtraq.mkd index fcd45d49..9e85cb29 100644 --- a/src/site/setup_bugtraq.mkd +++ b/src/site/setup_bugtraq.mkd @@ -28,7 +28,7 @@ This file is formatted like a standard Git config file. Here are some quick exa logregex = (JRA-\\d+) [bugtraq "github"] - url = "https://github.com/gitblit/gitblit/pull/%BUGID%" + url = "https://github.com/gitblit-org/gitblit/pull/%BUGID%" loglinkregex = "(?:pull request|pull|pr)\\s*[-#]?[0-9]+" logregex = "\\d+" loglinktext = "pull request #%BUGID%" diff --git a/src/site/setup_go.mkd b/src/site/setup_go.mkd index e0470f31..47c92d1d 100644 --- a/src/site/setup_go.mkd +++ b/src/site/setup_go.mkd @@ -151,5 +151,5 @@ You can override Gitblit GO's default Log4j configuration with a command-line pa java -Dlog4j.configuration=file:///home/james/log4j.properties -cp gitblit.jar:"ext/*" com.gitblit.GitBlitServer -You can not use override the default log4j configuration *AND* specify the `--dailyLogFile` parameter. For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit/gitblit/blob/master/src/log4j.properties). It includes some file appenders that are disabled by default. +You can not use override the default log4j configuration *AND* specify the `--dailyLogFile` parameter. For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit-org/gitblit/blob/master/src/log4j.properties). It includes some file appenders that are disabled by default. diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd index 2415fb54..94b8d4db 100644 --- a/src/site/siteindex.mkd +++ b/src/site/siteindex.mkd @@ -68,7 +68,7 @@ Gitblit blends elements of GitHub, BitBucket, and Gerrit to provide a streamline Administrators can create and manage all repositories, user accounts, and teams from the *Web UI*. Administrators can create and manage all repositories, user accounts, and teams from the *JSON RPC interface* using the [Gitblit Manager](%GCURL%manager-${project.releaseVersion}.zip) or your own custom tooling. -Administrators can create and manage all repositories, user accounts, and teams from the *command-line* using SSH & the [Powertools plugin](https://github.com/gitblit/gitblit-powertools-plugin). +Administrators can create and manage all repositories, user accounts, and teams from the *command-line* using SSH & the [Powertools plugin](https://github.com/gitblit-org/gitblit-powertools-plugin). ### Integration with Your Infrastructure diff --git a/src/test/config/test-ui-gitblit.properties b/src/test/config/test-ui-gitblit.properties index 877cbe2a..2d5c55ee 100644 --- a/src/test/config/test-ui-gitblit.properties +++ b/src/test/config/test-ui-gitblit.properties @@ -51,7 +51,7 @@ git.searchExclusions = # List of regex url patterns for extracting a repository name when locating # submodules. # e.g. git.submoduleUrlPatterns = .*?://github.com/(.*) will extract -# *gitblit/gitblit.git* from *git://github.com/gitblit/gitblit.git* +# *gitblit-org/gitblit.git* from *git://github.com/gitblit-org/gitblit.git* # If no matches are found then the submodule repository name is assumed to be # whatever trails the last / character. (e.g. gitblit.git). # -- 2.39.5