[qdox] 01/03: Imported Debian patch 2.0-M3-1
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Oct 5 14:20:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository qdox.
commit 97983ad8aee60ba146d57169319973ab21c96c61
Merge: baca354 05f8bff
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Oct 5 14:30:40 2015 +0200
Imported Debian patch 2.0-M3-1
debian/README.Debian | 10 -
debian/build-classpath | 4 -
debian/build.properties | 5 -
debian/build.xml | 71 -
debian/changelog | 28 +-
debian/clean | 7 +
debian/control | 44 +-
debian/copyright | 3 +-
debian/libqdox-java-doc.doc-base.api | 10 +
debian/libqdox-java-doc.docs | 1 -
debian/libqdox-java-doc.install | 1 +
debian/libqdox-java.poms | 30 +-
debian/maven.cleanIgnoreRules | 1 +
debian/maven.ignoreRules | 12 +
debian/maven.properties | 1 +
debian/maven.publishedRules | 3 +-
debian/maven.rules | 6 +-
debian/patches/series | 1 +
debian/patches/workingDirectory.patch | 33 +
debian/rules | 15 +-
debian/watch | 2 +-
pom.xml | 398 +--
src/changes/changes.xml | 425 ---
src/grammar/commentlexer.flex | 206 ++
src/grammar/commentparser.y | 132 +
src/grammar/lexer.flex | 287 +-
src/grammar/parser.y | 2392 +++++++++++-----
src/grammar/skeleton.inner | 425 ---
src/it/lambda-examples/LambdaExamples01.zip | Bin 0 -> 20121 bytes
src/it/lambda-examples/invoker.properties | 1 +
src/it/lambda-examples/pom.xml | 22 +
src/it/lambda-examples/test.properties | 2 +
src/it/lambda-examples/verify.groovy | 8 +
src/it/qdox-223/pom.xml | 35 +
src/it/qdox-223/src/main/java/com/AnnotationA.java | 4 +
src/it/qdox-223/src/main/java/com/x/QClass.java | 8 +
.../qdox-223/src/main/java/com/x/package-info.java | 2 +
src/it/qdox-223/src/main/java/com/y/BClass.java | 10 +
.../qdox-223/src/main/java/com/y/package-info.java | 2 +
.../src/test/java/MissingAnnotationsTest.java | 24 +
src/it/qdox-224/pom.xml | 41 +
.../src/test/java/ClasspathSourcesTest.java | 32 +
src/it/qdox-241/pom.xml | 39 +
src/it/qdox-241/src/main/resources/qdox.properties | 1 +
.../qdox-241/src/test/java/QDoxPropertiesTest.java | 21 +
src/it/qdox-241/src/test/resources/Test.java | 46 +
src/it/settings.xml | 55 +
.../thoughtworks/qdox/DefaultJavaClassCache.java | 25 -
.../com/thoughtworks/qdox/JavaClassContext.java | 119 -
src/java/com/thoughtworks/qdox/JavaDocBuilder.java | 559 ----
src/java/com/thoughtworks/qdox/Searcher.java | 9 -
.../thoughtworks/qdox/ant/AbstractQdoxTask.java | 92 -
.../qdox/directorywalker/DirectoryScanner.java | 54 -
.../qdox/directorywalker/FileVisitor.java | 9 -
.../thoughtworks/qdox/directorywalker/Filter.java | 9 -
.../qdox/directorywalker/SuffixFilter.java | 15 -
.../com/thoughtworks/qdox/junit/APITestCase.java | 345 ---
.../qdox/model/AbstractBaseJavaEntity.java | 66 -
.../qdox/model/AbstractInheritableJavaEntity.java | 16 -
.../qdox/model/AbstractJavaEntity.java | 229 --
.../com/thoughtworks/qdox/model/Annotation.java | 128 -
.../com/thoughtworks/qdox/model/BeanProperty.java | 46 -
.../com/thoughtworks/qdox/model/ClassLibrary.java | 142 -
.../thoughtworks/qdox/model/DefaultDocletTag.java | 66 -
.../qdox/model/DefaultDocletTagFactory.java | 20 -
.../com/thoughtworks/qdox/model/DocletTag.java | 51 -
.../thoughtworks/qdox/model/DocletTagFactory.java | 21 -
.../com/thoughtworks/qdox/model/IndentBuffer.java | 43 -
.../com/thoughtworks/qdox/model/JavaClass.java | 740 -----
.../thoughtworks/qdox/model/JavaClassCache.java | 9 -
.../thoughtworks/qdox/model/JavaClassParent.java | 25 -
.../com/thoughtworks/qdox/model/JavaField.java | 103 -
.../com/thoughtworks/qdox/model/JavaMethod.java | 543 ----
.../com/thoughtworks/qdox/model/JavaPackage.java | 126 -
.../com/thoughtworks/qdox/model/JavaParameter.java | 82 -
.../com/thoughtworks/qdox/model/JavaSource.java | 346 ---
src/java/com/thoughtworks/qdox/model/Member.java | 11 -
.../com/thoughtworks/qdox/model/ModelBuilder.java | 336 ---
src/java/com/thoughtworks/qdox/model/Type.java | 424 ---
.../com/thoughtworks/qdox/model/TypeVariable.java | 56 -
.../com/thoughtworks/qdox/model/WildcardType.java | 38 -
.../qdox/model/annotation/AnnotationAdd.java | 21 -
.../qdox/model/annotation/AnnotationAnd.java | 21 -
.../model/annotation/AnnotationBinaryOperator.java | 22 -
.../qdox/model/annotation/AnnotationCast.java | 36 -
.../qdox/model/annotation/AnnotationConstant.java | 36 -
.../qdox/model/annotation/AnnotationDivide.java | 21 -
.../qdox/model/annotation/AnnotationEquals.java | 21 -
.../model/annotation/AnnotationExclusiveOr.java | 21 -
.../qdox/model/annotation/AnnotationFieldRef.java | 151 --
.../model/annotation/AnnotationGreaterEquals.java | 21 -
.../model/annotation/AnnotationGreaterThan.java | 21 -
.../model/annotation/AnnotationLessEquals.java | 21 -
.../qdox/model/annotation/AnnotationLessThan.java | 21 -
.../model/annotation/AnnotationLogicalAnd.java | 21 -
.../model/annotation/AnnotationLogicalNot.java | 20 -
.../qdox/model/annotation/AnnotationLogicalOr.java | 21 -
.../qdox/model/annotation/AnnotationMinusSign.java | 20 -
.../qdox/model/annotation/AnnotationMultiply.java | 21 -
.../qdox/model/annotation/AnnotationNot.java | 20 -
.../qdox/model/annotation/AnnotationNotEquals.java | 21 -
.../qdox/model/annotation/AnnotationOr.java | 21 -
.../annotation/AnnotationParenExpression.java | 27 -
.../qdox/model/annotation/AnnotationPlusSign.java | 20 -
.../qdox/model/annotation/AnnotationQuery.java | 41 -
.../qdox/model/annotation/AnnotationRemainder.java | 21 -
.../qdox/model/annotation/AnnotationShiftLeft.java | 21 -
.../model/annotation/AnnotationShiftRight.java | 21 -
.../qdox/model/annotation/AnnotationSubtract.java | 21 -
.../qdox/model/annotation/AnnotationTypeRef.java | 28 -
.../model/annotation/AnnotationUnaryOperator.java | 15 -
.../annotation/AnnotationUnsignedShiftRight.java | 21 -
.../qdox/model/annotation/AnnotationValue.java | 27 -
.../qdox/model/annotation/AnnotationValueList.java | 54 -
.../qdox/model/annotation/AnnotationVisitor.java | 74 -
.../qdox/model/annotation/EvaluatingVisitor.java | 737 -----
.../annotation/RecursiveAnnotationVisitor.java | 217 --
.../thoughtworks/qdox/model/util/OrderedMap.java | 121 -
src/java/com/thoughtworks/qdox/parser/Builder.java | 41 -
src/java/com/thoughtworks/qdox/parser/Lexer.java | 17 -
.../thoughtworks/qdox/parser/ParseException.java | 33 -
.../thoughtworks/qdox/parser/structs/AnnoDef.java | 34 -
.../thoughtworks/qdox/parser/structs/ClassDef.java | 52 -
.../thoughtworks/qdox/parser/structs/FieldDef.java | 50 -
.../qdox/parser/structs/LocatedDef.java | 7 -
.../qdox/parser/structs/MethodDef.java | 66 -
.../qdox/parser/structs/PackageDef.java | 20 -
.../thoughtworks/qdox/parser/structs/TagDef.java | 40 -
.../thoughtworks/qdox/parser/structs/TypeDef.java | 31 -
.../qdox/parser/structs/TypeVariableDef.java | 21 -
.../qdox/parser/structs/WildcardTypeDef.java | 35 -
.../com/thoughtworks/qdox/JavaProjectBuilder.java | 371 +++
src/main/java/com/thoughtworks/qdox/Searcher.java | 40 +
.../com/thoughtworks/qdox/builder/Builder.java | 69 +
.../qdox/builder/ModelBuilderFactory.java | 43 +
.../thoughtworks/qdox/builder/TypeAssembler.java | 107 +
.../impl/DefaultJavaAnnotationAssembler.java | 459 ++++
.../qdox/builder/impl/EvaluatingVisitor.java | 986 +++++++
.../qdox/builder/impl/ModelBuilder.java | 514 ++++
.../qdox/builder/impl/package-info.java | 4 +
.../thoughtworks/qdox/builder/package-info.java | 4 +
.../qdox/directorywalker/DirectoryScanner.java | 106 +
.../qdox/directorywalker/FileVisitor.java | 36 +
.../thoughtworks/qdox/directorywalker/Filter.java | 34 +
.../qdox/directorywalker/SuffixFilter.java | 51 +
.../qdox/directorywalker/package-info.java | 4 +
.../qdox/library/AbstractClassLibrary.java | 354 +++
.../thoughtworks/qdox/library/ClassLibrary.java | 96 +
.../qdox/library/ClassLibraryBuilder.java | 182 ++
.../qdox/library/ClassLoaderLibrary.java | 232 ++
.../qdox/library/ClassNameLibrary.java | 59 +
.../thoughtworks/qdox/library/ErrorHandler.java | 28 +
.../qdox/library/JavaClassContext.java | 157 ++
.../qdox/library/OrderedClassLibraryBuilder.java | 334 +++
.../qdox/library/SortedClassLibraryBuilder.java | 176 ++
.../qdox/library/SourceFolderLibrary.java | 105 +
.../thoughtworks/qdox/library/SourceLibrary.java | 404 +++
.../thoughtworks/qdox/library/package-info.java | 19 +
.../com/thoughtworks/qdox/model/BeanProperty.java | 57 +
.../com/thoughtworks/qdox/model/DocletTag.java | 82 +
.../thoughtworks/qdox/model/DocletTagFactory.java | 40 +
.../qdox/model/JavaAnnotatedElement.java | 94 +
.../thoughtworks/qdox/model/JavaAnnotation.java | 41 +
.../com/thoughtworks/qdox/model/JavaClass.java | 517 ++++
.../thoughtworks/qdox/model/JavaConstructor.java | 109 +
.../com/thoughtworks/qdox/model/JavaField.java | 86 +
.../qdox/model/JavaGenericDeclaration.java | 39 +
.../thoughtworks/qdox/model/JavaInitializer.java | 54 +
.../com/thoughtworks/qdox/model/JavaMember.java | 135 +
.../com/thoughtworks/qdox/model/JavaMethod.java | 190 ++
.../com/thoughtworks/qdox/model/JavaModel.java | 46 +
.../thoughtworks/qdox/model/JavaModelUtils.java | 66 +
.../com/thoughtworks/qdox/model/JavaPackage.java | 82 +
.../com/thoughtworks/qdox/model/JavaParameter.java | 110 +
.../qdox/model/JavaParameterizedType.java | 33 +
.../com/thoughtworks/qdox/model/JavaSource.java | 120 +
.../java/com/thoughtworks/qdox/model/JavaType.java | 142 +
.../thoughtworks/qdox/model/JavaTypeVariable.java | 32 +
.../thoughtworks/qdox/model/JavaWildcardType.java | 27 +
.../qdox/model/ParameterDeclarator.java | 13 +
.../thoughtworks/qdox/model/expression/Add.java | 45 +
.../thoughtworks/qdox/model/expression/And.java | 45 +
.../qdox/model/expression/AnnotationValue.java | 38 +
.../qdox/model/expression/AnnotationValueList.java | 88 +
.../qdox/model/expression/Assignment.java | 55 +
.../qdox/model/expression/BinaryOperator.java | 46 +
.../thoughtworks/qdox/model/expression/Cast.java | 62 +
.../qdox/model/expression/Constant.java | 327 +++
.../thoughtworks/qdox/model/expression/Divide.java | 45 +
.../thoughtworks/qdox/model/expression/Equals.java | 45 +
.../qdox/model/expression/ExclusiveOr.java | 45 +
.../qdox/model/expression/Expression.java | 30 +
.../qdox/model/expression/ExpressionVisitor.java | 106 +
.../qdox/model/expression/FieldRef.java | 222 ++
.../qdox/model/expression/GreaterEquals.java | 45 +
.../qdox/model/expression/GreaterThan.java | 45 +
.../qdox/model/expression/LessEquals.java | 45 +
.../qdox/model/expression/LessThan.java | 45 +
.../qdox/model/expression/LogicalAnd.java | 45 +
.../qdox/model/expression/LogicalNot.java | 45 +
.../qdox/model/expression/LogicalOr.java | 45 +
.../qdox/model/expression/MethodInvocation.java | 56 +
.../qdox/model/expression/MinusSign.java | 45 +
.../qdox/model/expression/Multiply.java | 45 +
.../thoughtworks/qdox/model/expression/Not.java | 45 +
.../qdox/model/expression/NotEquals.java | 45 +
.../com/thoughtworks/qdox/model/expression/Or.java | 45 +
.../qdox/model/expression/ParenExpression.java | 52 +
.../qdox/model/expression/PlusSign.java | 45 +
.../qdox/model/expression/PostDecrement.java | 47 +
.../qdox/model/expression/PostIncrement.java | 47 +
.../qdox/model/expression/PreDecrement.java | 47 +
.../qdox/model/expression/PreIncrement.java | 47 +
.../thoughtworks/qdox/model/expression/Query.java | 69 +
.../qdox/model/expression/Remainder.java | 45 +
.../qdox/model/expression/ShiftLeft.java | 45 +
.../qdox/model/expression/ShiftRight.java | 45 +
.../qdox/model/expression/Subtract.java | 45 +
.../qdox/model/expression/TypeRef.java | 54 +
.../qdox/model/expression/UnaryOperator.java | 37 +
.../qdox/model/expression/UnsignedShiftRight.java | 45 +
.../qdox/model/expression/package-info.java | 4 +
.../qdox/model/impl/AbstractBaseJavaEntity.java | 120 +
.../qdox/model/impl/AbstractBaseMethod.java | 151 ++
.../model/impl/AbstractInheritableJavaEntity.java | 39 +
.../qdox/model/impl/AbstractJavaEntity.java | 176 ++
.../qdox/model/impl/AbstractJavaModel.java | 68 +
.../qdox/model/impl/DefaultBeanProperty.java | 81 +
.../qdox/model/impl/DefaultDocletTag.java | 107 +
.../qdox/model/impl/DefaultDocletTagFactory.java | 43 +
.../qdox/model/impl/DefaultJavaAnnotation.java | 167 ++
.../qdox/model/impl/DefaultJavaClass.java | 931 +++++++
.../qdox/model/impl/DefaultJavaConstructor.java | 144 +
.../qdox/model/impl/DefaultJavaField.java | 230 ++
.../qdox/model/impl/DefaultJavaInitializer.java | 60 +
.../qdox/model/impl/DefaultJavaMethod.java | 432 +++
.../qdox/model/impl/DefaultJavaPackage.java | 154 ++
.../qdox/model/impl/DefaultJavaParameter.java | 193 ++
.../model/impl/DefaultJavaParameterizedType.java | 157 ++
.../qdox/model/impl/DefaultJavaSource.java | 384 +++
.../qdox/model/impl/DefaultJavaType.java | 978 +++++++
.../qdox/model/impl/DefaultJavaTypeVariable.java | 184 ++
.../qdox/model/impl/DefaultJavaWildcardType.java | 141 +
.../qdox/model/impl/JavaClassParent.java | 48 +
.../qdox/model/impl}/JavaMethodDelegate.java | 231 +-
.../thoughtworks/qdox/model/impl/package-info.java | 5 +
.../com/thoughtworks/qdox/model/package-info.java | 5 +
.../thoughtworks/qdox/model/util/TagParser.java | 47 +-
.../thoughtworks/qdox/model/util/package-info.java | 4 +
.../java/com/thoughtworks/qdox/package-info.java | 4 +
.../thoughtworks/qdox/parser/CommentHandler.java | 40 +
.../thoughtworks/qdox/parser/CommentScanner.java | 37 +
.../com/thoughtworks/qdox/parser/JavaLexer.java | 30 +
.../java/com/thoughtworks/qdox/parser/Lexer.java | 36 +
.../thoughtworks/qdox/parser/ParseException.java | 93 +
.../qdox/parser/expression/AddDef.java | 33 +
.../qdox/parser/expression/AndDef.java | 33 +
.../qdox/parser/expression/AssignmentDef.java | 55 +
.../qdox/parser/expression/BinaryOperatorDef.java | 47 +
.../qdox/parser/expression/CastDef.java | 51 +
.../qdox/parser/expression/ConstantDef.java | 49 +
.../qdox/parser/expression/CreatorDef.java | 79 +
.../qdox/parser/expression/DivideDef.java | 33 +
.../qdox/parser/expression/ElemValueDef.java | 7 +
.../qdox/parser/expression/ElemValueListDef.java | 25 +
.../parser/expression/ElemValueTransformer.java | 101 +
.../qdox/parser/expression/EqualsDef.java | 32 +
.../qdox/parser/expression/ExclusiveOrDef.java | 32 +
.../qdox/parser/expression/ExpressionDef.java | 25 +
.../qdox/parser/expression/FieldRefDef.java | 38 +
.../qdox/parser/expression/GreaterEqualsDef.java | 32 +
.../qdox/parser/expression/GreaterThanDef.java | 32 +
.../qdox/parser/expression/LessEqualsDef.java | 32 +
.../qdox/parser/expression/LessThanDef.java | 33 +
.../qdox/parser/expression/LogicalAndDef.java | 32 +
.../qdox/parser/expression/LogicalNotDef.java | 32 +
.../qdox/parser/expression/LogicalOrDef.java | 32 +
.../parser/expression/MethodInvocationDef.java | 50 +
.../qdox/parser/expression/MinusSignDef.java | 32 +
.../qdox/parser/expression/MultiplyDef.java | 33 +
.../qdox/parser/expression/NotDef.java | 32 +
.../qdox/parser/expression/NotEqualsDef.java | 32 +
.../thoughtworks/qdox/parser/expression/OrDef.java | 32 +
.../qdox/parser/expression/ParenExpressionDef.java | 41 +
.../qdox/parser/expression/PlusSignDef.java | 32 +
.../qdox/parser/expression/PostDecrementDef.java | 33 +
.../qdox/parser/expression/PostIncrementDef.java | 33 +
.../qdox/parser/expression/PreDecrementDef.java | 33 +
.../qdox/parser/expression/PreIncrementDef.java | 33 +
.../qdox/parser/expression/QueryDef.java | 64 +
.../qdox/parser/expression/RemainderDef.java | 32 +
.../qdox/parser/expression/ShiftLeftDef.java | 32 +
.../qdox/parser/expression/ShiftRightDef.java | 32 +
.../qdox/parser/expression/SubtractDef.java | 32 +
.../qdox/parser/expression/TypeRefDef.java | 40 +
.../qdox/parser/expression/UnaryOperatorDef.java | 37 +
.../parser/expression/UnsignedShiftRightDef.java | 32 +
.../qdox/parser/expression/package-info.java | 4 +
.../qdox/parser/impl/BinaryClassParser.java | 231 ++
.../qdox/parser/impl/package-info.java | 4 +
.../com/thoughtworks/qdox/parser/package-info.java | 4 +
.../thoughtworks/qdox/parser/structs/AnnoDef.java | 55 +
.../thoughtworks/qdox/parser/structs/ClassDef.java | 133 +
.../thoughtworks/qdox/parser/structs/FieldDef.java | 166 ++
.../thoughtworks/qdox/parser/structs/InitDef.java | 63 +
.../qdox/parser/structs/LocatedDef.java | 44 +
.../qdox/parser/structs/MethodDef.java | 124 +
.../qdox/parser/structs/PackageDef.java | 42 +
.../thoughtworks/qdox/parser/structs/TagDef.java | 63 +
.../thoughtworks/qdox/parser/structs/TypeDef.java | 83 +
.../qdox/parser/structs/TypeVariableDef.java | 54 +
.../qdox/parser/structs/WildcardTypeDef.java | 54 +
.../qdox/parser/structs/package-info.java | 5 +
.../com/thoughtworks/qdox/tools/QDoxTester.java | 41 +-
.../com/thoughtworks/qdox/tools/package-info.java | 4 +
.../com/thoughtworks/qdox/writer/ModelWriter.java | 184 ++
.../qdox/writer/ModelWriterFactory.java | 33 +
.../qdox/writer/impl/DefaultModelWriter.java | 476 ++++
.../qdox/writer/impl/IndentBuffer.java | 87 +
.../qdox/writer/impl/package-info.java | 4 +
.../com/thoughtworks/qdox/writer/package-info.java | 4 +
src/site/apt/migrationplan.apt.vm | 70 +
src/site/content/changes.html | 15 -
src/site/content/download.html | 21 -
src/site/content/faq.html | 49 -
src/site/content/website.xml | 34 -
src/site/fml/faq.fml | 60 +
src/site/resources/{ => css}/style.css | 850 +++---
src/site/resources/images/arrow_blue_collapsed.png | Bin 0 -> 1388 bytes
src/site/resources/images/arrow_blue_expanded.png | Bin 0 -> 1412 bytes
src/site/resources/{ => images}/blue2white.jpg | Bin
src/site/resources/{ => images}/breadcrumbs.jpg | Bin
src/site/resources/{ => images}/logo.gif | Bin
src/site/resources/{ => images}/tekton_logo.png | Bin
src/site/resources/{ => images}/white2blue.jpg | Bin
src/site/site.xml | 49 +
src/site/templates/site-template.vm | 15 -
src/site/templates/site.vm | 369 +++
src/site/templates/skin.html | 52 -
src/site/xhtml/download.xhtml | 30 +
src/site/{content/index.html => xhtml/index.xhtml} | 0
.../{content/license.html => xhtml/license.xhtml} | 0
src/site/xhtml/migration.xhtml | 34 +
src/site/{content/model.html => xhtml/model.xhtml} | 198 +-
.../{content/upgrade.html => xhtml/upgrade.xhtml} | 2 +-
src/site/{content/usage.html => xhtml/usage.xhtml} | 27 +-
.../{content/whouses.html => xhtml/whouses.xhtml} | 2 +-
.../thoughtworks/qdox/AnnotationsModelTest.java | 331 ---
.../com/thoughtworks/qdox/AnnotationsTest.java | 267 --
.../com/thoughtworks/qdox/ClassResolutionTest.java | 96 -
src/test/com/thoughtworks/qdox/FieldsTest.java | 61 -
src/test/com/thoughtworks/qdox/JSR14Test.java | 405 ---
src/test/com/thoughtworks/qdox/MethodsTest.java | 51 -
src/test/com/thoughtworks/qdox/TestQDoxBug131.java | 30 -
.../qdox/ant/AbstractQdoxTaskTest.java | 128 -
.../qdox/directorywalker/DirectoryScannerTest.java | 136 -
.../qdox/model/AbstractJavaEntityTest.java | 244 --
.../thoughtworks/qdox/model/ClassLibraryTest.java | 70 -
.../com/thoughtworks/qdox/model/JavaClassTest.java | 639 -----
.../com/thoughtworks/qdox/model/JavaFieldTest.java | 105 -
.../thoughtworks/qdox/model/JavaMethodTest.java | 397 ---
.../thoughtworks/qdox/model/JavaPackageTest.java | 11 -
.../thoughtworks/qdox/model/JavaParameterTest.java | 20 -
.../thoughtworks/qdox/model/JavaSourceTest.java | 219 --
.../thoughtworks/qdox/model/ModelBuilderTest.java | 816 ------
src/test/com/thoughtworks/qdox/model/TypeTest.java | 86 -
.../qdox/model/util/OrderedMapTest.java | 54 -
.../com/thoughtworks/qdox/parser/MockBuilder.java | 183 --
.../com/thoughtworks/qdox/parser/MockLexer.java | 38 -
.../com/thoughtworks/qdox/parser/ParserTest.java | 2586 ------------------
.../qdox/AnnotationExpressionTest.java | 169 ++
.../thoughtworks/qdox/AnnotationsModelTest.java | 252 ++
.../com/thoughtworks/qdox/AnnotationsTest.java | 247 ++
.../com/thoughtworks/qdox/ClassResolutionTest.java | 89 +
.../com/thoughtworks/qdox/EmptyTestClasses.java | 8 +
.../com/thoughtworks/qdox/EnumsModelTest.java | 74 +-
.../com/thoughtworks/qdox/EnumsTest.java | 77 +-
.../java/com/thoughtworks/qdox/FieldsTest.java | 111 +
.../com/thoughtworks/qdox/GenericsTest.java | 59 +-
src/test/java/com/thoughtworks/qdox/JSR14Test.java | 509 ++++
.../thoughtworks/qdox/JavaProjectBuilderTest.java} | 997 ++++---
.../java/com/thoughtworks/qdox/MethodsTest.java | 63 +
.../qdox/TestMultipleLevelGenericInheritance.java | 90 +
.../qdox/builder/impl/EvaluatingVisitorTest.java | 1336 +++++++++
.../qdox/builder/impl/ModelBuilderTest.java | 862 ++++++
.../qdox/directorywalker/DirectoryScannerTest.java | 200 ++
.../qdox/directorywalker/SuffixFilterTest.java | 55 +
.../qdox/library/AbstractClassLibraryTest.java | 140 +
.../qdox/library/ClassLibraryBuilderTest.java | 69 +
.../qdox/library/ClassLoaderLibraryTest.java | 36 +
.../qdox/library/JavaClassContextTest.java | 161 ++
.../library/OrderedClassLibraryBuilderTest.java | 11 +
.../library/SortedClassLibraryBuilderTest.java | 10 +
.../qdox/library/SourceLibraryTest.java | 108 +
.../qdox/model/AbstractDocletTagTest.java | 37 +-
.../com/thoughtworks/qdox/model/JavaClassTest.java | 883 ++++++
.../qdox/model/JavaConstructorTest.java | 208 ++
.../com/thoughtworks/qdox/model/JavaFieldTest.java | 247 ++
.../thoughtworks/qdox/model/JavaMethodTest.java | 580 ++++
.../thoughtworks/qdox/model/JavaPackageTest.java | 52 +
.../thoughtworks/qdox/model/JavaParameterTest.java | 80 +
.../thoughtworks/qdox/model/JavaSourceTest.java | 254 ++
.../com/thoughtworks/qdox/model/JavaTypeTest.java | 93 +
.../qdox/model/expression/AddTest.java | 42 +
.../qdox/model/expression/AndTest.java | 42 +
.../model/expression/AnnotationValueListTest.java | 94 +
.../qdox/model/expression/AssignmentTest.java | 41 +
.../qdox/model/expression/CastTest.java | 43 +
.../qdox/model/expression/ConstantTest.java | 280 ++
.../qdox/model/expression/DivideTest.java | 43 +
.../qdox/model/expression/EqualsTest.java | 43 +
.../qdox/model/expression/ExclusiveOrTest.java | 43 +
.../qdox/model/expression/FieldRefTest.java | 37 +
.../qdox/model/expression/GreaterEqualsTest.java | 43 +
.../qdox/model/expression/GreaterThanTest.java | 43 +
.../qdox/model/expression/LessEqualsTest.java | 43 +
.../qdox/model/expression/LessThanTest.java | 43 +
.../qdox/model/expression/LogicalAndTest.java | 42 +
.../qdox/model/expression/LogicalNotTest.java | 40 +
.../qdox/model/expression/LogicalOrTest.java | 43 +
.../qdox/model/expression/MinusSignTest.java | 40 +
.../qdox/model/expression/MultiplyTest.java | 43 +
.../qdox/model/expression/NotEqualsTest.java | 43 +
.../qdox/model/expression/NotTest.java | 40 +
.../thoughtworks/qdox/model/expression/OrTest.java | 43 +
.../qdox/model/expression/ParenExpressionTest.java | 40 +
.../qdox/model/expression/PlusSignTest.java | 40 +
.../qdox/model/expression/PostDecrementTest.java | 39 +
.../qdox/model/expression/PostIncrementTest.java | 39 +
.../qdox/model/expression/PreDecrementTest.java | 39 +
.../qdox/model/expression/PreIncrementTest.java | 39 +
.../qdox/model/expression/QueryTest.java | 46 +
.../qdox/model/expression/RemainderTest.java | 43 +
.../qdox/model/expression/ShiftLeftTest.java | 43 +
.../qdox/model/expression/ShiftRightTest.java | 43 +
.../qdox/model/expression/SubtractTest.java | 42 +
.../model/expression/UnsignedShiftRightTest.java | 41 +
.../qdox/model/impl/AbstractJavaEntityTest.java | 131 +
.../qdox/model/impl}/DefaultDocletTagTest.java | 7 +-
.../qdox/model/impl/DefaultJavaClassIT.java | 104 +
.../qdox/model/impl/DefaultJavaClassTest.java | 123 +
.../model/impl/DefaultJavaConstructorTest.java | 41 +
.../qdox/model/impl/DefaultJavaFieldTest.java | 69 +
.../qdox/model/impl/DefaultJavaMethodTest.java | 64 +
.../qdox/model/impl/DefaultJavaPackageTest.java | 18 +
.../qdox/model/impl/DefaultJavaParameterTest.java | 40 +
.../qdox/model/impl/DefaultJavaSourceTest.java | 43 +
.../qdox/model/impl/DefaultJavaTypeIT.java | 35 +
.../qdox/model/impl/DefaultTypeTest.java | 72 +
.../qdox/model/util/SerializationUtils.java | 6 +-
.../qdox/model/util/TagParserTest.java | 22 +-
.../com/thoughtworks/qdox/parser/LexerTest.java | 310 +--
.../qdox/parser/ParseExceptionTest.java | 52 +
.../com/thoughtworks/qdox/parser/ParserTest.java | 2853 ++++++++++++++++++++
.../parser/impl/DefaultJavaCommentLexerTest.java | 255 ++
.../parser/impl/DefaultJavaCommentParserTest.java | 218 ++
.../thoughtworks/qdox/testdata/PropertyClass.java | 0
.../thoughtworks/qdox/traversal/TraversalTest.java | 17 +-
.../qdox/writer/impl/DefaultModelWriterTest.java | 395 +++
.../qdox/writer/impl}/IndentBufferTest.java | 21 +-
.../thoughtworks/qdox/testdata/DefaultCtor.java | 0
.../com/thoughtworks/qdox/testdata/Latin1.java | 8 +
.../thoughtworks/qdox/testdata/PropertyClass.java | 0
.../com/thoughtworks/qdox/testdata/UTF8.java | 9 +
.../com/thoughtworks/qdox/testdata/Unicode.java | 0
.../resources}/qdox-140/X.jav | 0
src/{test-resources => test/resources}/readme.txt | 0
467 files changed, 36677 insertions(+), 17904 deletions(-)
diff --cc debian/changelog
index b60fadb,0000000..3f6ea2e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,128 -1,0 +1,154 @@@
++qdox (2.0-M3-1) UNRELEASED; urgency=medium
++
++ * Team upload.
++ * Imported Upstream version 2.0-M3.
++ * debian/control:
++ - Vcs-Browser: Use https.
++ - Use only Build-Depends field for declaring build-dependencies.
++ - Add maven substvars to binary packages.
++ - Add libmaven-exec-plugin-java and libmaven-javadoc-plugin-java to B-D.
++ - Switch to junit4.
++ - Drop libjmock-java from Build-Depends. Not needed.
++ * Switch from cdbs to dh-sequencer.
++ * Build with maven-debian-helper. Switch to maven build system.
++ Remove maven-repo-helper, ant, ant-optional and maven-ant-helper
++ from Build-Depends.
++ * Drop build-classpath and build.xml. Now obsolete since we use Maven.
++ * Rename build.properties to maven.properties. Change value of build source
++ directory variable to main.
++ * Drop README.Debian because it does not contain Debian specific information.
++ * Register documentation with doc-base.
++ * Add workingDirectory.patch to fix a FTBFS. The parser class could not be
++ found.
++ * Add clean file to ensure the package can be built twice in a row.
++
++ -- Markus Koschany <apo at gambaru.de> Mon, 05 Oct 2015 14:30:40 +0200
++
+qdox (1.12.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ * debian/control:
+ - Removed Michael Koch from the uploaders (Closes: #654129)
+ - Standards-Version updated to 3.9.6 (no changes)
+ - Updated the Homepage field
+ * Moved the package to Git
+ * Switch to debhelper level 9
+ * debian/copyright:
+ - Updated to the Copyright Format 1.0
+ - Exclude the yacc executables from the upstream tarball
+ * debian/watch: Track the release tags on GitHub
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 09 Sep 2015 15:56:05 +0200
+
+qdox (1.12-1) unstable; urgency=low
+
+ [ Ludovic Claude ]
+ * New upstream release
- * d/control:
++ * d/control:
+ - Update version constraints for maven-repo-helper and maven-ant-helper
+ - Remove dependency on cdbs
+ * d/rules:
+ - use dh 7 instead of cdbs
+ * Use 3.0 (quilt) source format
+ * Add --has-package-version to the POM file, add new parameters for
+ mh_install
+ * orig-tarball: no need anymore to remove the qdox directory
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable.
+ * Bump up Standards-Version to 3.9.2 (no changes).
+ * d/dirs: Remove unneeded file.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 03 May 2011 23:43:30 +0200
+
+qdox (1.11-1) unstable; urgency=low
+
+ [ Ludovic Claude ]
+ * New upstream release
+ * debian/control: update jflex to 1.4.3
+ * debian/build.xml: add missing option to JFlex
+ * use default-jdk-doc instead of classpath-doc/openjdk-6-doc,
+ add Recommends default-jdk-doc on libqdox-java-doc (Closes: #567291)
+
+ [ Michael Koch ]
+ * New upstream release.
+ * Build-Depends on debhelper (>= 7).
+ * Removed Trygve from Uploaders.
+
+ [ Damien Raude-Morvan ]
+ * Remove Arnaud from Uploaders
+ * Add Homepage and Vcs-* fields to debian/control
+ * Bump Standards-Version to 3.8.4 (no changes needed)
+
+ [ Torsten Werner ]
+ * Remove the duplicated source code in directory qdox from the orig
+ tarball.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 03 Apr 2010 19:56:02 +0200
+
+qdox (1.9.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Bump up Standards-Version to 3.8.3
+ * Add Build-Depends on openjdk-6-doc (Closes: #543112)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 02 Sep 2009 22:22:10 +0100
+
+qdox (1.9.1-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 23:49:47 +0200
+
+qdox (1.9.1-1) experimental; urgency=low
+
+ * New upstream version, add myself to Uploaders
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add watch file
+ * Use default-jdk for the build instead of java-gcj
+ * Remove Depends on java runtimes as it is a library and headless environments
+ may not like a full JRE.
+ * Remove lexer patch as it has been applied upstream
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Add Build-Depends on jflex and byacc-j as those tools are now packaged
+ and can be used to generate fresh parser code
+ * Update the copyright, license is now Apache 2.0
+ * Add the Maven POM to the package
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 13 May 2009 20:59:05 +0100
+
+qdox (1.6.1-3) unstable; urgency=low
+
+ [Arnaud Vandyck]
+ * debian/control: libqdox-java-doc in section doc
+
+ [Michael Koch]
+ * debian/rules:
+ + delete target dir in clean target. Closes: #442716.
+ * debian/control:
+ + Fixed numerations in long descriptions.
+ + Moved debhelper and cdbs to Build-Depends.
+ + Upgraded debhelper level to 5.
+ + Added java1-runtime to Depends.
+ + Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 18 Sep 2007 21:11:10 +0200
+
+qdox (1.6.1-2) unstable; urgency=low
+
+ * debian/control:
+ + Better description, thanks to Josh Triplett (closes: #423473)
+ + added ant-optional to build-dep-indep (closes: #424472)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 7 Jun 2007 15:48:05 +0200
+
+qdox (1.6.1-1) unstable; urgency=low
+
+ Trygve Laugstøl <trygvis at inamo.no>:
+ * Initial Release (closes: #323043).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Wed, 11 Apr 2007 13:51:08 +0200
diff --cc debian/clean
index 0000000,0000000..cd1f4b9
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,7 @@@
++src/main/java/com/thoughtworks/qdox/parser/impl/DefaultJavaCommentLexer.java
++src/main/java/com/thoughtworks/qdox/parser/impl/DefaultJavaCommentParser.java
++src/main/java/com/thoughtworks/qdox/parser/impl/DefaultJavaCommentParserVal.java
++src/main/java/com/thoughtworks/qdox/parser/impl/JFlexLexer.java
++src/main/java/com/thoughtworks/qdox/parser/impl/Parser.java
++src/main/java/com/thoughtworks/qdox/parser/impl/y.output
++
diff --cc debian/control
index ea2a0d3,0000000..f7c4139
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,57 -1,0 +1,69 @@@
+Source: qdox
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
- Build-Depends: byacc-j, debhelper (>= 9), default-jdk
- Build-Depends-Indep: ant,
- ant-optional,
- default-jdk-doc,
- jflex (>= 1.4.3),
- junit (>= 3.8.1),
- libjmock-java (>= 1.0.1),
- maven-ant-helper (>= 7.1),
- maven-repo-helper (>= 1.5)
++Uploaders:
++ Ludovic Claude <ludovic.claude at laposte.net>,
++ Damien Raude-Morvan <drazzib at debian.org>
++Build-Depends:
++ byacc-j,
++ debhelper (>= 9),
++ default-jdk,
++ default-jdk-doc,
++ jflex (>= 1.4.3),
++ junit4,
++ libmaven-exec-plugin-java,
++ libmaven-javadoc-plugin-java,
++ libmockito-java,
++ maven-debian-helper
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/qdox.git
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/qdox.git
++Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/qdox.git
+Homepage: https://github.com/codehaus/qdox
+
+Package: libqdox-java
+Architecture: all
- Depends: ${misc:Depends}
- Suggests: libqdox-java-doc
++Depends:
++ ${maven:Depends},
++ ${misc:Depends}
++Suggests:
++ libqdox-java-doc,
++ ${maven:OptionalDepends}
+Description: Quickly parses declarations and Javadoc from Java source
+ qdox quickly parses Java source files looking for key items of
+ interest:
+ * class and interface definitions
+ * member declarations
+ * import statements
+ * JavaDoc comments
+ .
+ qdox ignores all other components of Java source, such as actual method
+ implementations, to avoid overhead. qdox returns a simple document
+ model containing only the declarations and containing enough
+ information to be useful.
+
+Package: libqdox-java-doc
+Section: doc
+Architecture: all
- Depends: ${misc:Depends}
- Recommends: default-jdk-doc
- Suggests: libqdox-java
++Depends:
++ ${misc:Depends}
++Recommends:
++ ${maven:DocDepends},
++ ${maven:DocOptionalDepends}
++Suggests:
++ libqdox-java
+Description: Documentation for qdox (javadoc)
+ This package contains the documentation for qdox, generated from
+ Javadoc.
+ .
+ qdox quickly parses Java source files looking for key items of
+ interest:
+ * class and interface definitions
+ * member declarations
+ * import statements
+ * JavaDoc comments
+ .
+ qdox ignores all other components of Java source, such as actual method
+ implementations, to avoid overhead. qdox returns a simple document
+ model containing only the declarations and containing enough
+ information to be useful.
diff --cc debian/copyright
index 1543452,0000000..e5a5235
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,17 -1,0 +1,18 @@@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: QDox
+Source: https://github.com/codehaus/qdox
+Files-Excluded: bootstrap/yacc*
+
+Files: *
- Copyright: 2002-2009, Joe Walnes and QDox Project Team
++Copyright: 2002-2014, Joe Walnes and QDox Project Team
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2005, Trygve Laugstøl <trygvis at inamo.no>
+ 2009, Ludovic Claude <ludovic.claude at laposte.net>
++ 2015, Markus Koschany <apo at gambaru.de>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
diff --cc debian/libqdox-java-doc.doc-base.api
index 0000000,0000000..de944cb
new file mode 100644
--- /dev/null
+++ b/debian/libqdox-java-doc.doc-base.api
@@@ -1,0 -1,0 +1,10 @@@
++Document: libqdox-java
++Title: API Javadoc for QDox
++Author: QDox developers
++Abstract: This is the API Javadoc provided for the
++ libqdox-java library.
++Section: Programming
++
++Format: HTML
++Index: /usr/share/doc/libqdox-java/api/index.html
++Files: /usr/share/doc/libqdox-java/api/*
diff --cc debian/libqdox-java-doc.install
index 0000000,0000000..1c11c0f
new file mode 100644
--- /dev/null
+++ b/debian/libqdox-java-doc.install
@@@ -1,0 -1,0 +1,1 @@@
++target/apidocs/* usr/share/doc/libqdox-java/api
diff --cc debian/libqdox-java.poms
index 6269869,0000000..5ad70f2
mode 100644,000000..100644
--- a/debian/libqdox-java.poms
+++ b/debian/libqdox-java.poms
@@@ -1,2 -1,0 +1,28 @@@
- pom.xml --no-parent --has-package-version --java-lib --artifact=build/qdox-*.jar
- build/qdox.javadoc.pom --has-package-version --artifact=build/qdox.javadoc.jar --classifier=javadoc --ignore-pom --package=libqdox-java-doc
++# List of POM files for the package
++# Format of this file is:
++# <path to pom file> [option]*
++# where option can be:
++# --ignore: ignore this POM and its artifact if any
++# --ignore-pom: don't install the POM. To use on POM files that are created
++# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
++# --no-parent: remove the <parent> tag from the POM
++# --package=<package>: an alternative package to use when installing this POM
++# and its artifact
++# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
++# of the version for the package.
++# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
++# during a clean operation with mh_cleanpom or mh_installpom
++# --artifact=<path>: path to the build artifact associated with this POM,
++# it will be installed when using the command mh_install. [mh_install]
++# --java-lib: install the jar into /usr/share/java to comply with Debian
++# packaging guidelines
++# --usj-name=<name>: name to use when installing the library in /usr/share/java
++# --usj-version=<version>: version to use when installing the library in /usr/share/java
++# --no-usj-versionless: don't install the versionless link in /usr/share/java
++# --dest-jar=<path>: the destination for the real jar.
++# It will be installed with mh_install. [mh_install]
++# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
++# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
++# Empty by default. [mh_install]
++#
++pom.xml --no-parent --has-package-version
diff --cc debian/maven.cleanIgnoreRules
index 0000000,0000000..8b13789
new file mode 100644
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@@ -1,0 -1,0 +1,1 @@@
++
diff --cc debian/maven.ignoreRules
index 0000000,0000000..a7c394d
new file mode 100644
--- /dev/null
+++ b/debian/maven.ignoreRules
@@@ -1,0 -1,0 +1,12 @@@
++
++de.jflex maven-jflex-plugin * * * *
++org.apache.maven.plugins maven-assembly-plugin * * * *
++org.apache.maven.plugins maven-changes-plugin * * * *
++org.apache.maven.plugins maven-enforcer-plugin * * * *
++org.apache.maven.plugins maven-failsafe-plugin * * * *
++org.apache.maven.plugins maven-invoker-plugin * * * *
++org.apache.maven.plugins maven-jxr-plugin * * * *
++org.apache.maven.plugins maven-project-info-reports-plugin * * * *
++org.apache.maven.wagon wagon-webdav-jackrabbit * * * *
++org.codehaus.mojo animal-sniffer-maven-plugin * * * *
++org.codehaus.mojo cobertura-maven-plugin * * * *
diff --cc debian/maven.properties
index 0000000,0000000..fbf819a
new file mode 100644
--- /dev/null
+++ b/debian/maven.properties
@@@ -1,0 -1,0 +1,1 @@@
++qdox.byaccj.executable=byaccj
diff --cc debian/maven.publishedRules
index dbd7b9b,0000000..5a9300b
mode 100644,000000..100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@@ -1,1 -1,0 +1,2 @@@
- s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/
++
++s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
diff --cc debian/maven.rules
index 51a25cc,0000000..ef43f7b
mode 100644,000000..100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@@ -1,4 -1,0 +1,4 @@@
- junit junit jar s/3\..*/3.x/
- jmock jmock jar s/1\..*/1.x/
- s/ant/org.apache.ant/ * * s/.*/debian/
+
++com.thoughtworks.qdox qdox jar s/.*/debian/ * *
++junit junit jar s/4\..*/4.x/ * *
++org.mockito mockito-core * s/.*/debian/ * *
diff --cc debian/patches/series
index 0000000,0000000..ba8516f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++workingDirectory.patch
diff --cc debian/patches/workingDirectory.patch
index 0000000,0000000..6426cd0
new file mode 100644
--- /dev/null
+++ b/debian/patches/workingDirectory.patch
@@@ -1,0 -1,0 +1,33 @@@
++From: Markus Koschany <apo at gambaru.de>
++Date: Sun, 4 Oct 2015 23:48:27 +0200
++Subject: workingDirectory
++
++Fix a FTBFS. The parser class could not be found.
++
++Forwarded: not-needed
++---
++ pom.xml | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/pom.xml b/pom.xml
++index 5b1c760..8252f6f 100644
++--- a/pom.xml
+++++ b/pom.xml
++@@ -274,7 +274,7 @@
++ <argument>-Jpackage=com.thoughtworks.qdox.parser.impl</argument>
++ <argument>${basedir}/src/grammar/commentparser.y</argument>
++ </arguments>
++- <workingDirectory>${project.build.directory}/generated-sources/parser/com/thoughtworks/qdox/parser/impl</workingDirectory>
+++ <workingDirectory>src/main/java/com/thoughtworks/qdox/parser/impl</workingDirectory>
++ </configuration>
++ </execution>
++ <execution>
++@@ -296,7 +296,7 @@
++ <argument>-Jstack=${qdox.javaparser.stack}</argument>
++ <argument>${basedir}/src/grammar/parser.y</argument>
++ </arguments>
++- <workingDirectory>${project.build.directory}/generated-sources/parser/com/thoughtworks/qdox/parser/impl</workingDirectory>
+++ <workingDirectory>src/main/java/com/thoughtworks/qdox/parser/impl</workingDirectory>
++ </configuration>
++ </execution>
++ </executions>
diff --cc debian/rules
index 7940821,0000000..0434585
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,15 -1,0 +1,14 @@@
+#!/usr/bin/make -f
-
- DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
- DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
-
+export JAVA_HOME=/usr/lib/jvm/default-java
- export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
- export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -Dversion=$(DEB_UPSTREAM_VERSION) -f debian/build.xml
+
+%:
- dh $@ --buildsystem=ant --with maven_repo_helper
++ dh $@ --buildsystem=maven
++
++override_dh_auto_build:
++ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex
++ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex
++ dh_auto_build
+
+get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
++ -uscan --verbose --download-current-version --force-download
+
diff --cc debian/watch
index 998bbe7,0000000..596e0c0
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- https://github.com/codehaus/qdox/tags .*/qdox-([\d\.]+).tar.gz
++https://github.com/codehaus/qdox/tags .*/qdox-([\d\.].*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/qdox.git
More information about the pkg-java-commits
mailing list