summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Zschocke <2362065+flaix@users.noreply.github.com>2023-04-03 22:42:57 +0200
committerGitHub <noreply@github.com>2023-04-03 22:42:57 +0200
commite906235f57cae059d7ac49e0f05dee43d1673715 (patch)
tree89207b48355c37fb55f0cd0095603b5be1a000c3
parent83f8ee798f4c3bdc08531464bb762d4b12178e24 (diff)
parentafa4f7e0b4332747c647d51aa1b89cc410fdb067 (diff)
downloadgitblit-e906235f57cae059d7ac49e0f05dee43d1673715.tar.gz
gitblit-e906235f57cae059d7ac49e0f05dee43d1673715.zip
Merge pull request #1442 from glmdev/patch-1
Fix Moxie URL in build.xml (#1441)
-rw-r--r--.github/workflows/ci-build.yml2
-rw-r--r--README.markdown2
-rw-r--r--build.xml4
-rw-r--r--src/main/java/com/gitblit/manager/PluginManager.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index eab73378..97defdbe 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -32,7 +32,7 @@ jobs:
- name: Setup Moxie
run: |
- wget http://gitblit.github.io/moxie/maven/com/gitblit/moxie/moxie+ant/0.9.4/moxie+ant-0.9.4.tar.gz
+ wget http://gitblit-org.github.io/moxie/maven/com/gitblit/moxie/moxie+ant/0.9.4/moxie+ant-0.9.4.tar.gz
tar -xzf moxie+ant-0.9.4.tar.gz
moxie-0.9.4/bin/moxie -version
diff --git a/README.markdown b/README.markdown
index bc9638d9..18fd316c 100644
--- a/README.markdown
+++ b/README.markdown
@@ -57,5 +57,5 @@ Make sure to clone using `--recursive` OR to execute `git submodule update --ini
Building Tips & Tricks
----------------------
1. If you are running Ant from an ANSI-capable console, consider setting the `MX_COLOR` environment variable before executing Ant.<pre>set MX_COLOR=true</pre>
-2. The build script will honor your Maven proxy settings. If you need to fine-tune this, please review the [settings.moxie](http://gitblit.github.io/moxie/settings.html) documentation.
+2. The build script will honor your Maven proxy settings. If you need to fine-tune this, please review the [settings.moxie](http://gitblit-org.github.io/moxie/settings.html) documentation.
diff --git a/build.xml b/build.xml
index d729cbf2..7c219f99 100644
--- a/build.xml
+++ b/build.xml
@@ -5,11 +5,11 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Retrieve Moxie Toolkit
- documentation @ http://gitblit.github.io/moxie
+ documentation @ http://gitblit-org.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<property name="moxie.version" value="0.9.4" />
- <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />
+ <property name="moxie.url" value="http://gitblit-org.github.io/moxie/maven" />
<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
<property name="moxie.dir" value="${user.home}/.moxie" />
diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java
index b3936e5d..c3ba1b82 100644
--- a/src/main/java/com/gitblit/manager/PluginManager.java
+++ b/src/main/java/com/gitblit/manager/PluginManager.java
@@ -315,7 +315,7 @@ public class PluginManager implements IPluginManager, PluginStateListener {
@Override
public synchronized boolean refreshRegistry(boolean verifyChecksum) {
- String dr = "http://gitblit.github.io/gitblit-registry/plugins.json";
+ String dr = "http://gitblit-org.github.io/gitblit-registry/plugins.json";
String url = runtimeManager.getSettings().getString(Keys.plugins.registry, dr);
try {
File file = download(url, verifyChecksum);