Commit de6fff87 authored by Christian Kniss's avatar Christian Kniss
Browse files

Merge branch 'develop' into 'master' 

Gradle Umstellung, Aktualisierte Version 3.9.7

See merge request ERZ/SWE_de.bsvrz.kernsoftware!4
parents 6e89a2d1 aa9d2b97

.gitignore

+10 −1
Original line number Diff line number Diff line 
### Gradle template

.gradle

/build/

build/



## Eclipse IDE

.classpath

.project

.settings/

bin/



## IDEA IDE

.idea/

.gitlab-ci.yml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
kernsoftware-build:

    image: 

        openjdk:8-jdk-alpine

    script:

      - ./gradlew build --stacktrace

build.gradle

+8 −6
Original line number Diff line number Diff line
@@ -7,20 +7,23 @@ 
// 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'

  }

}
@@ -28,7 +31,6 @@ 
allprojects {

  version '3.9.7'

}

}



//--------------------------------------------------------------------

// Task, welcher alle erzeugten Distributionspakete der Subprojekte

config/checkstyle/checkstyle.xml

0 → 100644
+88 −0
Original line number Diff line number Diff line 
<!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

config/findbugs/findbugs-exclude.xml

0 → 100644
+63 −0
Original line number Diff line number Diff line 
<?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>