]> source.dussan.org Git - gitblit.git/log
gitblit.git
3 years agoMerge pull request #1370 from Zwixx/master
Florian Zschocke [Wed, 21 Jul 2021 18:05:56 +0000 (20:05 +0200)]
Merge pull request #1370 from Zwixx/master

This commit merges the pull request from Zwixx, with additional
changes via a separate Zwixx-fix-cmds branch.

Closes #1370

3 years agoFix output of migrate-/reindex-tickets bash scripts
Florian Zschocke [Wed, 21 Jul 2021 07:58:55 +0000 (09:58 +0200)]
Fix output of migrate-/reindex-tickets bash scripts

Fix the output of the help texts in the reindex-tickets and
reindex-tickets bash scripts.
For one the double quotes are unnecessary and get printed out, too.
Secondly, an empty line needs a `echo.`. A simple `echo` will prin the
state of the echo setting, i.e. `Echo is enabled (1)` or something similar.

3 years agoSet local variable visibility in batch scripts
Florian Zschocke [Wed, 21 Jul 2021 07:54:27 +0000 (09:54 +0200)]
Set local variable visibility in batch scripts

Use SETLOCAL in batch scripts to restrict the visibility of variables
that are set in the script to the script execution. Otherwise the variables
will also be set in the calling shell. That is not a problem when a script
is executed by double clicking it in Windows Explorer. But now that the
scripts are changed so that they can be called on the command line from
other folders, they should also no clutter the calling environment.

3 years agoAdjust remaining CMD scripts to use Gitblit home path.
Florian Zschocke [Wed, 21 Jul 2021 07:50:59 +0000 (09:50 +0200)]
Adjust remaining CMD scripts to use Gitblit home path.

Use the path of the script for the Gitblit home path in the remaining
batch scripts, too, to make it possible to call them from any other folder.

3 years agoAdd this into the install/uninstall and reindex of the service too
Zwixx [Wed, 26 May 2021 15:47:17 +0000 (17:47 +0200)]
Add this into the install/uninstall and reindex of the service too

3 years agoUse full path to Gitblit directory in batch scripts
Zwixx [Wed, 26 May 2021 15:05:26 +0000 (17:05 +0200)]
Use full path to Gitblit directory in batch scripts

In order to call the Windows batch scripts on the command line
from a different folder, the path to the files in the Gitblit
directory needs to be explicitly stated in the Java command.
Otherwise the JAR files or data directory are not found as they
would be searched in the current directory.

3 years agoFix: Make CPU hog fix Java 7 compatible
Florian Zschocke [Wed, 14 Jul 2021 19:23:28 +0000 (21:23 +0200)]
Fix: Make CPU hog fix Java 7 compatible

The last fix for the stored config merged from Curly060 used Java8-isms.
In order to be able to include this fix in the next release, which will
be for 1.9, I have converted this to be compatible with Java 7.

Also, a file header was added to place it under APL.

3 years agobugfix: fix CPU hog bug in config save
Ingo Lafrenz [Thu, 18 Mar 2021 14:45:02 +0000 (15:45 +0100)]
bugfix: fix CPU hog bug in config save

3 years agoMerge pull request #1367 from YMNNs/master
Florian Zschocke [Sat, 15 May 2021 17:58:59 +0000 (19:58 +0200)]
Merge pull request #1367 from YMNNs/master

Update simplified Chinese translation

3 years agoUpdate zh_CN translation 1367/head
YMNNs [Mon, 3 May 2021 11:53:38 +0000 (19:53 +0800)]
Update zh_CN translation

Updated simplified Chinese translation and added missing entries. This translation is now 100% completed.

3 years agodocs: Change Ohloh link to Open Hub
Florian Zschocke [Mon, 23 Nov 2020 19:28:11 +0000 (20:28 +0100)]
docs: Change Ohloh link to Open Hub

Ohloh got acquired by Synopsis and is nor Open Hub.
Change the links for the tiny widget to point to Open Hub.

Closes #1356

4 years agodocs: Release notes update
Florian Zschocke [Mon, 16 Nov 2020 20:15:59 +0000 (21:15 +0100)]
docs: Release notes update

4 years agofix: Also parse exp links in MD pages
Florian Zschocke [Mon, 16 Nov 2020 20:10:24 +0000 (21:10 +0100)]
fix: Also parse exp links in MD pages

Add a link parser also for `ExpLinks` because we need to escape paths
to files in subfolders.
This closes #1358

4 years ago📖 docs: Add missing change to 1.8.0 release notes
Florian Zschocke [Mon, 9 Nov 2020 22:25:05 +0000 (23:25 +0100)]
📖 docs: Add missing change to 1.8.0 release notes

Add that issue 879 was fixed in release 1.8.0

4 years agoMerge branch 'fix-raw-slash-branch' into master
Florian Zschocke [Mon, 9 Nov 2020 23:07:34 +0000 (00:07 +0100)]
Merge branch 'fix-raw-slash-branch' into master

4 years agoraw: Fix raw links to branches with a slash in their name
Florian Zschocke [Mon, 9 Nov 2020 22:08:22 +0000 (23:08 +0100)]
raw: Fix raw links to branches with a slash in their name

When a branch has a slash in the name, the raw servlet was not able
to find the path under that branch. This is due to the replacement of
the forward slash character for URLs. It was not taken into account
when comparing the branch name later.

This fixes #1290 and its duplicates #1234 and #813.

4 years agoraw: Fix getPath with trailing slash that was escaped
Florian Zschocke [Mon, 9 Nov 2020 19:27:31 +0000 (20:27 +0100)]
raw: Fix getPath with trailing slash that was escaped

While this may be an unlikely scenario, let's still prevent this.
When a link was created for a path that ends in a trailing slash,
that trailing slash would be replaced with the `forwardSlashCharacter`.
But in getPath that final slash would be transformed back *after* the
check to chop off trailing slashes. This is now switched so that such a
trailing slash is also chopped off.

4 years agoraw: Fix getPath with lead-ins or missing trailing slashes after the branch.
Florian Zschocke [Mon, 9 Nov 2020 19:21:08 +0000 (20:21 +0100)]
raw: Fix getPath with lead-ins or missing trailing slashes after the branch.

4 years agoraw: Refactor RawServlet:getBranch and :getPath parameters
Florian Zschocke [Sun, 8 Nov 2020 16:19:35 +0000 (17:19 +0100)]
raw: Refactor RawServlet:getBranch and :getPath parameters

Refactor the `getBranch` and `getPath` methods to take a String as
second parameter, which is the already sanitised path info. Don't get
the path info from a passed in request anymore.

The methods are only ever called from within `processRequest`, which
already does some checks on the path info, like removing a leading
slash character. So no need to do that every time again the methods
and passing a request for that.

4 years agoraw: Fix exceptions when no path info is given to raw servlet
Florian Zschocke [Sat, 7 Nov 2020 18:56:51 +0000 (19:56 +0100)]
raw: Fix exceptions when no path info is given to raw servlet

4 years agoraw: Strip leading and trailing slash from repo and path names for link
Florian Zschocke [Wed, 4 Nov 2020 19:35:31 +0000 (20:35 +0100)]
raw: Strip leading and trailing slash from repo and path names for link

When creating a link for raw display, a trailing slash is stripped from
the end of the base URL. Also do this for the repository, as well as
stripping leading slashes from the repository and the path values.

4 years agobuild: Upload coverage report also to CodeClimate and Codacy
Florian Zschocke [Thu, 5 Nov 2020 22:07:18 +0000 (23:07 +0100)]
build: Upload coverage report also to CodeClimate and Codacy

4 years agoMerge pull request #1350 from flaix/upgrade-mockito
Florian Zschocke [Sat, 31 Oct 2020 20:45:59 +0000 (21:45 +0100)]
Merge pull request #1350 from flaix/upgrade-mockito

deps: Upgrade dependency Mockito to 2.28.2.

4 years agodeps: Upgrade dependency Mockito to 2.28.2. 1350/head
Florian Zschocke [Sat, 31 Oct 2020 15:50:29 +0000 (16:50 +0100)]
deps: Upgrade dependency Mockito to 2.28.2.

4 years agoMerge pull request #1349 from flaix/issue-1150
Florian Zschocke [Fri, 30 Oct 2020 08:25:28 +0000 (09:25 +0100)]
Merge pull request #1349 from flaix/issue-1150

Fix 1150: Use external link instead of internal wiki link

4 years agoFix 1150: Use external link instead of internal wiki link for tickets_setup 1349/head
Florian Zschocke [Thu, 29 Oct 2020 11:41:20 +0000 (12:41 +0100)]
Fix 1150: Use external link instead of internal wiki link for tickets_setup

The `tickets_overview` page links to the `tickets_setup` page using a
wiki style internal link: `[[tickets setup]]`. Whatever library is
interpreting that is creating a link under the assumption that the
resulting page will be called `tickets-setup.html`. But that is not the
convention used by Moxie, which will use the source file name and thus
create a file called `tickets_setup.html`.

I was not able to find out which of the many libraries included is the
one that parses this file and creates the link. Messy.

There are two solutions. One is to configure the Moxie site build to
generate the file as `tickets-setup.html`. But this would break any
links to that page that might exist somewhere on the Interweb. So I
opted for the other option, which is to not use wiki syntax for the
reference to the local page but normal markdown syntax. This is not
a wiki, afterall.

4 years agoMerge pull request #1348 from flaix/ci-coverage
Florian Zschocke [Fri, 23 Oct 2020 07:42:51 +0000 (09:42 +0200)]
Merge pull request #1348 from flaix/ci-coverage

build: Create single XML JaCoCo report

4 years agoci: Enable upload to Codecov.io in CircleCI J8 build. 1348/head
Florian Zschocke [Thu, 22 Oct 2020 19:59:47 +0000 (21:59 +0200)]
ci: Enable upload to Codecov.io in CircleCI J8 build.

4 years agobuild: Activate JaCoCo explicitly for Ant build
Florian Zschocke [Thu, 22 Oct 2020 18:43:45 +0000 (20:43 +0200)]
build: Activate JaCoCo explicitly for Ant build

When building with Ant, instead of Moxie, JaCoCo is not included in the
classpath. So explicitly initialise the full `jacocoant.jar` from the
`.moxie` repository.

For this we had to switch the dependency to use the `nodeps` jar which
includes all dependencies.

4 years agobuild: Create single XML JaCoCo report
Florian Zschocke [Thu, 22 Oct 2020 15:42:01 +0000 (17:42 +0200)]
build: Create single XML JaCoCo report

This can be uploaded to coverage services like Coveralls etc.

4 years agoAdd contributing guidelines
Florian Zschocke [Tue, 20 Oct 2020 13:33:22 +0000 (15:33 +0200)]
Add contributing guidelines

Add some guidelines for contributors regarding pull requests,
commits and code conventions.

4 years agoMerge pull request #1345 from davehofmann/master
Florian Zschocke [Sat, 29 Aug 2020 08:34:57 +0000 (10:34 +0200)]
Merge pull request #1345 from davehofmann/master

Add service scripts for FreeBSD

4 years agoAdd service scripts for FreeBSD 1345/head
David Hofmann [Tue, 4 Aug 2020 15:47:33 +0000 (17:47 +0200)]
Add service scripts for FreeBSD

4 years agoReset build identifiers for next point release cycle
fzs [Sun, 5 Apr 2020 11:18:04 +0000 (11:18 +0000)]
Reset build identifiers for next point release cycle

4 years agoPrepare 1.9.1 release v1.9.1
fzs [Sun, 5 Apr 2020 11:13:00 +0000 (11:13 +0000)]
Prepare 1.9.1 release

4 years ago📖docs: Add update of service scripts in upgrade GO documentation
Florian Zschocke [Sun, 5 Apr 2020 10:28:58 +0000 (12:28 +0200)]
📖docs: Add update of service scripts in upgrade GO documentation

Also: release notes.

4 years ago🏃 run: Fix Linux service scripts to use classpath and class
Florian Zschocke [Sun, 5 Apr 2020 10:05:14 +0000 (12:05 +0200)]
🏃 run: Fix Linux service scripts to use classpath and class

Update the service scripts to use `-cp` and specify the GitBlitServer
class, instead of the `-jar` parameter.

Fixes #1333

4 years ago🏃run: Use quotes around class path in scripts
Florian Zschocke [Sat, 4 Apr 2020 19:34:30 +0000 (21:34 +0200)]
🏃run: Use quotes around class path in scripts

While most systems will not need the class path passed to the JVM with
the `-cp` parameter to be in quotes, apparently some exist where that
will not work without the quotes, e.g. FreeBSD.
So always use quotes for the class path in all scripts.

Issue #1333

4 years agoChange tests in shell scripts to be more compatible with Bourne shell
Florian Zschocke [Sat, 4 Apr 2020 18:29:12 +0000 (20:29 +0200)]
Change tests in shell scripts to be more compatible with Bourne shell

This is needed for the scripts to work in Alpine Linux, which
comes with a Bourne shell.

4 years agoDelete password from memory in AuthenticationManager
Florian Zschocke [Sat, 4 Apr 2020 17:43:35 +0000 (19:43 +0200)]
Delete password from memory in AuthenticationManager

Zero out the password to remove it from memory after use.
This is only a first step, implementing it for one method:
`AuthenticationManager.authenticate(String, char[], String)`.

4 years ago🦟 fix: Password hash upgrade kills existing passwords
Florian Zschocke [Sat, 4 Apr 2020 17:25:27 +0000 (19:25 +0200)]
🦟  fix: Password hash upgrade kills existing passwords

The upgrade of a MD5 stored password hash to a PBKDF password hash
destroys the stored password. The has check zeroes out the password that
is tested, so that the new hash is built over the zeroed out value.

This fix prevents that an also adds a check to the test.

Fixes #1335

4 years agodocu: Fix typo
Florian Zschocke [Sat, 7 Mar 2020 11:01:08 +0000 (12:01 +0100)]
docu: Fix typo

4 years agoSwitch Eclipse repositories to HTTPS.
Florian Zschocke [Wed, 1 Apr 2020 11:31:59 +0000 (13:31 +0200)]
Switch Eclipse repositories to HTTPS.

The Eclipse maven repositories changed to only allow HTTPS and not
serve HTTP anymore. HTTP will redirect to HTTPS, which moxie does
not handle well and fails.

So the registered Eclipse repositories are changed to 'https://'
transport.

Fixes #1334

4 years agoFix download link in README file.
Florian Zschocke [Sun, 2 Feb 2020 11:18:56 +0000 (12:18 +0100)]
Fix download link in README file.

4 years agoReset build identifiers for next point release cycle
fzs [Sat, 1 Feb 2020 09:51:13 +0000 (09:51 +0000)]
Reset build identifiers for next point release cycle

4 years agoPrepare 1.9.0 release v1.9.0
fzs [Sat, 1 Feb 2020 09:46:15 +0000 (09:46 +0000)]
Prepare 1.9.0 release

4 years agoci: Ignore all branches starting with `release`.
Florian Zschocke [Fri, 31 Jan 2020 19:31:17 +0000 (20:31 +0100)]
ci: Ignore all branches starting with `release`.

Set the ignored branches pattern to `release*` for the normal ci workflow.

4 years agoBuild: Set GitHub org to `gitblit` for release.
Florian Zschocke [Fri, 31 Jan 2020 19:16:52 +0000 (20:16 +0100)]
Build: Set GitHub org to `gitblit` for release.

4 years agoMerge branch 'release-github' into master
Florian Zschocke [Thu, 30 Jan 2020 21:13:10 +0000 (22:13 +0100)]
Merge branch 'release-github' into master

4 years agoBuild: Store release version information in file.
Florian Zschocke [Thu, 30 Jan 2020 20:42:13 +0000 (21:42 +0100)]
Build: Store release version information in file.

If requested, by setting a file name in the `versionInfo`
property, store release version and tag in a file, for
other scripts and programs to pick up.

4 years agoDoc: Fix change log in built-in docs
Florian Zschocke [Tue, 28 Jan 2020 20:26:12 +0000 (21:26 +0100)]
Doc: Fix change log in built-in docs

Use the same templates as in `buildSite` to generate the change log
in the built-in documentation.

4 years agoBuild: Fix output prints
Florian Zschocke [Tue, 28 Jan 2020 20:23:25 +0000 (21:23 +0100)]
Build: Fix output prints

4 years agoAdd Maven Central to registeredRepositories
Florian Zschocke [Tue, 28 Jan 2020 12:53:39 +0000 (13:53 +0100)]
Add Maven Central to registeredRepositories

Moxie does have these defined by default, but with transport HTTP.
Since January 2020, Maven Central only accepts HTTPS, no HTTP
anymore. So we add them here explicitly, with `https://`.
We add it to the `build.moxie` file, instead of keeping it in a
local `settings.moxie`, so that a CI server can immediately use it.

4 years agoDoc: Change download button on Readme to point to GitHub
Florian Zschocke [Tue, 28 Jan 2020 12:40:37 +0000 (13:40 +0100)]
Doc: Change download button on Readme to point to GitHub

4 years agoDoc: Remove Google+ from Readme
Florian Zschocke [Tue, 28 Jan 2020 10:44:55 +0000 (11:44 +0100)]
Doc: Remove Google+ from Readme

Since Google Plus doesn't exist any more...

4 years agoDoc: Update built-in docs with missing pages and links
Florian Zschocke [Mon, 27 Jan 2020 20:53:15 +0000 (21:53 +0100)]
Doc: Update built-in docs with missing pages and links

Add pages for `fail2ban` and GFS to the `generateDocs` target, so that
they also show up in the documentation on GO etc.
Also adjust the links to issues and commits.

Add the replacement of the download base URL.

4 years agoUse GitHub org property in octokit calls
Florian Zschocke [Mon, 27 Jan 2020 20:46:23 +0000 (21:46 +0100)]
Use GitHub org property in octokit calls

4 years agoAdd Twitter link to site overview and built-in docs.
Florian Zschocke [Mon, 27 Jan 2020 20:43:01 +0000 (21:43 +0100)]
Add Twitter link to site overview and built-in docs.

4 years agoSite: Remove link to Bintray update notifications
Florian Zschocke [Mon, 27 Jan 2020 20:42:17 +0000 (21:42 +0100)]
Site: Remove link to Bintray update notifications

4 years agoSite: Change the download URL to GitHub
Florian Zschocke [Mon, 27 Jan 2020 19:34:20 +0000 (20:34 +0100)]
Site: Change the download URL to GitHub

4 years agoSite: Remove Google Plus id
Florian Zschocke [Mon, 27 Jan 2020 19:31:21 +0000 (20:31 +0100)]
Site: Remove Google Plus id

Google Plus is gone, so linking to it makes no sense anymore.

4 years agoAdd project property `release.tag` as a global `project.tag`
Florian Zschocke [Mon, 27 Jan 2020 19:30:44 +0000 (20:30 +0100)]
Add project property `release.tag` as a global `project.tag`

Add property `release.tag` to keep a generally available property.
The `project.tag` was getting used in many places, so I need a global
definition for it. The property `project.tag`, defined in the target
`tagRelease` could not be reused, since when that target runs, the
version is still a SNAPSHOT version. (And properties don't get
re-assigned.) So instead a new property `release.tag` is defined,
just like `release.name`, which can be only used sensible in a
release stage, i.e. after `tagRelease` ran.

4 years agoUpdate the gh-pages branch
Florian Zschocke [Sun, 26 Jan 2020 19:46:43 +0000 (20:46 +0100)]
Update the gh-pages branch

The site was generated, but updating the gh-pages branch was included
in the `publishSite` target. So a new target is added and called,
`updateSite`.

4 years agoAdjust `release.template` for publishing releases on GitHub
Florian Zschocke [Sun, 26 Jan 2020 18:50:58 +0000 (19:50 +0100)]
Adjust `release.template` for publishing releases on GitHub

The major change is switching from `publishBinaries`, which still
exists and uploads to Bintray, to `releaseBinaries`, which creates
a draft release on GitHub and uploads the binaries.

Another change is some reordering. Now first the binaries are
uploaded, the maven artifacts pubished and the tag and site pages
pushed. Then the GitHub release is made public.
Only after that is the minor version bumped and pushed.

The whole script could use some error checking and stoping when
things go wrong, instead of blindly continuing.

A minor change, and temporary, is that we need and check for Ant 1.9,
as we still build with Java 7.

4 years agoAdd deployment of a release to GitHub
Florian Zschocke [Sun, 26 Jan 2020 15:47:44 +0000 (16:47 +0100)]
Add deployment of a release to GitHub

Add Ant tasks and macros to deploy binaries to GitHub,
using GitHub's releases.

Adds an Awk script to extract GH flavoured markdown release notes
from the release.moxie file.

Adds `ok.sh` to the repository so that it is readily available.
This is a Bourne shell GitHub API client, used to create a release
on GitHub and upload the binaries.

4 years agoChange single quotes to back ticks for formatting
Florian Zschocke [Sun, 26 Jan 2020 15:31:49 +0000 (16:31 +0100)]
Change single quotes to back ticks for formatting

4 years agoRun build and tests on Java 7.
Florian Zschocke [Sat, 11 Jan 2020 16:36:00 +0000 (17:36 +0100)]
Run build and tests on Java 7.

4 years agoMerge branch 'ci' into master
Florian Zschocke [Fri, 10 Jan 2020 23:10:00 +0000 (00:10 +0100)]
Merge branch 'ci' into master

Now we can also build on GitHub

ci ignore

4 years agoci: Ignore release and gh-pages branches for CI build on push
Florian Zschocke [Fri, 10 Jan 2020 23:04:03 +0000 (00:04 +0100)]
ci: Ignore release and gh-pages branches for CI build on push

4 years agoci: Add build with Java 7 on Linux
Florian Zschocke [Fri, 10 Jan 2020 22:24:08 +0000 (23:24 +0100)]
ci: Add build with Java 7 on Linux

Add a job to run a build with Java 7.
The job currently only runs on Linux.
In order to run on Java 7, an old Ant version is downloaded and
installed. We use moxie+ant for this, so we build with moxie.

4 years agoBuild on matrix of latest Ubunutu and latest Windows.
Florian Zschocke [Sun, 5 Jan 2020 21:03:34 +0000 (22:03 +0100)]
Build on matrix of latest Ubunutu and latest Windows.

Currently that is Ubuntu 18.04 and Windows Server 2019.
https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners

4 years agoBuild as matrix of Java 8 and 11, only.
Florian Zschocke [Sun, 5 Jan 2020 20:53:36 +0000 (21:53 +0100)]
Build as matrix of Java 8 and 11, only.

We cannot build with Ant on GitHub since the provided Ant
version does not run on Java 7.

4 years agoBuild with matrix of Java 7, 8 and 11.
Florian Zschocke [Sun, 5 Jan 2020 20:21:48 +0000 (21:21 +0100)]
Build with matrix of Java 7, 8 and 11.

4 years agoAdd ci workflow to build on every push.
Florian Zschocke [Sun, 5 Jan 2020 20:07:50 +0000 (21:07 +0100)]
Add ci workflow to build on every push.

5 years agoUpdate JGit to versoin 4.5.7.201904151645-r
Florian Zschocke [Wed, 20 Nov 2019 20:35:17 +0000 (21:35 +0100)]
Update JGit to versoin 4.5.7.201904151645-r

5 years agoCorrect issue in FAQ page to link to GitHub issue.
Florian Zschocke [Mon, 18 Nov 2019 19:31:34 +0000 (20:31 +0100)]
Correct issue in FAQ page to link to GitHub issue.

5 years agoAdd dependency javax.activation to WAR, manager and fedclient, too.
Florian Zschocke [Mon, 18 Nov 2019 19:12:04 +0000 (20:12 +0100)]
Add dependency javax.activation to WAR, manager and fedclient, too.

I actually don't know if it is needed for the manager and fedclient,
but right now I'm going with better safe than sorry.

5 years agoAdd pattern to create links to GitHub commits from release notes etc.
Florian Zschocke [Sun, 17 Nov 2019 13:29:09 +0000 (14:29 +0100)]
Add pattern to create links to GitHub commits from release notes etc.

5 years agoChange issue links in release history to point to correct GitHub issues
Florian Zschocke [Sun, 17 Nov 2019 13:28:18 +0000 (14:28 +0100)]
Change issue links in release history to point to correct GitHub issues

5 years agoUpdate release notes
Florian Zschocke [Sun, 17 Nov 2019 13:21:45 +0000 (14:21 +0100)]
Update release notes

5 years agoUpdate release notes
Florian Zschocke [Sat, 16 Nov 2019 18:03:23 +0000 (19:03 +0100)]
Update release notes

5 years agoAdjust versions of JaCoCo and parboiled to match and work.
Florian Zschocke [Mon, 11 Nov 2019 22:45:56 +0000 (23:45 +0100)]
Adjust versions of JaCoCo and parboiled to match and work.

Adjust the version of JaCoCo down to 0.8.4 and the version
of parboiled-java up to 1.3.1. They need to match because both
use ASM. This combination has the same dependency on ASM: 7.1.

And it seems to work, at least the docs get generated and the
`moxie test` doesn't fail building the report anymore.

5 years agoUpdate test file with MD hashed password
Florian Zschocke [Mon, 11 Nov 2019 21:03:32 +0000 (22:03 +0100)]
Update test file with MD hashed password

With the feature of passwords getting automatically
upgraded to a hashed version, the default `admin`
password in the test-users file will get stored
as MD5 hashed during test execution. Commit this
change, so that the file isn't always showing up
as changed.

5 years agoSet .classpath back to moxie generated version.
Florian Zschocke [Mon, 11 Nov 2019 21:01:31 +0000 (22:01 +0100)]
Set .classpath back to moxie generated version.

5 years agoUpdate JaCoCo to version 0.8.5 to work when run under Java 11.
Florian Zschocke [Mon, 11 Nov 2019 20:59:55 +0000 (21:59 +0100)]
Update JaCoCo to version 0.8.5 to work when run under Java 11.

Running `moxie test` will crash under Java 11 with JaCoCo 0.7.8.

5 years agoMerge pull request #1324 from fzs/fix-prefLocale-docsNPE
Florian Zschocke [Mon, 11 Nov 2019 17:30:50 +0000 (18:30 +0100)]
Merge pull request #1324 from fzs/fix-prefLocale-docsNPE

Two fixes: broken links to docs and preferred language selection

5 years agoFix user preferences selecting the wrong preferred locale. 1324/head
Florian Zschocke [Mon, 11 Nov 2019 17:13:11 +0000 (18:13 +0100)]
Fix user preferences selecting the wrong preferred locale.

Due to a wrong comparison, when loading the preferred locale in the
user preferences page, in cases like `zh_CN` or `de_DE` the wrong
locale would be chosen.

As with too many things, the code is duplicated on the `UserPage`
and the `EditUserPage`. And they differ. So extract the choosing of
the preferred language for display into a method in the (more up-to-date)
`UserPage` and call that from the `EditUserPage`.

5 years agoGuard docs pages against bad URLs
Florian Zschocke [Mon, 11 Nov 2019 15:24:45 +0000 (16:24 +0100)]
Guard docs pages against bad URLs

If, for example, an external site links to a docs page or a specific
doc page, and the branch that link points to is no longer existing,
an internal error happens due to a NPE.

The NPE is guarded against and a No Docs page is returned.

5 years agoAdd `clone.bundle` as known command, but reject it as not implemented. 1323/head
Florian Zschocke [Sun, 10 Nov 2019 23:33:02 +0000 (00:33 +0100)]
Add `clone.bundle` as known command, but reject it as not implemented.

5 years agoFix NPE when no action can be parsed from the URL
Florian Zschocke [Sun, 10 Nov 2019 23:10:43 +0000 (00:10 +0100)]
Fix NPE when no action can be parsed from the URL

Renames `static final` variables according to convention to be in all
upper case. That makes it easier to see that in an `equals` comparison
the final variable should come first as it will not trigger a NPE.

Also strip parameters from the URL when extracting the repository
name from it. Parameters can not be part of a repository name, and
this way an empty repository name can be detected.

Fixes #1092

5 years ago:book: Fix link to LDAP sample data LDIF file in setup.
Florian Zschocke [Sun, 10 Nov 2019 17:37:13 +0000 (18:37 +0100)]
:book: Fix link to LDAP sample data LDIF file in setup.

5 years agoIn SSH tests ignore an external SSH tool
Florian Zschocke [Sun, 10 Nov 2019 12:04:29 +0000 (13:04 +0100)]
In SSH tests ignore an external SSH tool

The SshDaemonTest would fail under Windows. That is because JGit looks
at the `GIT_SSH` environment variable. If it is set, the tool the variable
is pointing to is used for the SSH connection. This is a problem when
it is set to "Plink" under Windows, because Plink will not recognize the
server key and will not find it in the registry, cached as a known host.
Since a test can/should not add the key to the registry but simply wants
to ignore it, but there is no way to tell Plink to do so, the tests would
fail.

This patch filters the `GIT_SSH` environment variable from JGit's
`SystemReader`, so that the internal SSH client is used.

5 years agoMerge pull request #1322 from fzs/sshd_update
Florian Zschocke [Sun, 10 Nov 2019 16:56:56 +0000 (17:56 +0100)]
Merge pull request #1322 from fzs/sshd_update

Update dependencies MINA to 2.0.21 and SSHD to 1.2.0

Update SSHD to fix an issue with hmac-sha2-512. This resolves problems with clients that prefer SHA-512 over SHA-256.

This also updates the dependency on SLF4J to the latest version, as the updated dependency on MINA did also bring in higher SLF4J versions.

5 years agoUpdate SLF4J dependency to latest version 1.7.29. 1322/head
Florian Zschocke [Fri, 8 Nov 2019 18:48:05 +0000 (19:48 +0100)]
Update SLF4J dependency to latest version 1.7.29.

5 years agoUpdate SSHD dependency to version 1.2.0.
Florian Zschocke [Fri, 8 Nov 2019 18:19:54 +0000 (19:19 +0100)]
Update SSHD dependency to version 1.2.0.

5 years agoUpdate SSHD dependency to version 1.1.0.
Florian Zschocke [Fri, 8 Nov 2019 16:26:06 +0000 (17:26 +0100)]
Update SSHD dependency to version 1.1.0.

5 years agoUpdate MINA to version 2.0.21.
Florian Zschocke [Fri, 8 Nov 2019 13:55:07 +0000 (14:55 +0100)]
Update MINA to version 2.0.21.

This includes a fix in MINA to a CVE.

5 years agoUpdate BouncyCastle dependency to version 1.57
Florian Zschocke [Sun, 10 Nov 2019 12:02:07 +0000 (13:02 +0100)]
Update BouncyCastle dependency to version 1.57

To support the new PBKDF2 password hashing, the Bouncy Castle provider
needs to be updated to a version that supports PBKDF2 with HMAC SHA265.
The current version doesn't have PBKDF2WithHmacSHA265, and neither does
Java 7, so that under Java 7 it can not be used. This update enables
the new password hashing under Java 7, too.

5 years agoIgnore the `RedisTicketService` tests until they are fixed.
Florian Zschocke [Sun, 10 Nov 2019 12:00:12 +0000 (13:00 +0100)]
Ignore the `RedisTicketService` tests until they are fixed.

Currently the tests cannot run as no Redis is available. Needs to be
fixed at some time.

5 years agoRemove Launcher from Manager and Federation Client.
Florian Zschocke [Fri, 8 Nov 2019 10:27:51 +0000 (11:27 +0100)]
Remove Launcher from Manager and Federation Client.

They will need to be called with the classpath and main class now,
instead of simply using the Jar.