Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-26 00:56:09 +02:00
Code Issues Packages Projects Releases Activity

Update Gradle to 7.3 (#1873)

Browse Source 
Update Gradle to 7.3. in order to profit from the performance improvement and to prepare for dependency lockfiles. Due to the upgrade to 7.x we had to use a license plugin which supports Gradle 7.
This commit is contained in:
Sebastian Sdorra
2021-11-29 09:05:24 +01:00
committed by GitHub
parent 1082d39120
commit 9dee08f68d
94 changed files with 378 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-plugins/build.gradle
View File

@@ -33,7 +33,7 @@ apply from: file( '../gradle/dependencies.gradle' )
dependencies {
implementation gradleApi()
implementation 'com.github.node-gradle:gradle-node-plugin:2.2.4'
implementation 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
implementation 'org.scm-manager:gradle-license-plugin:0.7.1'
implementation libraries.guava
implementation libraries.jettyServer

28
build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy
View File

@@ -23,7 +23,6 @@
*/
package com.cloudogu.scm
import com.hierynomus.gradle.license.tasks.LicenseCheck
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.publish.maven.MavenPublication
@@ -36,7 +35,7 @@ class JavaModulePlugin implements Plugin<Project> {
void apply(Project project) {
project.plugins.apply("java")
project.plugins.apply("maven-publish")
project.plugins.apply("com.github.hierynomus.license")
project.plugins.apply("org.scm-manager.license")
project.java {
toolchain {
@@ -110,14 +109,8 @@ class JavaModulePlugin implements Plugin<Project> {
project.license {
header project.rootProject.file('LICENSE.txt')
strictCheck true
mapping {
tsx = 'SLASHSTAR_STYLE'
ts = 'SLASHSTAR_STYLE'
java = 'SLASHSTAR_STYLE'
gradle = 'SLASHSTAR_STYLE'
}
newLine = true
ignoreNewLine = true
exclude "**/*.mustache"
exclude "**/*.json"
@@ -133,17 +126,14 @@ class JavaModulePlugin implements Plugin<Project> {
exclude "**/*.jpg"
exclude "**/*.gif"
exclude "**/*.dump"
tasks {
gradle {
files.from("build.gradle", "settings.gradle", "gradle.properties")
}
}
}
project.tasks.register("licenseBuild", LicenseCheck) {
source = project.fileTree(dir: ".").include("build.gradle", "settings.gradle", "gradle.properties")
enabled = true
}
project.tasks.getByName("license").configure {
dependsOn("licenseBuild")
enabled = true
}
}
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

269
gradlew vendored
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env sh
#!/bin/sh
#
# Copyright 2015 the original author or authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
MAX_FD=maximum
warn () {
echo "$*"
}
} >&2
die () {
echo
echo "$*"
echo
exit 1
}
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

3
scm-annotations/src/main/resources/META-INF/scm/module.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<module>
<extension-point>
<class>javax.servlet.ServletContextListener</class>

2
scm-core/build.gradle
View File

@@ -128,7 +128,7 @@ dependencies {
}
jar {
from project.buildDirectory.dir('info')
from project.layout.buildDirectory.dir('info')
dependsOn 'build-info'
}

3
scm-core/src/test/resources/META-INF/validation.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<validation-config
xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

3
scm-core/src/test/resources/sonia/scm/plugin/module.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<module>
<!-- subscribers -->

3
scm-core/src/test/resources/sonia/scm/plugin/review-plugin.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>
<information>

3
scm-core/src/test/resources/sonia/scm/util/xmlutil.01.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<root>
<entry01>value01</entry01>
<parent>

3
scm-dao-xml/src/test/resources/sonia/scm/store/fixed.format.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" ?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<configuration>
<entry>
<key>3ZOHKUePB3</key>

3
scm-dao-xml/src/test/resources/sonia/scm/store/repositoryDaoMetadata.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repositories>
<properties/>
<id>existing</id>

3
scm-dao-xml/src/test/resources/sonia/scm/store/wrong.format.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" ?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<configuration>
<entry>
<key>3ZOHKUePB3</key>

25
scm-packaging/deb/Vagrantfile vendored
View File

@@ -1,5 +1,26 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
# MIT License
#
# Copyright (c) 2020-present Cloudogu GmbH and Contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#
Vagrant.configure("2") do |config|
config.vm.box = "bento/ubuntu-18.04"

22
scm-packaging/deb/build.gradle
View File

@@ -21,12 +21,13 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import org.gradle.util.VersionNumber
plugins {
id 'nebula.ospackage' version '8.5.6'
id 'org.scm-manager.packaging'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
}
configurations {
@@ -168,20 +169,15 @@ artifacts {
license {
header rootProject.file("LICENSE.txt")
strictCheck true
mapping {
gradle = 'SLASHSTAR_STYLE'
tasks {
build {
files.from("build.gradle", "Vagrantfile")
}
main {
files.from("src")
}
}
exclude '**/build/**'
include '**/src/**'
include 'build.gradle'
include 'Vagrantfile'
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
}
task publish(type: HttpUploadTask) {

3
scm-packaging/deb/src/main/fs/etc/scm/logging.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!--
Document : logback.release.xml
Created on : February 3, 2011, 6:36 PM

3
scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">

3
scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>

21
scm-packaging/docker/build.gradle
View File

@@ -25,7 +25,7 @@
plugins {
id 'com.bmuschko.docker-remote-api' version '6.6.1'
id 'org.scm-manager.packaging'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
}
import org.gradle.util.VersionNumber
@@ -119,18 +119,17 @@ artifacts {
license {
header rootProject.file("LICENSE.txt")
strictCheck true
mapping {
gradle = 'SLASHSTAR_STYLE'
tasks {
build {
files.from("build.gradle", "Dockerfile")
}
main {
files.from("src")
}
}
exclude '**/build/**'
include '**/src/**'
include 'build.gradle'
include 'Dockerfile'
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
task check {
dependsOn checkLicenses
}

3
scm-packaging/docker/src/main/fs/etc/scm/logging.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!--
Document : logback.release.xml
Created on : February 3, 2011, 6:36 PM

3
scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">

3
scm-packaging/docker/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>

27
scm-packaging/helm/build.gradle
View File

@@ -26,7 +26,7 @@ plugins {
id 'org.unbroken-dome.helm' version '1.5.0'
id 'org.unbroken-dome.helm-publish' version '1.5.0'
id 'org.scm-manager.packaging'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
}
configurations {
@@ -97,23 +97,20 @@ task publish {
license {
header rootProject.file("LICENSE.txt")
strictCheck true
mapping {
gradle = 'SLASHSTAR_STYLE'
}
// TODO
// we get a strange build error with the license header,
// so we remove it for now
exclude '**/Chart.yaml'
exclude '**/build/**'
exclude '**/*.txt'
include '**/src/**'
include 'build.gradle'
tasks {
build {
files.from("build.gradle")
}
main {
files.from("src")
}
}
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
task check {
dependsOn checkLicenses
}

22
scm-packaging/release-yaml/build.gradle
View File

@@ -1,5 +1,3 @@
import com.cloudogu.scm.GitHubUploadTask
/*
* MIT License
*
@@ -24,9 +22,11 @@ import com.cloudogu.scm.GitHubUploadTask
* SOFTWARE.
*/
import com.cloudogu.scm.GitHubUploadTask
plugins {
id 'org.scm-manager.packaging'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
}
configurations {
@@ -68,15 +68,15 @@ task publish(type: GitHubUploadTask) {
license {
header rootProject.file("LICENSE.txt")
strictCheck true
mapping {
gradle = 'SLASHSTAR_STYLE'
tasks {
gradle {
files.from('build.gradle')
}
}
include 'build.gradle'
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
task check {
dependsOn checkLicenses
}

25
scm-packaging/rpm/Vagrantfile vendored
View File

@@ -1,5 +1,26 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
# MIT License
#
# Copyright (c) 2020-present Cloudogu GmbH and Contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#
Vagrant.configure("2") do |config|

22
scm-packaging/rpm/build.gradle
View File

@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import org.gradle.util.VersionNumber
// nebula.ospackage uses redline to build the rpm package.
@@ -48,7 +49,7 @@ buildscript {
plugins {
id 'nebula.ospackage' version '8.5.6'
id 'org.scm-manager.packaging'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
}
configurations {
@@ -182,20 +183,15 @@ artifacts {
license {
header rootProject.file("LICENSE.txt")
strictCheck true
mapping {
gradle = 'SLASHSTAR_STYLE'
tasks {
build {
files.from("build.gradle", "Vagrantfile")
}
main {
files.from("src")
}
}
exclude '**/build/**'
include '**/src/**'
include 'build.gradle'
include 'Vagrantfile'
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
}
task publish(type: HttpUploadTask) {

3
scm-packaging/rpm/src/main/fs/etc/scm/logging.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!--
Document : logback.release.xml
Created on : February 3, 2011, 6:36 PM

3
scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">

3
scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>

22
scm-packaging/unix/build.gradle
View File

@@ -21,13 +21,14 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import org.gradle.util.VersionNumber
plugins {
id 'org.scm-manager.packaging'
id 'signing'
id 'maven-publish'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
}
configurations {
@@ -127,18 +128,13 @@ project.rootProject.publishing.repositories.each { r ->
license {
header rootProject.file("LICENSE.txt")
strictCheck true
mapping {
gradle = 'SLASHSTAR_STYLE'
tasks {
build {
files.from("build.gradle", "Dockerfile")
}
main {
files.from("src")
}
}
exclude '**/build/**'
exclude '**/*.txt'
include '**/src/**'
include 'build.gradle'
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
}

3
scm-packaging/unix/src/main/fs/conf/logging.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!--
Document : logback.release.xml
Created on : February 3, 2011, 6:36 PM

3
scm-packaging/unix/src/main/fs/conf/server-config.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">

3
scm-packaging/unix/src/main/fs/var/webapp/docroot/index.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>

22
scm-packaging/windows/build.gradle
View File

@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import org.gradle.util.VersionNumber
plugins {
@@ -28,7 +29,7 @@ plugins {
id 'org.scm-manager.packaging'
id 'signing'
id 'maven-publish'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
}
configurations {
@@ -131,18 +132,13 @@ project.rootProject.publishing.repositories.each { r ->
license {
header rootProject.file("LICENSE.txt")
strictCheck true
mapping {
gradle = 'SLASHSTAR_STYLE'
tasks {
build {
files.from("build.gradle", "Dockerfile")
}
main {
files.from("src")
}
}
exclude '**/build/**'
exclude '**/*.txt'
include '**/src/**'
include 'build.gradle'
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
}

3
scm-packaging/windows/src/main/fs/conf/logging.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!--
Document : logback.release.xml
Created on : February 3, 2011, 6:36 PM

3
scm-packaging/windows/src/main/fs/conf/server-config.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">

2
scm-packaging/windows/src/main/fs/scm-server.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,7 +20,6 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<service>

3
scm-packaging/windows/src/main/fs/webapp/docroot/index.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>

3
scm-plugins/scm-git-plugin/build.gradle
View File

@@ -22,9 +22,8 @@
* SOFTWARE.
*/
plugins {
id 'org.scm-manager.smp' version '0.9.4'
id 'org.scm-manager.smp' version '0.10.0'
}
def jgitVersion = '5.11.1.202105131744-r-scm1'

3
scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<permissions>
<permission>

3
scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repository-permissions>
<verbs>
<verb>git</verb>

3
scm-plugins/scm-hg-plugin/build.gradle
View File

@@ -22,9 +22,8 @@
* SOFTWARE.
*/
plugins {
id 'org.scm-manager.smp' version '0.9.4'
id 'org.scm-manager.smp' version '0.10.0'
}
dependencies {

3
scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<permissions>
<permission>

3
scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repository-permissions>
<verbs>
<verb>hg</verb>

3
scm-plugins/scm-integration-test-plugin/build.gradle
View File

@@ -22,9 +22,8 @@
* SOFTWARE.
*/
plugins {
id 'org.scm-manager.smp' version '0.9.4'
id 'org.scm-manager.smp' version '0.10.0'
}
dependencies {

3
scm-plugins/scm-legacy-plugin/build.gradle
View File

@@ -22,9 +22,8 @@
* SOFTWARE.
*/
plugins {
id 'org.scm-manager.smp' version '0.9.4'
id 'org.scm-manager.smp' version '0.10.0'
}
dependencies {

3
scm-plugins/scm-svn-plugin/build.gradle
View File

@@ -22,9 +22,8 @@
* SOFTWARE.
*/
plugins {
id 'org.scm-manager.smp' version '0.9.4'
id 'org.scm-manager.smp' version '0.10.0'
}
def svnkitVersion = '1.10.3-scm1'

3
scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<permissions>
<permission>

3
scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repository-permissions>
<verbs>
<verb>svn</verb>

30
scm-ui/build.gradle
View File

@@ -22,10 +22,9 @@
* SOFTWARE.
*/
plugins {
id 'com.github.node-gradle.node' version '2.2.4'
id 'com.github.hierynomus.license-base' version '0.15.0'
id 'org.scm-manager.license' version '0.7.1'
id 'org.scm-manager.ci'
}
@@ -104,7 +103,7 @@ task updateUiTestTimestamps(type: TouchFiles) {
}
task check {
dependsOn('typecheck', 'test', 'chromatic', 'license')
dependsOn('typecheck', 'test', 'chromatic', 'checkLicenses')
}
yarn_install {
@@ -223,14 +222,12 @@ task setVersionToNextSnapshot(type: YarnTask) {
license {
header rootProject.file("LICENSE.txt")
strictCheck true
newLine = true
ignoreNewLine = true
mapping {
tsx = 'SLASHSTAR_STYLE'
ts = 'SLASHSTAR_STYLE'
gradle = 'SLASHSTAR_STYLE'
feature = 'SCRIPT_STYLE'
scss = 'SLASHSTAR_STYLE'
style {
feature = 'HASH'
scss = 'BLOCK_COMMENT'
}
exclude '**/node_modules/**'
@@ -249,14 +246,11 @@ license {
exclude '**/*.iml'
exclude '**/.babelrc'
}
task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
source = fileTree('.')
}
task licenseFormat(type: com.hierynomus.gradle.license.tasks.LicenseFormat) {
source = fileTree('.')
tasks {
modules {
files.from(".")
}
}
}
sonarqube {

3
scm-ui/ui-components/.storybook/preview-head.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,6 +20,6 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<link id="ui-theme" data-theme="light" rel="stylesheet" type="text/css" href="/ui-theme-light.css">

2
scm-ui/ui-components/src/syntax-highlighting.module.css
View File

@@ -1,4 +1,4 @@
/**
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors

3
scm-ui/ui-styles/public/_index.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE html>
<html lang="en">

3
scm-ui/ui-styles/public/_styleguide.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<section class="section">
<div class="container">
<div class="notification is-info">

3
scm-ui/ui-styles/public/_theme.html
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!DOCTYPE html>
<html lang="en">
<head>

29
scm-webapp/build.gradle
View File

@@ -147,6 +147,7 @@ war {
into('WEB-INF/classes/META-INF/scm') {
from('build/openapi')
}
duplicatesStrategy 'WARN'
dependsOn 'copy-core-plugins', 'resolve'
}
@@ -161,6 +162,7 @@ task 'dev-war' (type: War) {
into('WEB-INF/classes/META-INF/scm') {
from('build/openapi')
}
duplicatesStrategy 'WARN'
dependsOn 'copy-core-plugins', 'resolve'
}
@@ -182,37 +184,16 @@ resolve {
classpath = sourceSets.main.runtimeClasspath
resourcePackages = ['sonia.scm.api.v2.resources']
outputDir = file('build/openapi')
openApiFile = file('build/tmp/openapi.yml')
openApiFile = file('build/openapi_tmp/openapi.yml')
}
task prepareOpenAPI(type: Copy) {
from 'src/main/doc/openapi.yml'
into 'build/tmp'
into 'build/openapi_tmp'
duplicatesStrategy 'WARN'
expand(version: project.version)
}
tasks.getByName("resolve").configure {
dependsOn 'prepareOpenAPI'
}
/**
WTF???
<!-- fix javadoc -->
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<!--
fix java.lang.NoClassDefFoundError org/w3c/dom/ElementTraversal
-->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
**/

3
scm-webapp/src/main/resources/META-INF/scm/permissions.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<permissions>
<permission>

3
scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repository-permissions>
<verbs>
<verb read-only="true">read</verb>

3
scm-webapp/src/main/resources/META-INF/validation.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<validation-config
xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

3
scm-webapp/src/main/resources/config/gcache.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<caches>
<defaultCache

3
scm-webapp/src/main/resources/logback.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!--
Document : logback.release.xml
Created on : February 3, 2011, 6:36 PM

3
scm-webapp/src/test/resources/META-INF/scm/repository-permissions.xml
View File

@@ -1,5 +1,4 @@
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repository-permissions>
<verbs>
<verb>test</verb>

3
scm-webapp/src/test/resources/logback-test.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<!--
Document : logback.xml
Created on : January 18, 2011, 5:46 PM

1
scm-webapp/src/test/resources/someScript.sh
View File

@@ -23,7 +23,6 @@
# SOFTWARE.
#
for f in * ; do
ls $f
done

3
scm-webapp/src/test/resources/sonia/scm/cache/ehcache.001.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<ehcache xmlns="http://ehcache.org/ehcache.xsd">
<diskStore path="java.io.tmpdir"/>

3
scm-webapp/src/test/resources/sonia/scm/cache/ehcache.002.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<ehcache xmlns="http://ehcache.org/ehcache.xsd">

3
scm-webapp/src/test/resources/sonia/scm/cache/ehcache.003.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<ehcache xmlns="http://ehcache.org/ehcache.xsd">

3
scm-webapp/src/test/resources/sonia/scm/cache/ehcache.004.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<ehcache xmlns="http://ehcache.org/ehcache.xsd">

3
scm-webapp/src/test/resources/sonia/scm/cache/ehcache.005.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<ehcache xmlns="http://ehcache.org/ehcache.xsd">
<defaultCache

3
scm-webapp/src/test/resources/sonia/scm/cache/ehcache.006.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<ehcache xmlns="http://ehcache.org/ehcache.xsd"
updateCheck="false"
maxBytesLocalDisk="512M">

3
scm-webapp/src/test/resources/sonia/scm/cache/ehcache.007.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<ehcache xmlns="http://ehcache.org/ehcache.xsd"
updateCheck="true"
maxBytesLocalDisk="1G">

3
scm-webapp/src/test/resources/sonia/scm/cache/gcache.001.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<caches>
<defaultCache

3
scm-webapp/src/test/resources/sonia/scm/cache/gcache.002.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<caches>
<cache

3
scm-webapp/src/test/resources/sonia/scm/cache/gcache.003.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<caches>
<cache

3
scm-webapp/src/test/resources/sonia/scm/cache/gcache.004.xml vendored
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<caches>
<cache

3
scm-webapp/src/test/resources/sonia/scm/plugin/scm-g-plugin.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>

3
scm-webapp/src/test/resources/sonia/scm/plugin/scm-h-plugin.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>

3
scm-webapp/src/test/resources/sonia/scm/plugin/scm-i-plugin.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>

3
scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-0-0.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>

3
scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-1-0.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>

3
scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-0-0.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>

3
scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-1-0.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<plugin>
<scm-version>2</scm-version>

3
scm-webapp/src/test/resources/sonia/scm/update/group/groups.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<group-db>
<creationTime>1559548854204</creationTime>
<groups>

3
scm-webapp/src/test/resources/sonia/scm/update/group/groups_empty_groups.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<group-db>
<creationTime>1558006904769</creationTime>
<groups/>

3
scm-webapp/src/test/resources/sonia/scm/update/group/groups_no_groups.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<group-db>
<creationTime>1558006904769</creationTime>
<lastModified>1558007174172</lastModified>

3
scm-webapp/src/test/resources/sonia/scm/update/repository/formerV2RepositoryFile.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repositories creation-time="1558604015815" last-modified="1558605291416">
<repository id="C2RRHjjeL2">repositories/C2RRHjjeL2</repository>
</repositories>

3
scm-webapp/src/test/resources/sonia/scm/update/repository/metadataWithoutRoles.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<repositories>
<properties/>
<contact>ich@du.er</contact>

3
scm-webapp/src/test/resources/sonia/scm/update/security/config-withAnon.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<scm-config>
<admin-groups>admins,vogons</admin-groups>
<admin-users>arthur,dent,ldap-admin</admin-users>

3
scm-webapp/src/test/resources/sonia/scm/update/security/config.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<scm-config>
<admin-groups>admins,vogons</admin-groups>
<admin-users>arthur,dent,ldap-admin</admin-users>

3
scm-webapp/src/test/resources/sonia/scm/update/security/emptySecurityV1.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" ?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,7 +21,7 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<configuration>
</configuration>

3
scm-webapp/src/test/resources/sonia/scm/update/security/securityV1.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" ?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<configuration>
<entry>
<key>4lRWOA7DH1</key>

3
scm-webapp/src/test/resources/sonia/scm/update/user/users.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
MIT License
Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<user-db>
<creationTime>1558597074729</creationTime>
<lastModified>1558597185919</lastModified>

2
settings.gradle
View File

@@ -33,7 +33,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath 'org.kordamp.gradle:enforcer-gradle-plugin:0.8.0'
classpath 'org.kordamp.gradle:enforcer-gradle-plugin:0.9.0'
}
}
apply plugin: 'org.kordamp.gradle.enforcer'