[Git][java-team/qdox2][master] 4 commits: Update copyright years
Markus Koschany (@apo)
gitlab at salsa.debian.org
Thu Sep 22 22:37:17 BST 2022
Markus Koschany pushed to branch master at Debian Java Maintainers / qdox2
Commits:
470b2fbd by Markus Koschany at 2022-09-22T23:18:52+02:00
Update copyright years
- - - - -
3bb8fd01 by Markus Koschany at 2022-09-22T23:19:42+02:00
New upstream version 2.0.2
- - - - -
8f0a2930 by Markus Koschany at 2022-09-22T23:19:43+02:00
Update upstream source from tag 'upstream/2.0.2'
Update to upstream version '2.0.2'
with Debian dir 14fa8e0427e9c26fe0030bd061a54eddc59a5ef3
- - - - -
ad20e506 by Markus Koschany at 2022-09-22T23:20:41+02:00
Update changelog
- - - - -
10 changed files:
- + .github/dependabot.yml
- + .github/workflows/build.yml
- .gitignore
- − .travis.yml
- README.md
- debian/changelog
- debian/copyright
- pom.xml
- src/grammar/lexer.flex
- src/test/java/com/thoughtworks/qdox/RecordsTest.java
Changes:
=====================================
.github/dependabot.yml
=====================================
@@ -0,0 +1,12 @@
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ target-branch: "master"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ target-branch: "master"
=====================================
.github/workflows/build.yml
=====================================
@@ -0,0 +1,30 @@
+name: Java CI
+
+on: [ push ]
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ continue-on-error: ${{ matrix.experimental }}
+ strategy:
+ matrix:
+ os: [ ubuntu-latest , windows-latest ]
+ java: [ 8, 11 ]
+ experimental: [ false ]
+
+ steps:
+ - uses: actions/checkout at v2.4.0
+ - uses: actions/cache at v2.1.7
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java at v2
+ with:
+ java-version: ${{ matrix.java }}
+ distribution: adopt
+ - name: Build with mvn
+ run: |
+ mvn clean install
=====================================
.gitignore
=====================================
@@ -3,3 +3,4 @@
/target
/.classpath
/.settings
+/.idea
=====================================
.travis.yml deleted
=====================================
@@ -1,5 +0,0 @@
-language: java
-jdk:
- - openjdk8
- - openjdk11
-script: mvn clean verify
=====================================
README.md
=====================================
@@ -2,8 +2,6 @@
### Status
-[](https://travis-ci.org/paul-hammant/qdox)
-
QDox is a high speed, small footprint parser for fully extracting class/interface/method definitions (including annotations, parameters, param names). It is designed to be used by active code generators or documentation tools.
Not so relevant any more, but it also also processes JavaDoc @tags
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+qdox2 (2.0.2-1) unstable; urgency=medium
+
+ * New upstream version 2.0.2.
+
+ -- Markus Koschany <apo at debian.org> Thu, 22 Sep 2022 23:20:29 +0200
+
qdox2 (2.0.1-1) unstable; urgency=medium
* Team upload.
=====================================
debian/copyright
=====================================
@@ -5,13 +5,13 @@ Files-Excluded:
bootstrap/yacc*
Files: *
-Copyright: 2002-2019, Joe Walnes and QDox Project Team
+Copyright: 2002-2022, 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-2019, Markus Koschany <apo at debian.org>
+ 2015-2022, Markus Koschany <apo at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
pom.xml
=====================================
@@ -10,7 +10,7 @@
<name>QDox</name>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</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.1</tag>
+ <tag>qdox-2.0.2</tag>
</scm>
<developers>
=====================================
src/grammar/lexer.flex
=====================================
@@ -239,7 +239,7 @@ JavadocEnd = "*"+ "/"
<ANNOTATIONNOARG> {
{WhiteSpace} { popState(); }
}
-<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, NAME, RECORD, TYPE> {
+<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, NAME, TYPE> {
"." { return Parser.DOT; }
"..." { return Parser.DOTDOTDOT; }
"," { return Parser.COMMA; }
@@ -265,7 +265,6 @@ JavadocEnd = "*"+ "/"
"implements" { return Parser.IMPLEMENTS; }
"super" { return Parser.SUPER; }
"new" { return Parser.NEW; }
- "record" { return Parser.RECORD; }
"sealed" { return Parser.SEALED; }
"non-sealed" { return Parser.NON_SEALED; }
"permits" { return Parser.PERMITS; }
@@ -309,6 +308,13 @@ JavadocEnd = "*"+ "/"
pushState(NAME);
return Parser.ENUM;
}
+ "record" / {WhiteSpace}+ {Id} {
+ markAnnotatedElementLine();
+ classDepth++;
+ braceMode = CODEBLOCK;
+ pushState(NAME);
+ return Parser.RECORD;
+ }
"@" {
markAnnotatedElementLine();
pushState(ATANNOTATION);
@@ -430,7 +436,7 @@ JavadocEnd = "*"+ "/"
}
}
}
-<ENUM, RECORD, TYPE> {
+<ENUM, TYPE> {
"default" { return Parser.DEFAULT; }
}
<ANNOTATIONTYPE> {
@@ -441,7 +447,7 @@ JavadocEnd = "*"+ "/"
{Id} / {WhiteSpace}* [;{(] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; }
{Id} { popState(); return Parser.IDENTIFIER; }
}
-<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, MODULE, RECORD, TYPE> {
+<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, MODULE, TYPE> {
{Id} { return Parser.IDENTIFIER;
}
}
@@ -657,12 +663,12 @@ JavadocEnd = "*"+ "/"
}
}
-<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, RECORD, TYPE> {
+<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, TYPE> {
"\"" { if (appendingToCodeBody) { codeBody.append('"'); } pushState(STRING); }
\' { if (appendingToCodeBody) { codeBody.append('\''); } pushState(CHAR); }
}
-<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, ANNOTATION, ATANNOTATION, ARGUMENTS, RECORD, TYPE, NAME, MODULE > {
+<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, ANNOTATION, ATANNOTATION, ARGUMENTS, TYPE, NAME, MODULE > {
"//" { if (appendingToCodeBody) { codeBody.append("//"); } pushState(SINGLELINECOMMENT); }
"/*" { if (appendingToCodeBody) { codeBody.append("/*"); } pushState(MULTILINECOMMENT); }
"/**/" { if (appendingToCodeBody) { codeBody.append("/**/"); } }
=====================================
src/test/java/com/thoughtworks/qdox/RecordsTest.java
=====================================
@@ -138,4 +138,38 @@ public class RecordsTest
+ " @GreaterThanZero double width) { }";
builder.addSource( new StringReader(source) );
}
+
+ @Test
+ public void withAnnotation() {
+ String source = "@Deprecated\n"
+ + "record Line(int lenght) { }";
+ builder.addSource( new StringReader(source) );
+ }
+
+
+ @Test
+ public void recordAsTypeAndIdentifiers() {
+ String source = "package record.record.record;\n"
+ + "\n"
+ + "public class record\n"
+ + "{\n"
+ + " private Object record;\n"
+ + " \n"
+ + " public record() {\n"
+ + " }\n"
+ + " \n"
+ + " private Object record(Object record) {\n"
+ + " return record;\n"
+ + " }\n"
+ + "}";
+ builder.addSource( new StringReader(source) );
+ }
+
+ @Test
+ public void parametersContainingRecord() {
+ String source = "interface Example{\n"
+ + " void apply(Object recordList);"
+ + "}";
+ builder.addSource( new StringReader(source) );
+ }
}
View it on GitLab: https://salsa.debian.org/java-team/qdox2/-/compare/5fc2f9a380d08a0130dd3bcc686e929f1c6b8de3...ad20e50646d76bc1ebc89394fc37bd06a3d70808
--
View it on GitLab: https://salsa.debian.org/java-team/qdox2/-/compare/5fc2f9a380d08a0130dd3bcc686e929f1c6b8de3...ad20e50646d76bc1ebc89394fc37bd06a3d70808
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/20220922/62d98768/attachment.htm>
More information about the pkg-java-commits
mailing list