[Git][java-team/qdox2][master] 7 commits: Declare compliance with Debian Policy 4.3.0.
Markus Koschany
gitlab at salsa.debian.org
Sat Jan 19 23:59:13 GMT 2019
Markus Koschany pushed to branch master at Debian Java Maintainers / qdox2
Commits:
f35b15fb by Markus Koschany at 2019-01-19T23:31:42Z
Declare compliance with Debian Policy 4.3.0.
- - - - -
30157437 by Markus Koschany at 2019-01-19T23:32:27Z
Use canonical VCS URI.
- - - - -
e4e69a20 by Markus Koschany at 2019-01-19T23:36:01Z
Remove get-orig-source target.
- - - - -
908676b8 by Markus Koschany at 2019-01-19T23:36:36Z
New upstream version 2.0~M10
- - - - -
b228490d by Markus Koschany at 2019-01-19T23:36:45Z
Update upstream source from tag 'upstream/2.0_M10'
Update to upstream version '2.0~M10'
with Debian dir bff218da504d433c566e4014b448e852f3ee6c37
- - - - -
59f2ed5e by Markus Koschany at 2019-01-19T23:37:10Z
Update copyright years.
- - - - -
ae902e42 by Markus Koschany at 2019-01-19T23:38:28Z
Update changelog
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- pom.xml
- src/grammar/lexer.flex
- src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+qdox2 (2.0~M10-1) unstable; urgency=medium
+
+ * New upstream version 2.0~M10.
+ * Declare compliance with Debian Policy 4.3.0.
+ * Use canonical VCS URI.
+ * Remove get-orig-source target.
+ * Update copyright years.
+
+ -- Markus Koschany <apo at debian.org> Sun, 20 Jan 2019 00:38:04 +0100
+
qdox2 (2.0~M9-2) unstable; urgency=medium
* Declare compliance with Debian Policy 4.2.1.
=====================================
debian/control
=====================================
@@ -15,9 +15,9 @@ Build-Depends:
libmaven-javadoc-plugin-java,
libmockito-java,
maven-debian-helper
-Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/qdox2.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/qdox2.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/qdox2.git
+Vcs-Browser: https://salsa.debian.org/java-team/qdox2
Homepage: https://github.com/paul-hammant/qdox
Package: libqdox2-java
=====================================
debian/copyright
=====================================
@@ -5,13 +5,13 @@ Files-Excluded:
bootstrap/yacc*
Files: *
-Copyright: 2002-2017, Joe Walnes and QDox Project Team
+Copyright: 2002-2019, 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-2018, Markus Koschany <apo at debian.org>
+ 2015-2019, Markus Koschany <apo at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/rules
=====================================
@@ -11,6 +11,3 @@ override_dh_auto_build:
cp debian/JFlexLexer.java src/main/java/com/thoughtworks/qdox/parser/impl
dh_auto_build
-get-orig-source:
- -uscan --verbose --download-current-version --force-download
-
=====================================
pom.xml
=====================================
@@ -10,7 +10,7 @@
<name>QDox</name>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
- <version>2.0-M9</version>
+ <version>2.0-M10</version>
<url>https://github.com/paul-hammant/qdox</url>
<description>
@@ -36,7 +36,7 @@
<connection>scm:git:https://github.com/paul-hammant/qdox.git</connection>
<developerConnection>scm:git:ssh://git@github.com/paul-hammant/qdox.git</developerConnection>
<url>https://github.com/paul-hammant/qdox</url>
- <tag>qdox-2.0-M9</tag>
+ <tag>qdox-2.0-M10</tag>
</scm>
<developers>
=====================================
src/grammar/lexer.flex
=====================================
@@ -159,7 +159,7 @@ import java.util.*;
private void resetAnnotatedElementLine()
{
- annotatedElementLine = 0 - annotatedElementLine;
+ annotatedElementLine = - Math.abs(annotatedElementLine);
}
public JFlexLexer( java.io.Reader reader, java.io.Writer writer ) {
@@ -428,9 +428,9 @@ JavadocEnd = "*"+ "/"
"default" { assignmentDepth = nestingDepth; appendingToCodeBody = true; pushState(ASSIGNMENT); }
}
<NAME> {
- {Id} / {WhiteSpace}* "." { return Parser.IDENTIFIER; }
- {Id} / {WhiteSpace}* [;{] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; }
- {Id} { popState(); return Parser.IDENTIFIER; }
+ {Id} / {WhiteSpace}* "." { return Parser.IDENTIFIER; }
+ {Id} / {WhiteSpace}* [;{(] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; }
+ {Id} { popState(); return Parser.IDENTIFIER; }
}
<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, MODULE, TYPE> {
{Id} { return Parser.IDENTIFIER;
=====================================
src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
=====================================
@@ -1342,6 +1342,21 @@ public class JavaProjectBuilderTest extends TestCase
assertEquals( 9, clazz.getMethods().get(1).getLineNumber() );
}
+ public void testConstructorLineNumber() {
+ String source = "package fix.test;\r\n" +
+ "public class ClassWithJavadoc\r\n" +
+ " implements InterfaceWithJavadoc\r\n" +
+ "{\r\n" +
+ " public ClassWithJavadoc()\r\n" +
+ " {\r\n" +
+ " }"
+ + "}";
+
+ builder.addSource(new StringReader( source ));
+
+ assertEquals( 5, builder.getClassByName( "fix.test.ClassWithJavadoc" ).getConstructors().get( 0 ).getLineNumber() );
+ }
+
// for QDOX-209
public void testAnnotationMap() {
String source = "import javax.persistence.JoinColumn;\n" +
View it on GitLab: https://salsa.debian.org/java-team/qdox2/compare/2435b541774c97ff85849b4614c699afaa5c0560...ae902e4207ecb2730e41b5f4a968dd1b99c86a2a
--
View it on GitLab: https://salsa.debian.org/java-team/qdox2/compare/2435b541774c97ff85849b4614c699afaa5c0560...ae902e4207ecb2730e41b5f4a968dd1b99c86a2a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190119/68215ef0/attachment.html>
More information about the pkg-java-commits
mailing list