Skip to content

Commit 3638b8d

Browse files
authored
Merge branch 'jgaa:master' into https_proxy
2 parents 21217ab + 91f8656 commit 3638b8d

File tree

6 files changed

+44
-201
lines changed

6 files changed

+44
-201
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if (DEFINED ENV{RESTC_CPP_VERSION})
1111
endif()
1212

1313
if (NOT DEFINED RESTC_CPP_VERSION)
14-
set(RESTC_CPP_VERSION 0.97.0)
14+
set(RESTC_CPP_VERSION 0.98.0)
1515
endif()
1616

1717
if(NOT DEFINED RESTC_BOOST_VERSION)

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,11 @@ The project has been in public BETA since April 11th 2017.
255255
These are the operating systems where my Continues Integration (Jenkins) servers currently compiles the project and run all the tests:
256256

257257
- Debian Testing
258+
- Debian Bookworm
258259
- Debian Bullseye (Stable)
259260
- Debian Buster
260-
- Debian Stretch
261261
- Windows 10 / Microsoft Visual Studio 2019, Community version using vcpkg for dependencies
262262
- Ubuntu Xenial (LTS)
263-
- Ubuntu Bionic (LTS)
264263

265264
Support for MacOS has been removed after Apples announcement that their love for privacy was just
266265
a marketing gimmick.
@@ -276,8 +275,11 @@ I currently use my own CI infrastructure running on my own hardware. I use Jenki
276275
- [restc-cpp tags on The Last Viking's Nest](https://lastviking.eu/_tags/restc-cpp.html)
277276

278277
# Similar projects
279-
- [Boost.Beast](https://github.com/boostorg/beast) by Vinnie Falco. When you like to write many lines of code...
280278
- [RESTinCurl](https://github.com/jgaa/RESTinCurl) by me. Aimed at mobile applications, IoT and projects that already link with libcurl.
279+
- [Boost.Beast](https://github.com/boostorg/beast) by Vinnie Falco. When you like to write many lines of code...
280+
281+
**Json serialization only**
282+
- [Boost.Json](https://www.boost.org/doc/libs/1_83_0/libs/json/doc/html/index.html)
281283
- [JSON for Modern C++](https://nlohmann.github.io/json/) by Niels Lohmann. My favorite json library, when I need to more than just static serialization.
282284
- [json11 - tiny JSON library for C++11, providing JSON parsing and serialization](https://github.com/dropbox/json11)
283285

ci/jenkins/Dockerfile.debian-stretch renamed to ci/jenkins/Dockefile.debian-bookworm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
FROM debian:stretch
1+
FROM debian:bookworm
22

33
MAINTAINER Jarle Aase <jgaa@jgaa.com>
44

5+
# In case you need proxy
56
RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
67
DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
7-
DEBIAN_FRONTEND="noninteractive" apt-get install -y -q \
8+
DEBIAN_FRONTEND="noninteractive" apt-get install -y -q\
89
openssh-server g++ git \
910
build-essential \
1011
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
11-
openjdk-8-jdk &&\
12+
default-jdk &&\
1213
apt-get -y -q autoremove &&\
1314
apt-get -y -q clean
1415

ci/jenkins/Dockefile.ubuntu-bionic

Lines changed: 0 additions & 26 deletions
This file was deleted.

ci/jenkins/Dockefile.ubuntu-xenial

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ MAINTAINER Jarle Aase <jgaa@jgaa.com>
88
RUN apt-get -q update &&\
99
apt-get -y -q --no-install-recommends upgrade &&\
1010
apt-get -y -q install openssh-server g++ git \
11-
automake autoconf ruby ruby-dev rubygems build-essential \
11+
automake autoconf build-essential \
1212
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
1313
openjdk-8-jdk &&\
14-
gem install --no-ri --no-rdoc fpm &&\
1514
apt-get -y -q autoremove &&\
1615
apt-get -y -q clean
1716

0 commit comments

Comments
 (0)