[Git][java-team/dnsjava][master] 17 commits: Remove debian/pom.xml in favor of upstream pom
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Sat Feb 1 05:32:55 GMT 2025
Tony Mancill pushed to branch master at Debian Java Maintainers / dnsjava
Commits:
0f6c86f4 by tony mancill at 2025-01-21T21:04:33-08:00
Remove debian/pom.xml in favor of upstream pom
- - - - -
7c7a246a by tony mancill at 2025-01-31T21:16:48-08:00
Ignore org.sonatype.plugins:nexus-staging-maven-plugin
- - - - -
03883f76 by tony mancill at 2025-01-31T21:16:53-08:00
Ignore com.github.siom79.japicmp:japicmp-maven-plugin
- - - - -
0806811a by tony mancill at 2025-01-31T21:16:53-08:00
Ignore org.jacoco:jacoco-maven-plugin
- - - - -
867261d3 by tony mancill at 2025-01-31T21:16:53-08:00
Add build-dep on libmaven-dependency-plugin-java
- - - - -
c0329dec by tony mancill at 2025-01-31T21:16:53-08:00
Add build-dep on liblombok-java
- - - - -
30b29e41 by tony mancill at 2025-01-31T21:16:53-08:00
Ignore org.projectlombok:lombok-maven-plugin
- - - - -
e04ea627 by tony mancill at 2025-01-31T21:16:53-08:00
Add build-dep on libbuild-helper-maven-plugin-java
- - - - -
bb9f0e2a by tony mancill at 2025-01-31T21:16:53-08:00
Ignore org.codehaus.mojo:animal-sniffer-maven-plugin
- - - - -
d882a1e3 by tony mancill at 2025-01-31T21:16:53-08:00
Add B-D on libjna-java and libjna-platform-java
- - - - -
21274ee5 by tony mancill at 2025-01-31T21:16:53-08:00
Ignore org.openjdk.jcstress:jcstress
- - - - -
1d9f5dcc by tony mancill at 2025-01-31T21:16:53-08:00
Ignore more maven modules used during test phase
- - - - -
b894b365 by tony mancill at 2025-01-31T21:20:19-08:00
Add 01-build.patch to ignore jcstress-core during annotations phase
- - - - -
571f6bd0 by tony mancill at 2025-01-31T21:20:19-08:00
Add B-D on libmockito-java
- - - - -
7e64b14c by tony mancill at 2025-01-31T21:21:27-08:00
Set Rules-Requires-Root: no in debian/control
- - - - -
53fa0196 by tony mancill at 2025-01-31T21:21:27-08:00
Prepare changelog for upload
- - - - -
af85dbcb by tony mancill at 2025-01-31T21:26:58-08:00
Update d/copyright for lintian warnings
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/maven.ignoreRules
- + debian/patches/01-build.patch
- + debian/patches/series
- − debian/pom.xml
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+dnsjava (3.6.2-2) unstable; urgency=medium
+
+ * Team upload. (Closes: #1093673)
+ * Remove debian/pom.xml in favor of upstream pom
+ * Ignore maven plugins either unnecessary or used during tests.
+ (Not all test dependencies are packaged for Debian.)
+ * Add build-deps on: libmaven-dependency-plugin-java
+ liblombok-java, libbuild-helper-maven-plugin-java
+ libjna-java, libjna-platform-java, libmockito-java
+ * Add 01-build.patch to ignore jcstress-core during annotations phase
+ * Set Rules-Requires-Root: no in debian/control
+
+ -- tony mancill <tmancill at debian.org> Fri, 31 Jan 2025 21:08:53 -0800
+
dnsjava (3.6.2-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -8,12 +8,19 @@ Priority: optional
Build-Depends: debhelper-compat (= 13),
default-jdk,
junit,
+ libbuild-helper-maven-plugin-java,
+ libjna-java,
+ libjna-platform-java,
+ liblombok-java,
libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
+ libmockito-java,
maven-debian-helper
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/java-team/dnsjava
Vcs-Git: https://salsa.debian.org/java-team/dnsjava.git
Homepage: http://www.dnsjava.org
+Rules-Requires-Root: no
Package: libdnsjava-java
Architecture: all
=====================================
debian/copyright
=====================================
@@ -13,12 +13,12 @@ License: BSD-3-clause
Files: src/main/java/org/xbill/DNS/Tokenizer.java
Copyright: 2003-2004 Brian Wellington (bwelling at xbill.org)
2003-2004 Nominum, Inc.
-License: BSD-3-clause and/or ISC
+License: BSD-3-clause or ISC
Files: src/main/java/org/xbill/DNS/ZoneTransferIn.java
Copyright: 2003-2004, Brian Wellington <bwelling at xbill.org>
1999-2001 Internet Software Consortium
-License: BSD-3-clause and/or ISC
+License: BSD-3-clause or ISC
Comment: Derived from lib/dns/xfrin.c from BIND 9
Files: src/test/resources/zonefileEx2
=====================================
debian/maven.ignoreRules
=====================================
@@ -1,4 +1,19 @@
+com.github.siom79.japicmp japicmp-maven-plugin * * * *
org.apache.maven.plugins maven-gpg-plugin * * * *
org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
+org.jacoco jacoco-maven-plugin * * * *
+org.projectlombok lombok-maven-plugin * * * *
+org.sonatype.plugins nexus-staging-maven-plugin * * * *
+
+# the following are used for tests
+org.bouncycastle bcprov-jdk18on * * * *
+org.bouncycastle bcutil-jdk18on * * * *
+org.assertj assertj-core * * * *
+# not packaged for debian
+io.vertx vertx-core * * * *
+io.vertx vertx-junit5 * * * *
+io.vertx vertx-codegen * * * *
+org.openjdk.jcstress jcstress-core * * * *
=====================================
debian/patches/01-build.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Disable jcstress-core annotations during build
+Author: tony mancill <tmancill at debian.org>
+Forwarded: not-needed
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -109,6 +109,7 @@
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
++<!--
+ <path>
+ <groupId>org.openjdk.jcstress</groupId>
+ <artifactId>jcstress-core</artifactId>
+@@ -120,6 +121,7 @@
+ </exclusion>
+ </exclusions>
+ </path>
++-->
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01-build.patch
=====================================
debian/pom.xml deleted
=====================================
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>7</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- <version>2.1.8</version>
- <name>dnsjava</name>
- <description>dnsjava is an implementation of DNS in Java. It supports all defined record types (including the DNSSEC types), and unknown types. It can be used for queries, zone transfers, and dynamic updates. It includes a cache which can be used by clients, and a minimal implementation of a server. It supports TSIG authenticated messages, partial DNSSEC verification, and EDNS0. </description>
- <url>http://www.dnsjava.org</url>
- <licenses>
- <license>
- <name>BSD 2-Clause license</name>
- <url>http://opensource.org/licenses/BSD-2-Clause</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <connection>scm:git:https://github.com/dnsjava/dnsjava</connection>
- <developerConnection>scm:git:git at github.com:dnsjava/dnsjava</developerConnection>
- <url>https://github.com/dnsjava/dnsjava</url>
- <tag>v2.1.8</tag>
- </scm>
- <developers>
- <developer>
- <id>bwelling</id>
- <name>Brian Wellington</name>
- </developer>
- </developers>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <target.jdk>1.4</target.jdk>
- </properties>
-
- <build>
- <sourceDirectory>./</sourceDirectory>
- <testSourceDirectory>./tests</testSourceDirectory>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
- <configuration>
- <source>${target.jdk}</source>
- <target>${target.jdk}</target>
- <encoding>iso8859-1</encoding>
- <testExcludes>
- <!-- Exclude unit tests with external dependencies -->
- <exclude>**/DNSSECWithLunaProviderTest.java</exclude>
- </testExcludes>
- <includes>
- <include>*.java</include>
- <include>org/**/*.java</include>
- </includes>
- <excludes>
- <exclude>org/xbill/DNS/tests/**</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
- <includes>
- <include>*.java</include>
- <include>org/**/*.java</include>
- </includes>
- <excludes>
- <exclude>org/xbill/DNS/tests/</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-<!--
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
- <configuration>
- <instructions>
- <Export-Package>org.xbill.DNS;uses:="org.xbill.DNS.util",org.xbill.DNS.spi;uses:="org.xbill.DNS,sun.net.spi.nameservice",org.xbill.DNS.utils,org.xbill.DNS.windows</Export-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <excludePackageNames>*.tests.*</excludePackageNames>
- <sourcepath>./org</sourcepath>
- <debug>true</debug>
- <windowtitle>dnsjava documentation</windowtitle>
- <footer></footer>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <!-- Workaround to be able to use JDK 9 >= b175 -->
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>spi-up-to-java8</id>
- <activation>
- <jdk>(,1.8]</jdk>
- </activation>
- <build>
- <resources>
- <resource>
- <directory>org/xbill/DNS/spi/</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>services/</include>
- </includes>
- </resource>
- </resources>
- </build>
- </profile>
-
- <profile>
- <!-- JDK9 removed the Nameservice SPI as per bug 8134577. There's no replacement. -->
- <id>no-spi-on-java9</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
-
- <properties>
- <target.jdk>9</target.jdk>
- <maven.compiler.release>${target.jdk}</maven.compiler.release>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/xbill/DNS/tests/**</exclude>
- <exclude>org/xbill/DNS/spi/**</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>*.tests.*:*.spi.*</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
=====================================
debian/rules
=====================================
@@ -4,11 +4,3 @@ export JAVA_HOME = /usr/lib/jvm/default-java
%:
dh $@ --buildsystem=maven
-
-override_dh_auto_configure:
- cp debian/pom.xml .
- dh_auto_configure
-
-override_dh_auto_clean:
- dh_auto_clean
- rm -f pom.xml
View it on GitLab: https://salsa.debian.org/java-team/dnsjava/-/compare/e1f1dea9e4f634c5f83404ee9893d87ff9b86f84...af85dbcbdd3b38aa0f5e6acfddd18731fb9432f2
--
View it on GitLab: https://salsa.debian.org/java-team/dnsjava/-/compare/e1f1dea9e4f634c5f83404ee9893d87ff9b86f84...af85dbcbdd3b38aa0f5e6acfddd18731fb9432f2
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/20250201/2d3e2e45/attachment.htm>
More information about the pkg-java-commits
mailing list