diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/BUILD | 16 | ||||
| -rwxr-xr-x | tools/version.sh | 22 |
2 files changed, 14 insertions, 24 deletions
diff --git a/tools/BUILD b/tools/BUILD index f0342ad75a..bfe0d6ef8b 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -26,13 +26,13 @@ java_package_configuration( "-Xep:ReferenceEquality:WARN", "-Xep:StringEquality:WARN", "-Xep:WildcardImport:ERROR", - "-Xep:AmbiguousMethodReference:WARN", + "-Xep:AmbiguousMethodReference:ERROR", "-Xep:BadAnnotationImplementation:ERROR", "-Xep:BadComparable:WARN", "-Xep:BoxedPrimitiveConstructor:ERROR", "-Xep:CannotMockFinalClass:ERROR", "-Xep:ClassCanBeStatic:ERROR", - "-Xep:ClassNewInstance:WARN", + "-Xep:ClassNewInstance:ERROR", "-Xep:DefaultCharset:ERROR", "-Xep:DoubleCheckedLocking:ERROR", "-Xep:ElementsCountedInLoop:ERROR", @@ -44,10 +44,10 @@ java_package_configuration( "-Xep:FragmentInjection:ERROR", "-Xep:FragmentNotInstantiable:ERROR", "-Xep:FunctionalInterfaceClash:ERROR", - "-Xep:FutureReturnValueIgnored:WARN", + "-Xep:FutureReturnValueIgnored:ERROR", "-Xep:GetClassOnEnum:ERROR", "-Xep:ImmutableAnnotationChecker:ERROR", - "-Xep:ImmutableEnumChecker:WARN", + "-Xep:ImmutableEnumChecker:ERROR", "-Xep:IncompatibleModifiers:ERROR", "-Xep:InjectOnConstructorOfAbstractClass:ERROR", "-Xep:InputStreamSlowMultibyteRead:ERROR", @@ -58,19 +58,19 @@ java_package_configuration( "-Xep:MissingFail:ERROR", "-Xep:MissingOverride:ERROR", "-Xep:MutableConstantField:ERROR", - "-Xep:NarrowingCompoundAssignment:WARN", + "-Xep:NarrowingCompoundAssignment:ERROR", "-Xep:NonAtomicVolatileUpdate:ERROR", - "-Xep:NonOverridingEquals:WARN", + "-Xep:NonOverridingEquals:ERROR", "-Xep:NullableConstructor:ERROR", "-Xep:NullablePrimitive:ERROR", "-Xep:NullableVoid:ERROR", - "-Xep:OperatorPrecedence:WARN", + "-Xep:OperatorPrecedence:ERROR", "-Xep:OverridesGuiceInjectableMethod:ERROR", "-Xep:PreconditionsInvalidPlaceholder:ERROR", "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", "-Xep:ProtocolBufferOrdinal:ERROR", "-Xep:RequiredModifiers:ERROR", - "-Xep:ShortCircuitBoolean:WARN", + "-Xep:ShortCircuitBoolean:ERROR", "-Xep:SimpleDateFormatConstant:ERROR", "-Xep:StaticGuardedByInstance:ERROR", "-Xep:SynchronizeOnNonFinalField:ERROR", diff --git a/tools/version.sh b/tools/version.sh index 8b8095db42..80693cdbdb 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -131,7 +131,8 @@ perl -pi~ -e ' $seen_version = 1 if (!/<\?xml/ && s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/); } - s/(import feature="org\.eclipse\.jgit.*" version=")[^"]*(")/${1}'"$API_V"'${2}/; + s/(import feature="org\.eclipse\.jgit[^"]*" version=")[^"]*(")/${1}'"$API_V"'${2}/; + s/(import plugin="org\.eclipse\.jgit[^"]*" version=")[^"]*(")/${1}'"$API_V"'${2}/; ' org.eclipse.jgit.packaging/org.*.feature/feature.xml perl -pi~ -e ' @@ -139,22 +140,11 @@ perl -pi~ -e ' $seen_version = 0; $old_argv = $ARGV; } - if (!$seen_version) { - $seen_version = 1 if - s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; - } - ' org.eclipse.jgit.packaging/org.*.feature/pom.xml - -perl -pi~ -e ' - if ($ARGV ne $old_argv) { - $seen_version = 0; - $old_argv = $ARGV; - } - if (!$seen_version) { - $seen_version = 1 if + if ($seen_version < 2) { + $seen_version++ if s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; } - ' org.eclipse.jgit.packaging/pom.xml + ' org.eclipse.jgit.packaging/org.*.source.feature/pom.xml perl -pi~ -e ' if ($ARGV ne $old_argv) { @@ -162,7 +152,7 @@ perl -pi~ -e ' $old_argv = $ARGV; } if ($seen_version < 18) { - $seen_version++ if + $seen_version++ if s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; } ' org.eclipse.jgit.coverage/pom.xml |