[Git][java-team/libjsonp2-java][master] 9 commits: Declare compliance with Debian Policy 4.7.0.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sun Feb 9 17:11:06 GMT 2025
Markus Koschany pushed to branch master at Debian Java Maintainers / libjsonp2-java
Commits:
aaf25380 by Markus Koschany at 2025-02-09T17:51:45+01:00
Declare compliance with Debian Policy 4.7.0.
- - - - -
527430bb by Markus Koschany at 2025-02-09T17:52:13+01:00
Update copyright years
- - - - -
77399a7f by Markus Koschany at 2025-02-09T17:52:37+01:00
New upstream version 2.1.3
- - - - -
ac72b7cd by Markus Koschany at 2025-02-09T17:52:38+01:00
Update upstream source from tag 'upstream/2.1.3'
Update to upstream version '2.1.3'
with Debian dir 8b995d9c0a1e49f85ddd92ea72281737baced3c0
- - - - -
4880b6a6 by Markus Koschany at 2025-02-09T17:54:22+01:00
Update changelog
- - - - -
08412978 by Markus Koschany at 2025-02-09T17:55:44+01:00
Drop build.patch
- - - - -
05713990 by Markus Koschany at 2025-02-09T17:56:10+01:00
Update pom.patch
- - - - -
3ee2408d by Markus Koschany at 2025-02-09T17:56:42+01:00
Drop pom.patch
- - - - -
de1f4525 by Markus Koschany at 2025-02-09T18:06:18+01:00
Rebase build and pom patch into new build.patch
- - - - -
9 changed files:
- .github/workflows/maven.yml
- api/pom.xml
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/build.patch
- debian/patches/bundle-manifest.patch
- − debian/patches/pom.patch
- debian/patches/series
Changes:
=====================================
.github/workflows/maven.yml
=====================================
@@ -27,7 +27,7 @@ jobs:
strategy:
matrix:
- java_version: [ 11, 17, 21-ea ]
+ java_version: [ 11, 17, 21 ]
steps:
- name: Checkout for build
=====================================
api/pom.xml
=====================================
@@ -23,14 +23,14 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8</version>
<relativePath/>
</parent>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
<name>Jakarta JSON Processing API</name>
<description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
<url>https://github.com/eclipse-ee4j/jsonp</url>
@@ -83,7 +83,7 @@
<spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
- <spotbugs.version>4.7.3.4</spotbugs.version>
+ <spotbugs.version>4.7.3.5</spotbugs.version>
<non.final>false</non.final>
<extension.name>jakarta.json</extension.name>
@@ -98,12 +98,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.glassfish.copyright</groupId>
@@ -123,7 +123,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.8</version>
+ <version>5.1.9</version>
<configuration>
<instructions>
<_noextraheaders>true</_noextraheaders>
@@ -138,7 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -148,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
@@ -331,6 +331,16 @@
!org.eclipse.parsson,
*
</Import-Package>
+ <!-- optional to allow usage with hk2 resource locator as a fallback -->
+ <Require-Capability><![CDATA[
+ osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)
+ (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+ osgi.serviceloader;
+ filter:="(osgi.serviceloader=jakarta.json.spi.JsonProvider)";
+ osgi.serviceloader="jakarta.json.spi.JsonProvider";
+ cardinality:=multiple;resolution:=optional
+ ]]>
+ </Require-Capability>
</instructions>
</configuration>
<executions>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libjsonp2-java (2.1.3-1) unstable; urgency=medium
+
+ * New upstream version 2.1.3.
+ * Declare compliance with Debian Policy 4.7.0.
+
+ -- Markus Koschany <apo at debian.org> Sun, 09 Feb 2025 17:53:01 +0100
+
libjsonp2-java (2.1.2-1) unstable; urgency=medium
* New upstream version 2.1.2.
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends:
libbuild-helper-maven-plugin-java,
libmaven-bundle-plugin-java,
maven-debian-helper
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/java-team/libjsonp2-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libjsonp2-java
Homepage: https://github.com/eclipse-ee4j/jsonp
=====================================
debian/copyright
=====================================
@@ -7,7 +7,7 @@ Copyright: 2011, 2013, 2015, 2016, 2017, 2018, 2020 Oracle and/or its affiliates
License: EPL-2.0 and GPL-2-with-classpath-exception
Files: debian/*
-Copyright: 2022-2023, Markus Koschany <apo at debian.org>
+Copyright: 2022-2025, Markus Koschany <apo at debian.org>
License: EPL-2.0 and GPL-2-with-classpath-exception
License: EPL-2.0
=====================================
debian/patches/build.patch
=====================================
@@ -1,14 +1,19 @@
From: Markus Koschany <apo at debian.org>
-Date: Thu, 18 Aug 2022 19:25:14 +0200
+Date: Sun, 9 Feb 2025 18:03:08 +0100
Subject: build
-Why can't we just remove the parent with our poms file?
+FIXME: Why do we need this hack to build this package. Is this a bug in
+maven-debian-helper?
+
+Forwarded: not-needed
---
- api/pom.xml | 7 -------
- 1 file changed, 7 deletions(-)
+ api/pom.xml | 34 ----------------------------------
+ pom.xml | 11 +++++++++++
+ 2 files changed, 11 insertions(+), 34 deletions(-)
+ create mode 100644 pom.xml
diff --git a/api/pom.xml b/api/pom.xml
-index 29c876b..7270ea3 100644
+index 5efa90f..80bb6f8 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,13 +20,6 @@
@@ -18,10 +23,68 @@ index 29c876b..7270ea3 100644
- <parent>
- <groupId>org.eclipse.ee4j</groupId>
- <artifactId>project</artifactId>
-- <version>1.0.7</version>
+- <version>1.0.8</version>
- <relativePath/>
- </parent>
-
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
+@@ -145,11 +138,6 @@
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ </plugin>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-enforcer-plugin</artifactId>
+- <version>3.4.0</version>
+- </plugin>
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+@@ -163,28 +151,6 @@
+ </pluginManagement>
+
+ <plugins>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-enforcer-plugin</artifactId>
+- <executions>
+- <execution>
+- <id>enforce-maven</id>
+- <goals>
+- <goal>enforce</goal>
+- </goals>
+- <configuration>
+- <rules>
+- <requireJavaVersion>
+- <version>[11,)</version>
+- </requireJavaVersion>
+- <requireMavenVersion>
+- <version>[3.6.0,)</version>
+- </requireMavenVersion>
+- </rules>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+ <plugin>
+ <!-- e.g. mvn validate glassfish-copyright:repair -->
+ <groupId>org.glassfish.copyright</groupId>
+diff --git a/pom.xml b/pom.xml
+new file mode 100644
+index 0000000..7025152
+--- /dev/null
++++ b/pom.xml
+@@ -0,0 +1,11 @@
++ <project>
++ <modelVersion>4.0.0</modelVersion>
++ <groupId>jakarta.json</groupId>
++ <artifactId>jakarta.json</artifactId>
++ <version>2.1.3</version>
++ <packaging>pom</packaging>
++
++ <modules>
++ <module>api</module>
++ </modules>
++ </project>
=====================================
debian/patches/bundle-manifest.patch
=====================================
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
-index 7270ea3..29307b8 100644
+index 0f4906a..5efa90f 100644
--- a/api/pom.xml
+++ b/api/pom.xml
-@@ -310,14 +310,14 @@
+@@ -317,14 +317,14 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -22,10 +22,10 @@ index 7270ea3..29307b8 100644
- <Extension-Name>${spec.extension.name}</Extension-Name>
- <Implementation-Version>${spec.implementation.version}</Implementation-Version>
- <Specification-Version>${spec.specification.version}</Specification-Version>
-+ <Bundle-Version>2.1.1</Bundle-Version>
++ <Bundle-Version>2.1.3</Bundle-Version>
+ <Bundle-SymbolicName>jakarta.json-api</Bundle-SymbolicName>
+ <Extension-Name>jakarta.json</Extension-Name>
-+ <Implementation-Version>2.1.1</Implementation-Version>
++ <Implementation-Version>2.1.3</Implementation-Version>
+ <Specification-Version>2.1</Specification-Version>
<Bundle-Description>Jakarta JSON Processing API ${spec.version}</Bundle-Description>
- <Specification-Vendor>${vendor.name}</Specification-Vendor>
=====================================
debian/patches/pom.patch deleted
=====================================
@@ -1,77 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Wed, 13 Sep 2023 14:21:34 +0200
-Subject: pom
-
-Create a simple pom file in our root directory and point to the api module. Is
-this really necessary and why does maven-debian-helper otherwise not work
-correctly?
-
-Forwarded: not-needed
----
- api/pom.xml | 27 ---------------------------
- pom.xml | 11 +++++++++++
- 2 files changed, 11 insertions(+), 27 deletions(-)
- create mode 100644 pom.xml
-
-diff --git a/api/pom.xml b/api/pom.xml
-index 29307b8..cd8731a 100644
---- a/api/pom.xml
-+++ b/api/pom.xml
-@@ -138,11 +138,6 @@
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.5.0</version>
- </plugin>
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-enforcer-plugin</artifactId>
-- <version>3.3.0</version>
-- </plugin>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
-@@ -156,28 +151,6 @@
- </pluginManagement>
-
- <plugins>
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-enforcer-plugin</artifactId>
-- <executions>
-- <execution>
-- <id>enforce-maven</id>
-- <goals>
-- <goal>enforce</goal>
-- </goals>
-- <configuration>
-- <rules>
-- <requireJavaVersion>
-- <version>[11,)</version>
-- </requireJavaVersion>
-- <requireMavenVersion>
-- <version>[3.6.0,)</version>
-- </requireMavenVersion>
-- </rules>
-- </configuration>
-- </execution>
-- </executions>
-- </plugin>
- <plugin>
- <!-- e.g. mvn validate glassfish-copyright:repair -->
- <groupId>org.glassfish.copyright</groupId>
-diff --git a/pom.xml b/pom.xml
-new file mode 100644
-index 0000000..edb67aa
---- /dev/null
-+++ b/pom.xml
-@@ -0,0 +1,11 @@
-+ <project>
-+ <modelVersion>4.0.0</modelVersion>
-+ <groupId>jakarta.json</groupId>
-+ <artifactId>jakarta.json</artifactId>
-+ <version>2.1.2</version>
-+ <packaging>pom</packaging>
-+
-+ <modules>
-+ <module>api</module>
-+ </modules>
-+ </project>
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
-build.patch
bundle-manifest.patch
-pom.patch
+build.patch
View it on GitLab: https://salsa.debian.org/java-team/libjsonp2-java/-/compare/58069d910c72c496e56988be69ce474be77ed3d3...de1f45253f8e1c64c61d4733f60f696c40c56d46
--
View it on GitLab: https://salsa.debian.org/java-team/libjsonp2-java/-/compare/58069d910c72c496e56988be69ce474be77ed3d3...de1f45253f8e1c64c61d4733f60f696c40c56d46
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/20250209/0982cf97/attachment.htm>
More information about the pkg-java-commits
mailing list