From 3ab31dda9ed8e2c7ac77243d1e2312a0e086bf50 Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Apr 04 2008 18:54:56 +0000 Subject: - Remove < 1.5 JVM requirement, and keep tests that need 1.5 --- diff --git a/checkstyle.spec b/checkstyle.spec index a827f2b..8c856c8 100644 --- a/checkstyle.spec +++ b/checkstyle.spec @@ -30,7 +30,7 @@ Name: checkstyle Version: 4.1 -Release: 4jpp.1%{?dist} +Release: 4jpp.2%{?dist} Epoch: 0 Summary: Java source code checker License: LGPL @@ -64,7 +64,7 @@ Requires: jakarta-commons-collections, jpackage-utils >= 0:1.5 Requires: jaxp_parser_impl BuildRequires: ant >= 0:1.6, ant-nodeps >= 0:1.6 BuildRequires: ant-junit >= 0:1.6, junit, antlr >= 0:2.7.1 -BuildRequires: java-devel < 0:1.5.0 +BuildRequires: java-devel BuildRequires: jakarta-commons-beanutils BuildRequires: jakarta-commons-cli, xalan-j2, jpackage-utils >= 0:1.5 BuildRequires: jakarta-commons-logging, jakarta-commons-collections, xerces-j2 @@ -140,118 +140,8 @@ Optional functionality for %{name}. %__perl -p -i -e 's|\./{\@docRoot}/\.\./index\.html|%{_docdir}/%{name}-manual-%{version}/index.html|' build.xml # remove all binary libs find . -name "*.jar" -exec %__rm -f {} \; -# some testinputs require java-1.5 -pushd src/testinputs -rm \ -com/puppycrawl/tools/checkstyle/coding/InputDeclarationOrder.java \ -com/puppycrawl/tools/checkstyle/coding/InputDefaultComesLast.java \ -com/puppycrawl/tools/checkstyle/coding/InputExplicitInit.java \ -com/puppycrawl/tools/checkstyle/coding/InputFinalize.java \ -com/puppycrawl/tools/checkstyle/coding/InputFinalLocalVariable.java \ -com/puppycrawl/tools/checkstyle/coding/InputInnerAssignment.java \ -com/puppycrawl/tools/checkstyle/coding/InputModifiedControl.java \ -com/puppycrawl/tools/checkstyle/coding/InputRequireThis.java \ -com/puppycrawl/tools/checkstyle/coding/InputUnnecessaryParentheses.java \ -com/puppycrawl/tools/checkstyle/Input15Extensions.java \ -com/puppycrawl/tools/checkstyle/InputDesignForExtension.java \ -com/puppycrawl/tools/checkstyle/InputFinalClass.java \ -com/puppycrawl/tools/checkstyle/InputFinalParameters.java \ -com/puppycrawl/tools/checkstyle/InputGenerics.java \ -com/puppycrawl/tools/checkstyle/InputHiddenField.java \ -com/puppycrawl/tools/checkstyle/InputHiddenFieldReorder.java \ -com/puppycrawl/tools/checkstyle/InputInner.java \ -com/puppycrawl/tools/checkstyle/InputJavadoc.java \ -com/puppycrawl/tools/checkstyle/InputJavadocStyleCheck.java \ -com/puppycrawl/tools/checkstyle/InputLeftCurlyMethod.java \ -com/puppycrawl/tools/checkstyle/InputLeftCurlyOther.java \ -com/puppycrawl/tools/checkstyle/InputMagicNumber.java \ -com/puppycrawl/tools/checkstyle/InputModifier.java \ -com/puppycrawl/tools/checkstyle/InputOpWrap.java \ -com/puppycrawl/tools/checkstyle/InputScopeInnerInterfaces.java \ -com/puppycrawl/tools/checkstyle/InputSemantic.java \ -com/puppycrawl/tools/checkstyle/InputTags.java \ -com/puppycrawl/tools/checkstyle/InputTypeParamsTags.java \ -com/puppycrawl/tools/checkstyle/InputWhitespace.java \ -com/puppycrawl/tools/checkstyle/MyAnnotation.java \ -com/puppycrawl/tools/checkstyle/grammars/InputHexFloat.java \ -com/puppycrawl/tools/checkstyle/grammars/InputVararg.java \ -com/puppycrawl/tools/checkstyle/imports/InputImportControl.java \ -com/puppycrawl/tools/checkstyle/imports/InputImportOrderCaseInsensitive.java \ -com/puppycrawl/tools/checkstyle/imports/InputImportOrder.java \ -com/puppycrawl/tools/checkstyle/indentation/InputValidBlockIndent.java \ -com/puppycrawl/tools/checkstyle/indentation/InputValidClassDefIndent.java \ -com/puppycrawl/tools/checkstyle/indentation/InputValidForIndent.java \ -com/puppycrawl/tools/checkstyle/javadoc/TestGenerics.java \ -com/puppycrawl/tools/checkstyle/metrics/ClassCouplingCheckTestInput.java \ -com/puppycrawl/tools/checkstyle/package-info.java \ -com/puppycrawl/tools/checkstyle/whitespace/InputMethodParamPad.java \ -com/puppycrawl/tools/checkstyle/indentation/InputValidAssignIndent.java \ -com/puppycrawl/tools/checkstyle/InputDoubleCheckedLocking.java \ - -popd -pushd src/tests -rm \ -com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/GenericIllegalRegexpCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/RegexpCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/RequiredRegexpCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/DoubleCheckedLockingCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/RedundantThrowsCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierTest.java \ -com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java \ -com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java \ -com/puppycrawl/tools/checkstyle/grammars/HexFloatsTest.java \ -com/puppycrawl/tools/checkstyle/grammars/VarargTest.java \ - -popd %build -export JAVA_HOME=/usr/lib/jvm/java-1.4.2 export OPT_JAR_LIST="ant/ant-junit junit ant/ant-nodeps jdom velocity" export CLASSPATH=$(build-classpath commons-collections) @@ -267,6 +157,9 @@ ln -sf $(build-classpath commons-logging) . #ln -sf $(build-classpath emma_ant) . popd +# FIXME: target run.tests disabled because it will need emma which Fedora does +# not have yet + %ant \ -Dbuild.sysclasspath=first \ -Dant.javadoc=%{_javadocdir}/ant \ @@ -275,9 +168,6 @@ popd -Dbeanutils.javadoc=%{_javadocdir}/jakarta-commons-beanutils \ build.bindist -# FIXME: target run.tests disabled because it will need emma which Fedora does -# not have yet - %install %__rm -rf %{buildroot} @@ -383,6 +273,9 @@ fi %{_javadir}/%{name}-optional-%{version}.jar %changelog +* Fri Apr 04 2008 Deepak Bhole - 0:4.1-4jpp.2 +- Remove < 1.5 JVM requirement, and keep tests that need 1.5 + * Thu Feb 24 2007 Deepak Bhole - 0:4.1-4jpp.1 - Update per Fedora spec - Removed emma and excalibur-avalon-logkit dependencies