[Git][java-team/libjsonp2-java][master] 10 commits: Mark binary package as Multi-Arch: foreign.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Wed Sep 13 13:27:47 BST 2023
Markus Koschany pushed to branch master at Debian Java Maintainers / libjsonp2-java
Commits:
56db5915 by Markus Koschany at 2023-09-12T03:01:17+02:00
Mark binary package as Multi-Arch: foreign.
- - - - -
a3b6c600 by Markus Koschany at 2023-09-12T03:01:41+02:00
Declare compliance with Debian Policy 4.6.2.
- - - - -
bcd2ab2c by Markus Koschany at 2023-09-12T03:02:15+02:00
Update copyright years
- - - - -
6b9dfa61 by Markus Koschany at 2023-09-12T03:18:28+02:00
New upstream version 2.1.2
- - - - -
e68010ca by Markus Koschany at 2023-09-12T03:18:29+02:00
Update upstream source from tag 'upstream/2.1.2'
Update to upstream version '2.1.2'
with Debian dir 04be63cc39c89188f0ef947e3830cc483444db62
- - - - -
703d9f68 by Markus Koschany at 2023-09-12T03:20:25+02:00
Add debian/source/lintian-overrides
- - - - -
dab65a7d by Markus Koschany at 2023-09-12T03:20:57+02:00
Update changelog
- - - - -
65cb1111 by Markus Koschany at 2023-09-13T14:18:29+02:00
Update changelog timestamp
- - - - -
105b930c by Markus Koschany at 2023-09-13T14:19:38+02:00
Remove pom.patch
- - - - -
58069d91 by Markus Koschany at 2023-09-13T14:22:12+02:00
Refresh the patches
- - - - -
10 changed files:
- .github/workflows/maven.yml
- api/pom.xml
- api/src/main/java/jakarta/json/stream/JsonParser.java
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/build.patch
- debian/patches/bundle-manifest.patch
- debian/patches/pom.patch
- + debian/source/lintian-overrides
Changes:
=====================================
.github/workflows/maven.yml
=====================================
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,6 +16,10 @@ on:
pull_request:
push:
+concurrency:
+ group: ${{ github.ref }}
+ cancel-in-progress: true
+
jobs:
build:
name: Test on JDK ${{ matrix.java_version }}
@@ -23,13 +27,13 @@ jobs:
strategy:
matrix:
- java_version: [ 11, 17-ea ]
+ java_version: [ 11, 17, 21-ea ]
steps:
- name: Checkout for build
- uses: actions/checkout at v2.3.4
+ uses: actions/checkout at v3
- name: Set up JDK
- uses: actions/setup-java at v2
+ uses: actions/setup-java at v3
with:
distribution: 'zulu'
java-version: ${{ matrix.java_version }}
=====================================
api/pom.xml
=====================================
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,7 +30,7 @@
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</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.1.0</spotbugs.version>
+ <spotbugs.version>4.7.3.4</spotbugs.version>
<non.final>false</non.final>
<extension.name>jakarta.json</extension.name>
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
@@ -123,7 +123,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.7</version>
+ <version>5.1.8</version>
<configuration>
<instructions>
<_noextraheaders>true</_noextraheaders>
@@ -133,7 +133,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -143,12 +143,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
@@ -265,13 +265,12 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>9</release>
+ <createMissingPackageInfoClass>false</createMissingPackageInfoClass>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Xdoclint:all</arg>
- <arg>-Werror</arg>
</compilerArgs>
<showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
</configuration>
<executions>
<execution>
=====================================
api/src/main/java/jakarta/json/stream/JsonParser.java
=====================================
@@ -128,7 +128,7 @@ import jakarta.json.JsonArray;
* while (parser.hasNext() {
* Event event = parser.next();
* if (event == JsonParser.Event.KEY_NAME ) {
- * String key = getString();
+ * String key = parser.getString();
* event = parser.next();
* if (key.equals("phoneNumber") {
* JsonArray phones = parser.getArray();
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libjsonp2-java (2.1.2-1) unstable; urgency=medium
+
+ * New upstream version 2.1.2.
+ * Mark binary package as Multi-Arch: foreign.
+ * Declare compliance with Debian Policy 4.6.2.
+
+ -- Markus Koschany <apo at debian.org> Wed, 13 Sep 2023 14:18:06 +0200
+
libjsonp2-java (2.1.1-2) unstable; urgency=medium
* Source-only rebuild.
=====================================
debian/control
=====================================
@@ -10,12 +10,13 @@ Build-Depends:
libbuild-helper-maven-plugin-java,
libmaven-bundle-plugin-java,
maven-debian-helper
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
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
Package: libjsonp2-java
+Multi-Arch: foreign
Architecture: all
Depends:
${maven:Depends},
=====================================
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, Markus Koschany <apo at debian.org>
+Copyright: 2022-2023, Markus Koschany <apo at debian.org>
License: EPL-2.0 and GPL-2-with-classpath-exception
License: EPL-2.0
=====================================
debian/patches/build.patch
=====================================
@@ -8,7 +8,7 @@ Why can't we just remove the parent with our poms file?
1 file changed, 7 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
-index c05b4fb..bc64d59 100644
+index 29c876b..7270ea3 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,13 +20,6 @@
=====================================
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 bc64d59..9a4405b 100644
+index 7270ea3..29307b8 100644
--- a/api/pom.xml
+++ b/api/pom.xml
-@@ -311,14 +311,14 @@
+@@ -310,14 +310,14 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
=====================================
debian/patches/pom.patch
=====================================
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Mon, 22 Aug 2022 12:31:33 +0200
+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
@@ -14,17 +14,17 @@ Forwarded: not-needed
create mode 100644 pom.xml
diff --git a/api/pom.xml b/api/pom.xml
-index 9a4405b..53c7135 100644
+index 29307b8..cd8731a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -138,11 +138,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
-- <version>3.1.0</version>
+- <version>3.3.0</version>
- </plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
@@ -68,7 +68,7 @@ index 0000000..edb67aa
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json</artifactId>
-+ <version>2.1.1</version>
++ <version>2.1.2</version>
+ <packaging>pom</packaging>
+
+ <modules>
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# Harmless documentation file, not needed to build libjsonp2-java
+source-is-missing
View it on GitLab: https://salsa.debian.org/java-team/libjsonp2-java/-/compare/085fa5c28b90e081b2645d8207554fff34bccda3...58069d910c72c496e56988be69ce474be77ed3d3
--
View it on GitLab: https://salsa.debian.org/java-team/libjsonp2-java/-/compare/085fa5c28b90e081b2645d8207554fff34bccda3...58069d910c72c496e56988be69ce474be77ed3d3
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/20230913/0e6a9499/attachment.htm>
More information about the pkg-java-commits
mailing list