Skip to content

Commit

Permalink
Merge pull request #1 from jcabi/master
Browse files Browse the repository at this point in the history
Sync with origin/master
  • Loading branch information
piotrkot authored Jun 25, 2022
2 parents 58fc2b5 + 06544d6 commit 73067cc
Show file tree
Hide file tree
Showing 105 changed files with 3,790 additions and 1,758 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
51 changes: 51 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: build

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
name: Tests
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Test
run: mvn clean test --errors --batch-mode
- name: CodeCov
uses: codecov/[email protected]
if: matrix.os == 'ubuntu-latest' && github.repository == 'jcabi/jcabi-http'
timeout-minutes: 10
with:
file: target/coverage/jacoco.xml

lint:
name: Linters
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Ruby 2.7
uses: actions/setup-ruby@v1
with:
ruby-version: 2.7
- name: Install pdd, xcop
run: |
gem install pdd
gem install xcop
- name: JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Puzzles
run: pdd --file=/dev/null
- name: Qulice
run: mvn -P qulice clean install -DskipTests=true --errors --batch-mode
20 changes: 20 additions & 0 deletions .github/workflows/owasp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: OWASP
on:
schedule:
- cron: '0 0 * * *'
pull_request:
branches: [ master ]


jobs:
owasp:
name: Dependency-Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Maven
run: mvn --errors --batch-mode -Powasp dependency-check:check
46 changes: 13 additions & 33 deletions .rultor.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,21 @@
architect:
- yegor256
- dmarkov
install:
- sudo gem install pdd -v 0.20.5
- yegor256
- andreoss
assets:
secring.gpg: yegor256/home#assets/secring.gpg
settings.xml: yegor256/home#assets/jcabi/settings.xml
secring.gpg: yegor256/home#assets/secring.gpg
pubring.gpg: yegor256/home#assets/pubring.gpg
s3cfg: yegor256/home#assets/s3cfg
install: |
pdd --file=/dev/null
merge:
script: |-
mvn clean install -Pqulice --errors --settings ../settings.xml
mvn clean
pdd --source=$(pwd) --verbose --file=/dev/null
commanders:
- carlosmiranda
- darkled
- dmzaytsev
- ggajos
- hdouss
- krzyk
- longtimeago
- mkordas
- pinaf
deploy:
script: |-
mvn clean deploy -Pqulice --errors --settings ../settings.xml
mvn clean
pdd --source=$(pwd) --verbose --file=jcabi-http.xml
s3cmd --no-progress put jcabi-http.xml --config=../s3cfg s3://pdd.teamed.io/jcabi-http.xml
env:
MAVEN_OPTS: -XX:MaxPermSize=256m -Xmx1g
script: |
mvn clean install -Pqulice --errors --batch-mode
release:
pre: false
script: |-
mvn versions:set "-DnewVersion=${tag}"
env
export JAVA_HOME=/usr/lib/jvm/default-java
mvn versions:set "-DnewVersion=${tag}" --batch-mode
git commit -am "${tag}"
mvn clean deploy -Pqulice -Psonatype -Pjcabi -Pjcabi-http --errors --settings ../settings.xml
mvn clean site-deploy -Psite -Pjcabi --errors --settings ../settings.xml
commanders:
- yegor256
mvn clean deploy -Pqulice -Psonatype -Pjcabi --batch-mode --errors --settings ../settings.xml
mvn clean site-deploy -Psite --errors --settings ../settings.xml --batch-mode
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: java
dist: trusty
sudo: false
cache:
directories:
Expand All @@ -20,5 +21,5 @@ env:
- MAVEN_OPTS="-Xmx256m"
- JAVA_OPTS="-Xmx256m"
jdk:
- oraclejdk8
- openjdk7
- openjdk8

7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
[![Build Status](https://travis-ci.org/jcabi/jcabi-http.svg?branch=master)](https://travis-ci.org/jcabi/jcabi-http)
[![PDD status](http://www.0pdd.com/svg?name=jcabi/jcabi-http)](http://www.0pdd.com/p?name=jcabi/jcabi-http)
[![Build status](https://ci.appveyor.com/api/projects/status/a87rxtuvvek647fs/branch/master?svg=true)](https://ci.appveyor.com/project/yegor256/jcabi-http/branch/master)
[![Coverage Status](https://coveralls.io/repos/jcabi/jcabi-http/badge.svg?branch=__rultor&service=github)](https://coveralls.io/github/jcabi/jcabi-http?branch=__rultor)
[![codecov](https://codecov.io/gh/jcabi/jcabi-http/branch/master/graph/badge.svg?token=TWye97XBJ8)](https://codecov.io/gh/jcabi/jcabi-http)
[![Javadoc](https://javadoc.io/badge/com.jcabi/jcabi-http.svg)](http://www.javadoc.io/doc/com.jcabi/jcabi-http)

[![jpeek report](http://i.jpeek.org/com.jcabi/jcabi-http/badge.svg)](http://i.jpeek.org/com.jcabi/jcabi-http/)
[![jpeek report](https://i.jpeek.org/com.jcabi/jcabi-http/badge.svg)](https://i.jpeek.org/com.jcabi/jcabi-http/)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.jcabi/jcabi-http/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.jcabi/jcabi-http)
[![Dependencies](https://www.versioneye.com/user/projects/561a9e01a193340f32000eab/badge.svg?style=flat)](https://www.versioneye.com/user/projects/561a9e01a193340f32000eab)

More details are here: [http.jcabi.com](https://http.jcabi.com/index.html).
Also, read this blog post: [Fluent Java HTTP Client](http://www.yegor256.com/2014/04/11/jcabi-http-intro.html).
Expand Down Expand Up @@ -53,4 +52,4 @@ Please run Maven build before submitting a pull request:
$ mvn clean install -Pqulice
```

Make sure you're using Maven 3.2+ and Java7+.
Make sure you're using Maven 3.6+ and Java 8+.
17 changes: 6 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,25 @@ skip_tags: true
clone_depth: 10
environment:
matrix:
- JAVA_HOME: C:\Program Files\Java\jdk1.7.0
#- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
branches:
only:
- master
except:
- gh-pages
os: Windows Server 2012
install:
- ps: |
Add-Type -AssemblyName System.IO.Compression.FileSystem
if (!(Test-Path -Path "C:\maven" )) {
(new-object System.Net.WebClient).DownloadFile('http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip', 'C:\maven-bin.zip')
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
}
- cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%
- cmd: SET PATH=C:\Ruby26-x64\bin;%PATH%
- cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
- cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
- cmd: mvn --version
- cmd: java -version
- cmd: ruby --version
- cmd: gem install xcop
build_script:
- mvn clean package -B -Dmaven.test.skip=true
- mvn --batch-mode -Dmaven.test.skip=true clean package
test_script:
- mvn clean install --batch-mode -Pqulice
- mvn --batch-mode -Pqulice clean install
cache:
- C:\maven\
- C:\Users\appveyor\.m2
Loading

0 comments on commit 73067cc

Please sign in to comment.