[Git][java-team/javaparser][master] 9 commits: Removing repeated @Deprecated annotations in generated sources
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Wed Sep 7 06:36:37 BST 2022
Pierre Gruet pushed to branch master at Debian Java Maintainers / javaparser
Commits:
65d037ae by Pierre Gruet at 2022-09-06T23:06:10+02:00
Removing repeated @Deprecated annotations in generated sources
- - - - -
dabde20d by Pierre Gruet at 2022-09-06T23:07:01+02:00
Raising d/watch version to 4
- - - - -
3a583e73 by Pierre Gruet at 2022-09-06T23:07:35+02:00
Apply multi-arch hints.
+ libjavaparser-java: Add Multi-Arch: foreign.
Changes-By: apply-multiarch-hints
- - - - -
cee486d1 by Pierre Gruet at 2022-09-06T23:08:16+02:00
Updating changelog
- - - - -
5c760951 by Pierre Gruet at 2022-09-06T23:08:54+02:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
75f5a05f by Pierre Gruet at 2022-09-06T23:08:55+02:00
Use secure copyright file specification URI.
Changes-By: lintian-brush
Fixes: lintian: insecure-copyright-format-uri
See-also: https://lintian.debian.org/tags/insecure-copyright-format-uri.html
- - - - -
099ff043 by Pierre Gruet at 2022-09-06T23:09:00+02:00
Use secure URI in Homepage field.
Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html
- - - - -
a90ee4b0 by Pierre Gruet at 2022-09-06T23:09:04+02:00
Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse.
Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html
Fixes: lintian: upstream-metadata-missing-bug-tracking
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html
Fixes: lintian: upstream-metadata-missing-repository
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html
- - - - -
389cd648 by Pierre Gruet at 2022-09-07T07:00:09+02:00
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/remove_double_Deprecated_annotations.patch
- + debian/patches/series
- + debian/removeDoubleDeprecatedAnnotations
- debian/rules
- + debian/upstream/metadata
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+javaparser (3.16.3-2) unstable; urgency=medium
+
+ * Team upload.
+ * Removing repeated @Deprecated annotations in generated sources
+ (Closes: #1011814)
+ * Raising d/watch version to 4
+ * Marking the binary package as Multi-arch: foreign
+ * Trim trailing whitespace.
+ * Use secure copyright file specification URI.
+ * Use secure URI in Homepage field.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+ Repository-Browse.
+
+ -- Pierre Gruet <pgt at debian.org> Wed, 07 Sep 2022 06:59:57 +0200
+
javaparser (3.16.3-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -7,18 +7,20 @@ Build-Depends:
debhelper-compat (= 13),
javacc (>= 6.0),
libbuild-helper-maven-plugin-java,
+ libexec-maven-plugin-java,
libjavacc-maven-plugin-java,
libtemplating-maven-plugin-java,
maven-debian-helper
Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/javaparser.git
Vcs-Browser: https://salsa.debian.org/java-team/javaparser
-Homepage: http://javaparser.org
+Homepage: https://javaparser.org
Package: libjavaparser-java
Architecture: all
Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
+Multi-Arch: foreign
Description: Java library for parsing Java 7
The library features abstract syntax tree (AST) generation and supports
the visitor pattern. The AST records the source code structure, javadoc
=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: javaparser
Upstream-Contact: Júlio Vilmar Gesser
Source: https://github.com/javaparser/javaparser
=====================================
debian/patches/remove_double_Deprecated_annotations.patch
=====================================
@@ -0,0 +1,40 @@
+Description: invoking a Perl script to remove consecutive @Deprecated
+ annotations
+Author: Pierre Gruet <pgt at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011814
+Forwarded: no
+Last-Update: 2022-09-06
+
+--- a/javaparser-core/pom.xml
++++ b/javaparser-core/pom.xml
+@@ -37,6 +37,7 @@
+ <executions>
+ <execution>
+ <id>javacc</id>
++ <phase>generate-sources</phase>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+@@ -46,6 +47,22 @@
+ </configuration>
+ </execution>
+ </executions>
++ </plugin>
++ <plugin>
++ <artifactId>exec-maven-plugin</artifactId>
++ <groupId>org.codehaus.mojo</groupId>
++ <executions>
++ <execution>
++ <id>removeDoubleAnnotations</id>
++ <phase>generate-sources</phase>
++ <goals>
++ <goal>exec</goal>
++ </goals>
++ <configuration>
++ <executable>../debian/removeDoubleDeprecatedAnnotations</executable>
++ </configuration>
++ </execution>
++ </executions>
+ </plugin>
+ <!-- Generate an OSGi-enabled MANIFEST during the build -->
+ <plugin>
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+remove_double_Deprecated_annotations.patch
=====================================
debian/removeDoubleDeprecatedAnnotations
=====================================
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+# We will invoke this script to remove consecutive @Deprecated annotations in
+# a generated source file, see Debian bug #1011814.
+
+use strict;
+use warnings;
+
+open FILE, "<", "target/generated-sources/javacc/com/github/javaparser/SimpleCharStream.java"
+ or die "Cannot open SimpleCharStream.java: $!",
+
+my $lines = '';
+$lines = join '', <FILE>;
+
+close FILE;
+
+$lines =~ s|\@Deprecated$(\s*/\*\*)|$1|gm;
+
+open OUTFILE, ">", "target/generated-sources/javacc/com/github/javaparser/SimpleCharStream.java"
+ or die "Cannot open SimpleCharStream.java: $!";
+
+printf OUTFILE "%s", $lines;
+
+close OUTFILE;
=====================================
debian/rules
=====================================
@@ -2,4 +2,3 @@
%:
dh $@
-
=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/javaparser/javaparser/issues
+Bug-Submit: https://github.com/javaparser/javaparser/issues/new
+Repository: https://github.com/javaparser/javaparser.git
+Repository-Browse: https://github.com/javaparser/javaparser.git
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
opts="mode=git,repack,compression=xz" \
https://github.com/javaparser/javaparser refs/tags/javaparser(?:-parent)?-([\d\.]+)
View it on GitLab: https://salsa.debian.org/java-team/javaparser/-/compare/f5a4d2b449e22b79104d0e8ddebcea1994cb3de0...389cd6485be0f5e5056ee2f4b3b01713da65b295
--
View it on GitLab: https://salsa.debian.org/java-team/javaparser/-/compare/f5a4d2b449e22b79104d0e8ddebcea1994cb3de0...389cd6485be0f5e5056ee2f4b3b01713da65b295
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/20220907/ddd588d7/attachment.htm>
More information about the pkg-java-commits
mailing list