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

Fixes #22800: Update webapp dependencies #4805

Merged
merged 1 commit into from
May 25, 2023
Merged

Fixes #22800: Update webapp dependencies #4805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 26 additions & 35 deletions webapp/sources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,40 +407,41 @@ limitations under the License.
parser option - see https://github.com/scala/scala-xml/releases/tag/v2.1.0 -->
<scala-xml-version>1.3.0</scala-xml-version>
<lift-version>3.5.0</lift-version>
<slf4j-version>1.7.36</slf4j-version>
<logback-version>1.2.11</logback-version>
<jodatime-version>2.12.1</jodatime-version>
<jodaconvert-version>2.2.2</jodaconvert-version>
<commons-io-version>2.11.0</commons-io-version>
<slf4j-version>2.0.7</slf4j-version>
<logback-version>1.4.7</logback-version>
<jodatime-version>2.12.5</jodatime-version>
<jodaconvert-version>2.2.3</jodaconvert-version>
<commons-io-version>2.12.0</commons-io-version>
<commons-lang-version>3.12.0</commons-lang-version>
<commons-codec-version>1.15</commons-codec-version>
<commons-fileupload>1.5</commons-fileupload>
<spring-version>5.3.27</spring-version>
<spring-security-version>5.7.8</spring-security-version>
<jgit-version>6.3.0.202209071007-r</jgit-version>
<jgit-version>6.5.0.202303070854-r</jgit-version>
<cglib-version>3.3.0</cglib-version>
<asm-version>9.4</asm-version>
<asm-version>9.5</asm-version>
<!-- Level of Java compatibility, here 1.8+ -->
<bouncycastle-compat>jdk18on</bouncycastle-compat>
<bouncycastle-version>1.72</bouncycastle-version>
<better-files-version>3.9.1</better-files-version>
<bouncycastle-version>1.73</bouncycastle-version>
<better-files-version>3.9.2</better-files-version>
<sourcecode-version>0.3.0</sourcecode-version>
<quicklens-version>1.9.0</quicklens-version>
<quicklens-version>1.9.4</quicklens-version>
<hikaricp-version>5.0.1</hikaricp-version>
<nuprocess-version>2.0.5</nuprocess-version>
<nuprocess-version>2.0.6</nuprocess-version>
<postgresql-version>42.6.0</postgresql-version>
<json-path-version>2.7.0</json-path-version>
<json-path-version>2.8.0</json-path-version>
<json-smart-version>2.4.10</json-smart-version>
<scalaj-version>2.4.2</scalaj-version>
<unboundid-version>6.0.6</unboundid-version>
<fastparse-version>2.3.3</fastparse-version>
<unboundid-version>6.0.8</unboundid-version>
<fastparse-version>3.0.1</fastparse-version>
<config-version>1.4.2</config-version>
<caffeine-version>3.1.1</caffeine-version>
<jgrapht-version>1.5.1</jgrapht-version>
<caffeine-version>3.1.6</caffeine-version>
<jgrapht-version>1.5.2</jgrapht-version>
<reflections-version>0.10.2</reflections-version>
<graalvm-version>22.3.0</graalvm-version>
<chimney-version>0.6.2</chimney-version>
<graalvm-version>22.3.2</graalvm-version>
<chimney-version>0.7.4</chimney-version>
<cron4s-version>0.6.1</cron4s-version>
<ipaddress-version>5.3.4</ipaddress-version>
<ipaddress-version>5.4.0</ipaddress-version>
<snakeyaml-version>1.33</snakeyaml-version>

<zio-http-version>2.0.0-RC11</zio-http-version> <!-- used in datasources -->
Expand All @@ -450,16 +451,16 @@ limitations under the License.
We declare cats in "test" here, because it is not directly needed
in any project before rudder.
-->
<specs2-version>4.18.0</specs2-version>
<specs2-version>4.20.0</specs2-version>
<junit-version>4.13.2</junit-version>
<cats-version>2.8.0</cats-version>
<cats-version>2.9.0</cats-version>
<doobie-version>1.0.0-RC2</doobie-version>
<fs2-version>3.3.0</fs2-version>
<shapeless-version>2.3.10</shapeless-version>
<cats-effect-version>3.3.14</cats-effect-version>
<dev-zio-version>2.0.3</dev-zio-version>
<zio-cats-version>3.3.0</zio-cats-version> <!-- gives fs2 3.1.6, but doobie 1.0.0-RC1 is in 3.0.3 -->
<zio-json-version>0.3.0</zio-json-version>
<cats-effect-version>3.5.0</cats-effect-version>
<dev-zio-version>2.0.13</dev-zio-version>
<zio-cats-version>23.0.0.5</zio-cats-version> <!-- gives fs2 3.1.6, but doobie 1.0.0-RC1 is in 3.0.3 -->
<zio-json-version>0.5.0</zio-json-version>

<!--
Hack to make scalac jvm parameters like RAM configurable.
Expand Down Expand Up @@ -525,21 +526,11 @@ limitations under the License.
<artifactId>cats-core_${scala-binary-version}</artifactId>
<version>${cats-version}</version>
</dependency>
<dependency>
<groupId>co.fs2</groupId>
<artifactId>fs2-core_${scala-binary-version}</artifactId>
<version>${fs2-version}</version>
</dependency>
<dependency>
<groupId>org.tpolecat</groupId>
<artifactId>doobie-core_${scala-binary-version}</artifactId>
<version>${doobie-version}</version>
</dependency>
<dependency>
<groupId>org.typelevel</groupId>
<artifactId>cats-effect_${scala-binary-version}</artifactId>
<version>${cats-effect-version}</version>
</dependency>
<dependency>
<groupId>com.chuusai</groupId>
<artifactId>shapeless_${scala-binary-version}</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions webapp/sources/rudder/rudder-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ along with Rudder. If not, see <http://www.gnu.org/licenses/>.
<artifactId>json-path</artifactId>
<version>${json-path-version}</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>${json-smart-version}</version>
</dependency>

<!--
@Nonnull annotation, avoid "Class javax.annotation.Nonnull not found
Expand Down
5 changes: 5 additions & 0 deletions webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/GitGC.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ class GitGC(
}

def isCancelled = false

// Added in recent jgit version (at least 6.5.0.202303070854-r)
// It can be used to display the duration of logs but we don't it just keep it
// If we really want to do it, then we would add a private var and use it in other methods
def showDuration(enabled: Boolean): Unit = ()
}

// must not fail, will be in a cron
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ object PropertyParser {
case Parsed.Failure(label, i, extra) =>
Left(
Unexpected(
s"""Error when parsing value (without ''): '${value}'. Error message is: ${extra.trace().aggregateMsg}""".stripMargin
s"""Error when parsing value (without ''): '${value}'. Error message is: ${extra.trace().msg}""".stripMargin
)
)
}
Expand Down