Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/json b3 #1742

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Feature/json b3 #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
804adbc
Trigger GA
appiepollo14 Oct 29, 2023
4121563
build GA java 17
appiepollo14 Oct 29, 2023
358a90c
Upgrade to jsonb-3
appiepollo14 Oct 28, 2023
70bd732
Upgrade to gmaven!
appiepollo14 Nov 6, 2023
484c492
Merge branch 'feature/gmaven' into feature/json-b3
appiepollo14 Nov 6, 2023
b798eab
Upgrade to gmavenplus!
appiepollo14 Nov 6, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
name: Java CI

on: [push]
on: [ push ]

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
java: [8]
java: [11]
fail-fast: false
max-parallel: 4
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion dist/dist-json-path/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/dist-json-schema-validator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/dist-kotlin-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/dist-rest-assured/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/dist-scala-support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/dist-spring-mock-mvc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/dist-spring-web-test-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/dist-xml-path/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dist</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>rest-assured-parent</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 3 additions & 3 deletions examples/kotlin-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -78,13 +78,13 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>kotlin-extensions</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>rest-assured-parent</artifactId>
<groupId>io.rest-assured</groupId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.rest-assured.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/rest-assured-itest-java-osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
16 changes: 9 additions & 7 deletions examples/rest-assured-itest-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<properties>
<maven.compiler.release>11</maven.compiler.release>
</properties>

<artifactId>rest-assured-itest-java</artifactId>
<name>REST Assured Java integration tests</name>
<description>REST Assured Java integration tests. Here you'll find various examples of how to use rest-assured.
Expand All @@ -34,8 +38,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand All @@ -50,23 +52,23 @@
<dependency>
<groupId>io.rest-assured.examples</groupId>
<artifactId>scalatra-webapp</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>io.rest-assured.examples</groupId>
<artifactId>scalatra-example</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>json-schema-validator</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
6 changes: 3 additions & 3 deletions examples/scala-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -76,13 +76,13 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>scala-support</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
11 changes: 5 additions & 6 deletions examples/scala-mock-mvc-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -30,6 +30,7 @@

<properties>
<scala.version>2.13.0</scala.version>
<maven.compiler.release>11</maven.compiler.release>
</properties>

<build>
Expand All @@ -40,8 +41,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down Expand Up @@ -77,13 +76,13 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>spring-mock-mvc</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>scala-support</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -105,7 +104,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
<version>2.0.5</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion examples/scalatra-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
10 changes: 5 additions & 5 deletions examples/scalatra-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -38,12 +38,12 @@
<dependency>
<groupId>io.rest-assured.examples</groupId>
<artifactId>scalatra-example</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
32 changes: 7 additions & 25 deletions examples/spring-mvc-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>io.rest-assured.examples</groupId>
<artifactId>example-parent</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -40,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<version>3.4.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
Expand All @@ -54,7 +55,7 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>spring-mock-mvc</artifactId>
<version>5.3.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -108,7 +109,6 @@
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -147,12 +147,12 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
<version>1.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.15.0</version>
</dependency>

<dependency>
Expand All @@ -162,22 +162,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>dev</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<stopKey>foo</stopKey>
<stopPort>8079</stopPort>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion ...ples/spring-mvc-webapp/src/main/java/io/restassured/examples/springmvc/config/WebApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ protected Class<?>[] getServletConfigClasses() {
protected String[] getServletMappings() {
return new String[]{"/"};
}
}
}
Loading