[Git][debian-gis-team/osmpbf][master] 6 commits: New upstream version 1.6.1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat Dec 20 13:58:29 GMT 2025
Bas Couwenberg pushed to branch master at Debian GIS Project / osmpbf
Commits:
13fe410b by Bas Couwenberg at 2025-12-20T14:47:49+01:00
New upstream version 1.6.1
- - - - -
62565ef9 by Bas Couwenberg at 2025-12-20T14:47:49+01:00
Update upstream source from tag 'upstream/1.6.1'
Update to upstream version '1.6.1'
with Debian dir d336e4dd5a64a46a982111441ba6c87dfe12e1e5
- - - - -
04f19942 by Bas Couwenberg at 2025-12-20T14:48:30+01:00
New upstream release.
- - - - -
e8314243 by Bas Couwenberg at 2025-12-20T14:51:27+01:00
Use execute_{before,after} instead of override in rules file.
- - - - -
d9a6b16f by Bas Couwenberg at 2025-12-20T14:55:51+01:00
Update symbols for amd64.
- - - - -
03de38a0 by Bas Couwenberg at 2025-12-20T14:55:51+01:00
Set distribution to unstable.
- - - - -
11 changed files:
- .github/workflows/c.yml
- .github/workflows/java.yml
- CHANGELOG.md
- CMakeLists.txt
- README.md
- debian/changelog
- debian/libosmpbf1.symbols
- debian/rules
- osmpbf/fileformat.proto
- osmpbf/osmformat.proto
- pom.xml
Changes:
=====================================
.github/workflows/c.yml
=====================================
@@ -3,8 +3,8 @@ name: C CI
on: [push, pull_request]
jobs:
- ubuntu20:
- runs-on: ubuntu-20.04
+ ubuntu22:
+ runs-on: ubuntu-22.04
env:
CC: gcc
CXX: g++
@@ -15,8 +15,8 @@ jobs:
- uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build
- ubuntu22:
- runs-on: ubuntu-22.04
+ ubuntu24:
+ runs-on: ubuntu-24.04
env:
CC: gcc
CXX: g++
@@ -27,11 +27,11 @@ jobs:
- uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build
- ubuntu22-clang:
- runs-on: ubuntu-22.04
+ ubuntu24-clang:
+ runs-on: ubuntu-24.04
env:
- CC: clang-15
- CXX: clang++-15
+ CC: clang-18
+ CXX: clang++-18
CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug
steps:
@@ -39,8 +39,8 @@ jobs:
- uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build
- ubuntu22-release:
- runs-on: ubuntu-22.04
+ ubuntu24-release:
+ runs-on: ubuntu-24.04
env:
CC: gcc
CXX: g++
@@ -57,7 +57,7 @@ jobs:
env:
CC: clang
CXX: clang++
- CXXFLAGS: -Werror -Wall -pedantic
+ CXXFLAGS: -Werror -Wall -pedantic -Wno-nullability-extension
BUILD_TYPE: Debug
steps:
- uses: actions/checkout at v4
=====================================
.github/workflows/java.yml
=====================================
@@ -3,51 +3,55 @@ name: Java CI
on: [push, pull_request]
jobs:
- maven-ubuntu20:
- runs-on: ubuntu-20.04
+ maven-ubuntu22:
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout at v4
- run: sudo apt-get install protobuf-compiler
- - name: Set up JDK 1.8
- uses: actions/setup-java at v1
+ - name: Set up JDK 8
+ uses: actions/setup-java at v4
with:
- java-version: 1.8
+ distribution: zulu
+ java-version: 8
- name: Build with Maven
run: mvn -B package --file pom.xml
- maven-ubuntu22:
- runs-on: ubuntu-22.04
+ maven-ubuntu24:
+ runs-on: ubuntu-24.04
steps:
- uses: actions/checkout at v4
- run: sudo apt-get install protobuf-compiler
- - name: Set up JDK 1.8
- uses: actions/setup-java at v1
+ - name: Set up JDK 8
+ uses: actions/setup-java at v4
with:
- java-version: 1.8
+ distribution: zulu
+ java-version: 8
- name: Build with Maven
run: mvn -B package --file pom.xml
- ant-ubuntu20:
- runs-on: ubuntu-20.04
+ ant-ubuntu22:
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout at v4
- run: sudo apt-get install protobuf-compiler libprotobuf-java
- - name: Set up JDK 1.8
- uses: actions/setup-java at v1
+ - name: Set up JDK 8
+ uses: actions/setup-java at v4
with:
- java-version: 1.8
+ distribution: zulu
+ java-version: 8
- name: Build with Ant
run: ant
- ant-ubuntu22:
- runs-on: ubuntu-22.04
+ ant-ubuntu24:
+ runs-on: ubuntu-24.04
steps:
- uses: actions/checkout at v4
- run: sudo apt-get install protobuf-compiler libprotobuf-java
- - name: Set up JDK 1.8
- uses: actions/setup-java at v1
+ - name: Set up JDK 8
+ uses: actions/setup-java at v4
with:
- java-version: 1.8
+ distribution: zulu
+ java-version: 8
- name: Build with Ant
run: ant
=====================================
CHANGELOG.md
=====================================
@@ -1,5 +1,13 @@
## Unreleased
+## Release notes for 1.6.1 (2025-12-20)
+
+- Java: Update to latest protoc and protobuf runtime versions [#92](https://github.com/openstreetmap/OSM-binary/pull/92)
+
+## Release notes for 1.6.0 (2024-12-10)
+
+- Java: Update to latest protoc and protobuf runtime versions [#84](https://github.com/openstreetmap/OSM-binary/pull/84)
+
## Release notes for 1.5.0 (2021-01-06)
- C: Support hardening buildflags set in the environment ([09845ca4](https://github.com/openstreetmap/OSM-binary/commit/09845ca4087c7404b1de33914233dbf53f9de4c3))
=====================================
CMakeLists.txt
=====================================
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.10)
project(osmpbf VERSION 1.5.0)
=====================================
README.md
=====================================
@@ -21,16 +21,17 @@ something more complete see [libosmium](https://osmcode.org/libosmium/).
### Building with Maven
-We publish the Java library to [Maven Central](https://search.maven.org/):
+We publish the Java library to [Maven Central](https://mvnrepository.com/artifact/org.openstreetmap.pbf/osmpbf): 
```xml
<dependency>
<groupId>org.openstreetmap.pbf</groupId>
<artifactId>osmpbf</artifactId>
- <version>1.5.0</version>
+ <version>${LATEST_VERSION}</version>
</dependency>
```
+
To build the Java library run:
```sh
=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-osmpbf (1.5.1-2) UNRELEASED; urgency=medium
+osmpbf (1.6.1-1) unstable; urgency=medium
+ * New upstream release.
* Bump Standards-Version to 4.7.2, no changes.
* Make autopkgtest script more verbose.
* Mark libosmpbf-java as Multi-Arch: foreign, and
@@ -7,8 +8,10 @@ osmpbf (1.5.1-2) UNRELEASED; urgency=medium
* Update lintian overrides.
* Drop Rules-Requires-Root: no, default since dpkg 1.22.13.
* Use test-build-validate-cleanup instead of test-build-twice.
+ * Use execute_{before,after} instead of override in rules file.
+ * Update symbols for amd64.
- -- Bas Couwenberg <sebastic at debian.org> Sun, 28 Jul 2024 19:49:07 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 20 Dec 2025 14:51:38 +0100
osmpbf (1.5.1-1) unstable; urgency=medium
=====================================
debian/libosmpbf1.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 1.5.1 amd64
+# SymbolsHelper-Confirmed: 1.6.1 amd64
libosmpbf.so.1 #PACKAGE# #MINVER#
* Build-Depends-Package: libosmpbf-dev
_Z41descriptor_table_osmformat_2eproto_getterv at Base 1.5.0
@@ -263,7 +263,6 @@ libosmpbf.so.1 #PACKAGE# #MINVER#
(optional=templinst)_ZN6google8protobuf8internal16InternalMetadata21DeleteOutOfLineHelperINS0_15UnknownFieldSetEEEPNS0_5ArenaEv at Base 1.5.0
(optional=templinst)_ZN6google8protobuf8internal16InternalMetadata27mutable_unknown_fields_slowINS0_15UnknownFieldSetEEEPT_v at Base 1.4.0
(optional=templinst)_ZN6google8protobuf8internal16InternalMetadata7DoClearINS0_15UnknownFieldSetEEEvv at Base 1.5.0
- _ZN6google8protobuf8internal18EpsCopyInputStream13DoneWithCheckEPPKci at Base 1.5.0
(optional=templinst)_ZN6google8protobuf8internal18EpsCopyInputStream16ReadPackedVarintIZNS1_16PackedEnumParserINS0_15UnknownFieldSetEEEPKcPvS7_PNS1_12ParseContextEPFbiEPNS1_16InternalMetadataEiEUlmE_EES7_S7_T_ at Base 1.4.0
(optional=templinst|arch=!amd64)_ZN6google8protobuf8internal18EpsCopyInputStream16ReadPackedVarintIZNS1_16PackedEnumParserINS0_15UnknownFieldSetEEEPKcPvS7_PNS1_12ParseContextEPFbiEPNS1_16InternalMetadataEiEUlyE_EES7_S7_T_ at Base 1.4.0
(optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6OSMPBF14PrimitiveGroupEE5MergeERKS4_PS4_ at Base 1.4.0
=====================================
debian/rules
=====================================
@@ -14,25 +14,22 @@ UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
%:
dh $@ --buildsystem cmake
-override_dh_auto_clean:
+execute_before_dh_auto_clean:
dh_auto_clean --buildsystem ant
- dh_auto_clean
+
+execute_after_dh_auto_clean:
mh_clean
-override_dh_auto_configure:
+execute_before_dh_auto_configure:
dh_auto_configure --buildsystem ant
- dh_auto_configure
-override_dh_auto_build:
+execute_before_dh_auto_build:
dh_auto_build --buildsystem ant
- dh_auto_build
-override_dh_auto_install:
+execute_before_dh_auto_install:
dh_auto_install --buildsystem ant
- dh_auto_install
-override_dh_install:
- dh_install
+execute_after_dh_install:
mh_installjar -plibosmpbf-java -l pom.xml osmpbf.jar
mh_installpom -plibosmpbf-java pom.xml
=====================================
osmpbf/fileformat.proto
=====================================
@@ -65,5 +65,3 @@ message BlobHeader {
optional bytes indexdata = 2;
required int32 datasize = 3;
}
-
-
=====================================
osmpbf/osmformat.proto
=====================================
@@ -260,4 +260,3 @@ message Relation {
repeated sint64 memids = 9 [packed = true]; // DELTA encoded
repeated MemberType types = 10 [packed = true];
}
-
=====================================
pom.xml
=====================================
@@ -6,7 +6,7 @@
<groupId>org.openstreetmap.pbf</groupId>
<artifactId>osmpbf</artifactId>
<packaging>jar</packaging>
- <version>1.5.0</version>
+ <version>1.6.1</version>
<name>OSM-Binary</name>
<description>Library for the OpenStreetMap PBF format</description>
<url>https://github.com/openstreetmap/OSM-binary</url>
@@ -31,9 +31,20 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <protobuf.version>4.33.2</protobuf.version>
</properties>
<build>
+ <extensions>
+ <!-- makes build variables like os.detected.classifier available.
+ use to select the correct protoc instance for the OS.
+ see protobuf-maven-plugin below -->
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>1.7.1</version>
+ </extension>
+ </extensions>
<sourceDirectory>${basedir}/src.java</sourceDirectory>
<testSourceDirectory>${basedir}/test.java</testSourceDirectory>
@@ -59,7 +70,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
- <protocExecutable>protoc</protocExecutable>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
@@ -122,16 +133,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.sonatype.central</groupId>
+ <artifactId>central-publishing-maven-plugin</artifactId>
+ <version>0.6.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <publishingServerId>central</publishingServerId>
+ <autoPublish>true</autoPublish>
+ </configuration>
+ </plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>dtrott</id>
- <url>http://maven.davidtrott.com/repository</url>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -143,19 +157,8 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.16.3</version>
+ <version>${protobuf.version}</version>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
</project>
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/93751ed0a4166c338e66d086227a8482a3fe1c18...03de38a0483d37a940e6e2af700bb198b6608784
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/93751ed0a4166c338e66d086227a8482a3fe1c18...03de38a0483d37a940e6e2af700bb198b6608784
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-grass-devel/attachments/20251220/214adf2d/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list