Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions .github/workflows/master-2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Master CI

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

jobs:
build-scan:
name: SonarCloud Scan
runs-on: ubuntu-latest
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'temurin'
cache: maven

- name: Build/Test & SonarCloud Scan
run: mvn -B clean verify -Pcoverage,sonar -Dsonar.login=${{ secrets.SONAR_TOKEN }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build-test:
name: Build & Test - JDK ${{ matrix.Java }} on ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
java: [ '17', '18']
os: [ ubuntu-latest, windows-latest ]
runs-on: ${{ matrix.os }}
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"

steps:
- uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}

- name: Show Versions
run: mvn -version

- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2
restore-keys: ${{ runner.os }}-m2

- name: Build/Test
run: mvn -B clean package ${{ matrix.jdk }}
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ A Java SDK for Switcher API
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=switcherapi_switcher-client&metric=alert_status)](https://sonarcloud.io/dashboard?id=switcherapi_switcher-client)
[![Known Vulnerabilities](https://snyk.io/test/github/switcherapi/switcher-client/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/switcherapi/switcher-client?targetFile=pom.xml)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Maven Central](https://img.shields.io/maven-central/v/com.github.switcherapi/switcher-client.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.github.switcherapi%22%20AND%20a:%22switcher-client%22)
[![Maven Central](https://img.shields.io/maven-central/v/com.github.switcherapi/switcher-client.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.github.switcherapi/switcher-client)
[![Slack: Switcher-HQ](https://img.shields.io/badge/slack-@switcher/hq-blue.svg?logo=slack)](https://switcher-hq.slack.com/)

</div>
Expand Down Expand Up @@ -42,7 +42,11 @@ https://github.com/switcherapi/switcher-api
<artifactId>switcher-client</artifactId>
<version>${switcher-client.version}</version>
</dependency>
```
```

### Compatibility with Jakarta EE 9
Use SDK v1.x for applications not using Jakarta EE 9.<br>
Use SDK v2.x for Jakarta EE 9 based applications.

## Client Context Properties - SwitcherContext

Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<groupId>com.github.switcherapi</groupId>
<artifactId>switcher-client</artifactId>
<packaging>jar</packaging>
<version>1.4.0</version>
<version>2.0.0-SNAPSHOT</version>

<name>Switcher Client</name>
<description>Switcher Client SDK for working with Switcher API</description>
Expand Down Expand Up @@ -46,33 +46,33 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>

<!-- rest/json libs -->
<jersey-client.version>2.39</jersey-client.version>
<jersey-hk2.version>2.39</jersey-hk2.version>
<jersey-media-json-jackson.version>2.39</jersey-media-json-jackson.version>
<jersey-client.version>3.1.1</jersey-client.version>
<jersey-hk2.version>3.1.1</jersey-hk2.version>
<jersey-media-json-jackson.version>3.1.1</jersey-media-json-jackson.version>
<gson.version>2.10.1</gson.version>

<!-- utils -->
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-net.version>3.9.0</commons-net.version>
<log4j.version>2.19.0</log4j.version>
<log4j.version>2.20.0</log4j.version>

<!-- test -->
<okhttp.version>5.0.0-alpha.11</okhttp.version>
<junit.version>5.9.2</junit.version>
<junit-pioneer.version>1.9.1</junit-pioneer.version>

<!-- Plugins -->
<maven-compiler.version>3.10.1</maven-compiler.version>
<maven-compiler.version>3.11.0</maven-compiler.version>
<maven-source.version>3.2.0</maven-source.version>
<maven-surefire.version>3.0.0-M5</maven-surefire.version>
<maven-gpg.version>3.0.1</maven-gpg.version>
<sonar.version>3.9.1.2184</sonar.version>
<jacoco.version>0.8.8</jacoco.version>
<jacoco.version>0.8.9</jacoco.version>

<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
import java.util.Optional;
import java.util.Set;

import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;

import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down