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

Release/1.19.1 #136

Closed
wants to merge 35 commits into from
Closed

Release/1.19.1 #136

Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ce3f320
Update README.md
dkovacevic Jul 3, 2023
ecf81ed
Sender: images. Preview and AssetData
dkovacevic Jul 4, 2023
579f237
Sender: images. Preview and AssetData
dkovacevic Jul 5, 2023
7305091
xenon 1.5.2
dkovacevic Jul 5, 2023
090521e
minor changes
dkovacevic Jul 11, 2023
7a16127
lithium 3.5.2
dkovacevic Jul 24, 2023
9134daf
updated dependancies
dkovacevic Jul 24, 2023
7e9866e
trace more
dkovacevic Aug 3, 2023
a452dc4
trace more
dkovacevic Aug 3, 2023
d5ced27
Lithium 3.5.4
dkovacevic Sep 14, 2023
4ee39cd
Lithium 3.6.0
dkovacevic Oct 18, 2023
122e6d2
fix: migrate jakarta deps to comply with lithium 3.6.x (pt1) (#119)
yamilmedina Dec 5, 2023
3d2222a
fix: frontend config with new assetbundle aproach dropwizard4 (#129)
yamilmedina Dec 5, 2023
bf78793
check for empty payload.url (#130)
dkovacevic Dec 6, 2023
7ba2111
more logging
dkovacevic Dec 6, 2023
5380e09
Skip the enable service
dkovacevic Dec 6, 2023
a344e10
More logging
dkovacevic Dec 7, 2023
c8ca23b
Dont send Enable=false in UpdateService
dkovacevic Dec 7, 2023
02d17f0
Use single WebTarge in ProviderClient
dkovacevic Dec 7, 2023
6e44681
.accept(MediaType.TEXT_PLAIN)
dkovacevic Dec 7, 2023
11b7a63
.accept(MediaType.TEXT_PLAIN)
dkovacevic Dec 7, 2023
d0eb7ab
.request(MediaType.TEXT_PLAIN)
dkovacevic Dec 7, 2023
fc4dc87
.request(MediaType.TEXT_PLAIN)
dkovacevic Dec 7, 2023
40569a5
fixed the build
dkovacevic Dec 7, 2023
2821768
Bump word-wrap from 1.2.3 to 1.2.5 in /frontend (#123)
dependabot[bot] Dec 8, 2023
162020d
Bump @adobe/css-tools from 4.2.0 to 4.3.2 in /frontend (#122)
dependabot[bot] Dec 8, 2023
7de821c
Bump browserify-sign from 4.2.1 to 4.2.2 in /frontend (#125)
dependabot[bot] Dec 8, 2023
a2d01e2
Bump semver from 5.7.1 to 5.7.2 in /frontend (#124)
dependabot[bot] Dec 8, 2023
c925965
Bump @babel/traverse from 7.21.2 to 7.23.5 in /frontend (#126)
dependabot[bot] Dec 8, 2023
a98343a
Bump tough-cookie from 4.1.2 to 4.1.3 in /frontend (#128)
dependabot[bot] Dec 8, 2023
8b3419e
chore: cancel concurrent builds to avoid multiple runs and only run l…
yamilmedina Dec 8, 2023
b623ef5
chore: configure new swagger version for roman in dropwizard4 (WPB-58…
yamilmedina Dec 8, 2023
037fc52
fix: request min known flyway version for compatibility with pg prod …
yamilmedina Dec 11, 2023
01b054b
version bump 1.19.1
dkovacevic Dec 11, 2023
a7f7064
merge
dkovacevic Dec 11, 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
142 changes: 54 additions & 88 deletions backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.wire.bots</groupId>
<artifactId>roman</artifactId>
<version>1.19.0</version>
<version>1.19.1</version>

<name>Roman</name>
<description>Wire Bot API Proxy</description>
Expand All @@ -21,72 +21,19 @@
</licenses>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.test.skip>true</maven.test.skip>

<lithium.version>3.6.0</lithium.version>
<dropwizard.version>4.0.0</dropwizard.version>
<lithium.version>3.5.1</lithium.version>
<dropwizard.version>2.1.4</dropwizard.version>
<jwt.version>0.11.5</jwt.version>
<junit5.version>5.8.2</junit5.version>
<jetty.version>11.0.18</jetty.version>
<jakarta.version>2.1.1</jakarta.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-bom</artifactId>
<version>${dropwizard.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-auth</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-assets</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-servlets</artifactId>
</dependency>
<dependency>
<groupId>com.smoketurner</groupId>
<artifactId>dropwizard-swagger</artifactId>
<version>4.0.0-1</version>
</dependency>
<!-- MIGRATION TO JAKARTA JETTY 11 -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.version}</version>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>${jakarta.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jakarta-server</artifactId>
<version>${jetty.version}</version>
</dependency>

<dependency>
<groupId>com.wire</groupId>
<artifactId>lithium</artifactId>
Expand All @@ -100,12 +47,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.1</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version>
<version>2.13.4.2</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
Expand All @@ -125,46 +67,70 @@
<scope>runtime</scope>
</dependency>

<!-- test dependencies-->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.2.0</version>
<scope>test</scope>
<groupId>io.dropwizard-bundles</groupId>
<artifactId>dropwizard-configurable-assets-bundle</artifactId>
<version>1.3.5</version>
<exclusions>
<exclusion>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-servlets</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<scope>test</scope>
<groupId>io.dropwizard-bundles</groupId>
<artifactId>dropwizard-redirect-bundle</artifactId>
<version>1.3.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
<version>9.4.49.v20220914</version>
</dependency>
<dependency>
<groupId>com.liveperson</groupId>
<artifactId>dropwizard-websockets</artifactId>
<version>1.3.14</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit5.version}</version>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-servlets</artifactId>
<version>${dropwizard.version}</version>
</dependency>

<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<version>${dropwizard.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit5.version}</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.224</version>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.23.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -175,8 +141,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>17</source>
<target>17</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
Expand Down
Loading