Commit de6fff87 authored by Christian Kniss's avatar Christian Kniss

Merge branch 'develop' into 'master'

Gradle Umstellung, Aktualisierte Version 3.9.7

See merge request ERZ/SWE_de.bsvrz.kernsoftware!4
parents 6e89a2d1 aa9d2b97
### Gradle template
.gradle
/build/
build/
## Eclipse IDE
.classpath
.project
.settings/
bin/
## IDEA IDE
.idea/
kernsoftware-build:
image:
openjdk:8-jdk-alpine
script:
- ./gradlew build --stacktrace
......@@ -7,27 +7,29 @@ apply plugin: 'java'
// Der projektweite sweStatus und das sweDatum werden global in der build.gradle des :subprojects:
// gesetzt
String sweStatusGesamt = 'FREI'
String sweDatumGesamt = '2018-01-08'
String sweDatumGesamt = '2018-01-12'
buildscript {
// Plug-in de.bsvrz.gradle.nerzswe verfügbar machen, aber noch nicht laden!
// Alle gemeinsamen Eigenschaften für die Subprojekte werden im build.gradle
// für die Subprojekte definiert.
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "gradle.plugin.de.bsvrz.gradle.nerzswe:de.bsvrz.gradle.nerzswe:0.5.0"
classpath "gradle.plugin.de.bsvrz:de.bsvrz.gradle.nerzswe:0.7.0"
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.5.0'
}
}
// Projektweit gültige Version für alle Subprojekte
allprojects {
version '3.9.7'
}
// Projektweit gültige Version für alle Subprojekte
allprojects {
version '3.9.7'
}
//--------------------------------------------------------------------
......
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
<!-- Headers -->
<module name="Header">
<!--<property name="headerFile" value="${checkstyle.header.file}"/>-->
<property name="fileExtensions" value="java"/>
</module>
<!-- Size Violations -->
<module name="FileLength"/>
<!-- Miscellaneous -->
<module name="UniqueProperties"/>
<module name="TreeWalker">
<!-- Annotations -->
<module name="MissingDeprecated"/>
<module name="MissingOverride"/>
<module name="PackageAnnotation"/>
<!-- Class Design -->
<module name="InterfaceIsType"/>
<module name="OneTopLevelClass"/>
<!-- Coding -->
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EqualsHashCode"/>
<module name="StringLiteralEquality"/>
<module name="SuperClone"/>
<module name="SuperFinalize"/>
<!-- Imports -->
<module name="IllegalImport"/>
<!-- Metrics -->
<module name="BooleanExpressionComplexity"/>
<module name="ClassDataAbstractionCoupling"/>
<module name="ClassFanOutComplexity"/>
<module name="CyclomaticComplexity"/>
<module name="JavaNCSS"/>
<module name="NPathComplexity"/>
<!-- Miscellaneous -->
<module name="OuterTypeFilename"/>
<module name="UpperEll"/>
<!-- Modifiers -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<!-- Naming Conventions -->
<module name="AbbreviationAsWordInName"/>
<module name="ClassTypeParameterName"/>
<module name="ConstantName"/>
<module name="InterfaceTypeParameterName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName">
<property name="allowOneCharVarInForLoop" value="true"/>
</module>
<module name="MemberName"/>
<module name="MethodName"/>
<module name="MethodTypeParameterName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
<!-- Size Violations -->
<module name="AnonInnerLength"/>
<module name="ExecutableStatementCount"/>
<module name="LineLength">
<property name="max" value="120"/>
</module>
<module name="MethodCount"/>
<module name="MethodLength"/>
<module name="OuterTypeNumber"/>
<module name="ParameterNumber"/>
</module>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>
<Match>
<Bug pattern="DM_BOXED_PRIMITIVE_FOR_COMPARE"/>
</Match>
<Match>
<Bug pattern="DM_BOXED_PRIMITIVE_FOR_PARSING"/>
</Match>
<Match>
<Bug pattern="DM_DEFAULT_ENCODING"/>
</Match>
<Match>
<Bug pattern="DMI_INVOKING_TOSTRING_ON_ARRAY"/>
</Match>
<Match>
<Bug pattern="DLS_DEAD_LOCAL_STORE"/>
</Match>
<Match>
<Bug pattern="EC_UNRELATED_TYPES_USING_POINTER_EQUALITY"/>
</Match>
<Match>
<Bug pattern="EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS"/>
</Match>
<Match>
<Bug pattern="HE_EQUALS_USE_HASHCODE"/>
</Match>
<Match>
<Bug pattern="IL_INFINITE_LOOP"/>
</Match>
<Match>
<Bug pattern="MS_SHOULD_BE_FINAL"/>
</Match>
<Match>
<Bug pattern="NP_NULL_ON_SOME_PATH"/>
</Match>
<Match>
<Bug pattern="RC_REF_COMPARISON"/>
</Match>
<Match>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
</Match>
<Match>
<Bug pattern="UC_USELESS_CONDITION"/>
</Match>
<Match>
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
</Match>
<Match><Bug pattern="DM_GC"/></Match>
<Match><Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/></Match>
<Match><Bug pattern="REC_CATCH_EXCEPTION"/></Match>
<Match><Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/></Match>
<Match><Bug pattern="LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE"/></Match>
<Match><Bug pattern="LI_LAZY_INIT_UPDATE_STATIC"/></Match>
<Match><Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/></Match>
<Match><Bug pattern="STCAL_INVOKE_ON_STATIC_CALENDAR_INSTANCE"/></Match>
<Match><Bug pattern="STCAL_INVOKE_ON_STATIC_DATE_FORMAT_INSTANCE"/></Match>
<Match><Bug pattern="STCAL_STATIC_SIMPLE_DATE_FORMAT_INSTANCE"/></Match>
<Match><Bug pattern="RU_INVOKE_RUN"/></Match>
<Match><Bug pattern=""/></Match>
</FindBugsFilter>
File mode changed from 100644 to 100755
......@@ -4,14 +4,14 @@
subprojects {
apply plugin: "de.bsvrz.gradle.nerzswe"
apply plugin: "biz.aQute.bnd.builder"
description 'Gradle Multiprojekt Testumgebung für das Kernsystem des NERZ e.V.'
// Properties des NERZ-SWE-Plugins:
nerzswe {
sweStatus = 'FREI'
sweDatum = '2018-01-08'
sweDatum = '2018-01-12'
}
......
-exportcontents: de.bsvrz.dav.daf.*
-sources: true
Bundle-Name: de.bsvrz.dav.daf
......@@ -25,8 +25,7 @@ dependencies {
compile project(":subprojects:de.bsvrz.sys.funclib.timeout")
compile project(":subprojects:de.bsvrz.sys.funclib.kappich")
compile files("lib/srp6a-2.0.0.jar")
compile 'com.nimbusds:srp6a:2.0.0'
// Test:
testCompile group: 'junit', name: 'junit', version: '4.12'
......
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
<!-- Headers -->
<module name="Header">
<!--<property name="headerFile" value="${checkstyle.header.file}"/>-->
<property name="fileExtensions" value="java"/>
</module>
<!-- Size Violations -->
<module name="FileLength"/>
<!-- Miscellaneous -->
<module name="UniqueProperties"/>
<module name="TreeWalker">
<!-- Annotations -->
<module name="MissingDeprecated"/>
<module name="MissingOverride"/>
<module name="PackageAnnotation"/>
<!-- Class Design -->
<module name="InterfaceIsType"/>
<module name="OneTopLevelClass"/>
<!-- Coding -->
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EqualsHashCode"/>
<module name="StringLiteralEquality"/>
<module name="SuperClone"/>
<module name="SuperFinalize"/>
<!-- Imports -->
<module name="IllegalImport"/>
<!-- Metrics -->
<module name="BooleanExpressionComplexity"/>
<module name="ClassDataAbstractionCoupling"/>
<module name="ClassFanOutComplexity"/>
<module name="CyclomaticComplexity"/>
<module name="JavaNCSS"/>
<module name="NPathComplexity"/>
<!-- Miscellaneous -->
<module name="OuterTypeFilename"/>
<module name="UpperEll"/>
<!-- Modifiers -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<!-- Naming Conventions -->
<module name="AbbreviationAsWordInName"/>
<module name="ClassTypeParameterName"/>
<module name="ConstantName"/>
<module name="InterfaceTypeParameterName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName">
<property name="allowOneCharVarInForLoop" value="true"/>
</module>
<module name="MemberName"/>
<module name="MethodName"/>
<module name="MethodTypeParameterName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
<!-- Size Violations -->
<module name="AnonInnerLength"/>
<module name="ExecutableStatementCount"/>
<module name="LineLength">
<property name="max" value="120"/>
</module>
<module name="MethodCount"/>
<module name="MethodLength"/>
<module name="OuterTypeNumber"/>
<module name="ParameterNumber"/>
</module>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>
<Match>
<Bug pattern="DM_BOXED_PRIMITIVE_FOR_COMPARE"/>
</Match>
<Match>
<Bug pattern="DM_BOXED_PRIMITIVE_FOR_PARSING"/>
</Match>
<Match>
<Bug pattern="DM_DEFAULT_ENCODING"/>
</Match>
<Match>
<Bug pattern="DMI_INVOKING_TOSTRING_ON_ARRAY"/>
</Match>
<Match>
<Bug pattern="DLS_DEAD_LOCAL_STORE"/>
</Match>
<Match>
<Bug pattern="EC_UNRELATED_TYPES_USING_POINTER_EQUALITY"/>
</Match>
<Match>
<Bug pattern="EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS"/>
</Match>
<Match>
<Bug pattern="HE_EQUALS_USE_HASHCODE"/>
</Match>
<Match>
<Bug pattern="IL_INFINITE_LOOP"/>
</Match>
<Match>
<Bug pattern="MS_SHOULD_BE_FINAL"/>
</Match>
<Match>
<Bug pattern="NP_NULL_ON_SOME_PATH"/>
</Match>
<Match>
<Bug pattern="RC_REF_COMPARISON"/>
</Match>
<Match>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
</Match>
<Match>
<Bug pattern="UC_USELESS_CONDITION"/>
</Match>
<Match>
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
</Match>
<Match><Bug pattern="DM_GC"/></Match>
<Match><Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/></Match>
<Match><Bug pattern="REC_CATCH_EXCEPTION"/></Match>
<Match><Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/></Match>
<Match><Bug pattern="LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE"/></Match>
<Match><Bug pattern="LI_LAZY_INIT_UPDATE_STATIC"/></Match>
<Match><Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/></Match>
<Match><Bug pattern="STCAL_INVOKE_ON_STATIC_CALENDAR_INSTANCE"/></Match>
<Match><Bug pattern="STCAL_INVOKE_ON_STATIC_DATE_FORMAT_INSTANCE"/></Match>
<Match><Bug pattern="STCAL_STATIC_SIMPLE_DATE_FORMAT_INSTANCE"/></Match>
<Match><Bug pattern="RU_INVOKE_RUN"/></Match>
<Match><Bug pattern=""/></Match>
</FindBugsFilter>
......@@ -5,7 +5,7 @@
public static String getRelease() { return "Kernsoftware 3.9.7";}
public static String getVersion() { return "3.9.7";}
public static String getRevision() { return "";}
public static String getCompileTime() { return "08.01.18 10:51:13";}
public static String getCompileTime() { return "12.01.18 12:34:40";}
public static String getDependsOnCompiled() { return "siehe Datei de.bsvrz.dav.daf-Build-Report.txt";}
public static String getDependsOnSource() { return "siehe Datei de.bsvrz.dav.daf-Build-Report.txt";}
public static String getDependsOnLib() { return "siehe Datei de.bsvrz.dav.daf-Build-Report.txt";}
......
-exportcontents: de.bsvrz.dav.dav.*
-sources: true
Bundle-Name: de.bsvrz.dav.dav
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
<!-- Headers -->
<module name="Header">
<!--<property name="headerFile" value="${checkstyle.header.file}"/>-->
<property name="fileExtensions" value="java"/>
</module>
<!-- Size Violations -->
<module name="FileLength"/>
<!-- Miscellaneous -->
<module name="UniqueProperties"/>
<module name="TreeWalker">
<!-- Annotations -->
<module name="MissingDeprecated"/>
<module name="MissingOverride"/>
<module name="PackageAnnotation"/>
<!-- Class Design -->
<module name="InterfaceIsType"/>
<module name="OneTopLevelClass"/>
<!-- Coding -->
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EqualsHashCode"/>
<module name="StringLiteralEquality"/>
<module name="SuperClone"/>
<module name="SuperFinalize"/>
<!-- Imports -->
<module name="IllegalImport"/>
<!-- Metrics -->
<module name="BooleanExpressionComplexity"/>
<module name="ClassDataAbstractionCoupling"/>
<module name="ClassFanOutComplexity"/>
<module name="CyclomaticComplexity"/>
<module name="JavaNCSS"/>
<module name="NPathComplexity"/>
<!-- Miscellaneous -->
<module name="OuterTypeFilename"/>
<module name="UpperEll"/>
<!-- Modifiers -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<!-- Naming Conventions -->
<module name="AbbreviationAsWordInName"/>
<module name="ClassTypeParameterName"/>
<module name="ConstantName"/>
<module name="InterfaceTypeParameterName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName">
<property name="allowOneCharVarInForLoop" value="true"/>
</module>
<module name="MemberName"/>
<module name="MethodName"/>
<module name="MethodTypeParameterName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
<!-- Size Violations -->
<module name="AnonInnerLength"/>
<module name="ExecutableStatementCount"/>
<module name="LineLength">
<property name="max" value="120"/>
</module>
<module name="MethodCount"/>
<module name="MethodLength"/>
<module name="OuterTypeNumber"/>
<module name="ParameterNumber"/>
</module>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>
<Match>
<Bug pattern="DM_BOXED_PRIMITIVE_FOR_COMPARE"/>
</Match>
<Match>
<Bug pattern="DM_BOXED_PRIMITIVE_FOR_PARSING"/>
</Match>
<Match>
<Bug pattern="DM_DEFAULT_ENCODING"/>
</Match>
<Match>
<Bug pattern="DMI_INVOKING_TOSTRING_ON_ARRAY"/>
</Match>
<Match>
<Bug pattern="DLS_DEAD_LOCAL_STORE"/>
</Match>
<Match>
<Bug pattern="EC_UNRELATED_TYPES_USING_POINTER_EQUALITY"/>
</Match>
<Match>
<Bug pattern="EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS"/>
</Match>
<Match>
<Bug pattern="HE_EQUALS_USE_HASHCODE"/>
</Match>
<Match>
<Bug pattern="IL_INFINITE_LOOP"/>
</Match>
<Match>
<Bug pattern="MS_SHOULD_BE_FINAL"/>
</Match>
<Match>
<Bug pattern="NP_NULL_ON_SOME_PATH"/>
</Match>
<Match>
<Bug pattern="RC_REF_COMPARISON"/>
</Match>
<Match>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
</Match>
<Match>
<Bug pattern="UC_USELESS_CONDITION"/>
</Match>
<Match>
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
</Match>
<Match><Bug pattern="DM_GC"/></Match>
<Match><Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/></Match>
<Match><Bug pattern="REC_CATCH_EXCEPTION"/></Match>
<Match><Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/></Match>
<Match><Bug pattern="LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE"/></Match>
<Match><Bug pattern="LI_LAZY_INIT_UPDATE_STATIC"/></Match>
<Match><Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/></Match>
<Match><Bug pattern="STCAL_INVOKE_ON_STATIC_CALENDAR_INSTANCE"/></Match>
<Match><Bug pattern="STCAL_INVOKE_ON_STATIC_DATE_FORMAT_INSTANCE"/></Match>
<Match><Bug pattern="STCAL_STATIC_SIMPLE_DATE_FORMAT_INSTANCE"/></Match>
<Match><Bug pattern="RU_INVOKE_RUN"/></Match>
<Match><Bug pattern=""/></Match>
</FindBugsFilter>
......@@ -5,7 +5,7 @@
public static String getRelease() { return "Kernsoftware 3.9.7";}
public static String getVersion() { return "3.9.7";}
public static String getRevision() { return "";}
public static String getCompileTime() { return "08.01.18 10:51:13";}
public static String getCompileTime() { return "12.01.18 12:34:40";}
public static String getDependsOnCompiled() { return "siehe Datei de.bsvrz.dav.dav-Build-Report.txt";}
public static String getDependsOnSource() { return "siehe Datei de.bsvrz.dav.dav-Build-Report.txt";}
public static String getDependsOnLib() { return "siehe Datei de.bsvrz.dav.dav-Build-Report.txt";}
......
-exportcontents: de.bsvrz.pat.datgen.*
-sources: true
Bundle-Name: de.bsvrz.pat.datgen
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
<!-- Headers -->
<module name="Header">
<!--<property name="headerFile" value="${checkstyle.header.file}"/>-->
<property name="fileExtensions" value="java"/>
</module>
<!-- Size Violations -->
<module name="FileLength"/>
<!-- Miscellaneous -->
<module name="UniqueProperties"/>
<module name="TreeWalker">
<!-- Annotations -->
<module name="MissingDeprecated"/>
<module name="MissingOverride"/>
<module name="PackageAnnotation"/>
<!-- Class Design -->
<module name="InterfaceIsType"/>
<module name="OneTopLevelClass"/>
<!-- Coding -->
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EqualsHashCode"/>
<module name="StringLiteralEquality"/>
<module name="SuperClone"/>
<module name="SuperFinalize"/>
<!-- Imports -->
<module name="IllegalImport"/>
<!-- Metrics -->
<module name="BooleanExpressionComplexity"/>
<module name="ClassDataAbstractionCoupling"/>
<module name="ClassFanOutComplexity"/>
<module name="CyclomaticComplexity"/>
<module name="JavaNCSS"/>
<module name="NPathComplexity"/>
<!-- Miscellaneous -->
<module name="OuterTypeFilename"/>
<module name="UpperEll"/>
<!-- Modifiers -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<!-- Naming Conventions -->
<module name="AbbreviationAsWordInName"/>
<module name="ClassTypeParameterName"/>
<module name="ConstantName"/>
<module name="InterfaceTypeParameterName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName">
<property name="allowOneCharVarInForLoop" value="true"/>
</module>
<module name="MemberName"/>