Skip to content

Commit

Permalink
Merge branch 'arch_22049/update_scala_dependencies_to_latest_version_pr'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins CI committed Nov 4, 2022
2 parents 9d5473d + 3728593 commit 1bceca3
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 47 deletions.
75 changes: 34 additions & 41 deletions webapp/sources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ limitations under the License.
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</extension>
</extensions>
<plugins>
<plugin>

<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>
<version>2.7</version>

<configuration>
<formats>
Expand Down Expand Up @@ -144,7 +144,7 @@ limitations under the License.
</executions>
<configuration>
<scalaCompatVersion>${scala-binary-version}</scalaCompatVersion>
<!-- <recompileMode>incremental</recompileMode>-->
<recompileMode>all</recompileMode>
<compilerPlugins>
<compilerPlugin>
<groupId>com.github.ghik</groupId>
Expand Down Expand Up @@ -180,6 +180,7 @@ limitations under the License.
-->
<arg>-Xlint:_,-nonlocal-return,-nullary-unit,-missing-interpolator,-byname-implicit</arg>
<arg>-Ywarn-dead-code</arg> <!-- Warn when dead code is identified. -->

<arg>-Ywarn-extra-implicit</arg> <!-- Warn when more than one implicit parameter section is defined. -->
<arg>-Ywarn-numeric-widen</arg> <!-- Warn when numerics are widened. -->
<arg>-Ywarn-unused:imports</arg> <!-- Warn if an import selector is not referenced. -->
Expand Down Expand Up @@ -214,7 +215,7 @@ limitations under the License.
<plugin>
<groupId>org.zeroturnaround</groupId>
<artifactId>jrebel-maven-plugin</artifactId>
<version>1.1.3</version>
<version>1.1.10</version>
<executions>
<execution>
<id>generate-rebel-xml</id>
Expand All @@ -224,14 +225,6 @@ limitations under the License.
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.4.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -267,7 +260,7 @@ limitations under the License.
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.25.0</version>
<version>2.27.2</version>
<configuration>
<scala>
<includes>
Expand Down Expand Up @@ -306,7 +299,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
Expand Down Expand Up @@ -390,16 +383,16 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Maven plugin version -->
<scala-maven-plugin-version>3.4.0</scala-maven-plugin-version>
<scala-maven-plugin-version>4.7.2</scala-maven-plugin-version>

<!-- Libraries version that MUST be used in all children project -->

<current-year>2022</current-year>
<rudder-major-version>7.3</rudder-major-version>
<rudder-version>7.3.0~alpha1-SNAPSHOT</rudder-version>

<scala-version>2.13.9</scala-version>
<silencer-lib-version>1.7.11</silencer-lib-version>
<scala-version>2.13.10</scala-version>
<silencer-lib-version>1.7.12</silencer-lib-version>
<scala-binary-version>2.13</scala-binary-version>
<!-- lift force us to remain with 1.3.0 because of
java.lang.NoSuchMethodError: 'scala.collection.mutable.Stack scala.xml.parsing.NoBindingFactoryAdapter.scopeStack()'net.liftweb.util.Html5Parser.$anonfun$parse$1(HtmlParser.scala:373)
Expand All @@ -410,39 +403,39 @@ limitations under the License.
<lift-version>3.5.0</lift-version>
<slf4j-version>1.7.36</slf4j-version>
<logback-version>1.2.11</logback-version>
<jodatime-version>2.10.14</jodatime-version>
<jodatime-version>2.12.1</jodatime-version>
<jodaconvert-version>2.2.2</jodaconvert-version>
<commons-io-version>2.11.0</commons-io-version>
<commons-lang-version>3.12.0</commons-lang-version>
<commons-codec-version>1.15</commons-codec-version>
<commons-fileupload>1.4</commons-fileupload>
<spring-version>5.3.20</spring-version>
<spring-security-version>5.6.9</spring-security-version>
<jgit-version>6.1.0.202203080745-r</jgit-version>
<spring-version>5.3.23</spring-version>
<spring-security-version>5.7.5</spring-security-version>
<jgit-version>6.3.0.202209071007-r</jgit-version>
<cglib-version>3.3.0</cglib-version>
<asm-version>9.3</asm-version>
<asm-version>9.4</asm-version>
<!-- Level of Java compatibility, here 1.8+ -->
<bouncycastle-compat>jdk18on</bouncycastle-compat>
<bouncycastle-version>1.71</bouncycastle-version>
<bouncycastle-version>1.72</bouncycastle-version>
<better-files-version>3.9.1</better-files-version>
<sourcecode-version>0.2.8</sourcecode-version>
<quicklens-version>1.8.8</quicklens-version>
<sourcecode-version>0.3.0</sourcecode-version>
<quicklens-version>1.9.0</quicklens-version>
<hikaricp-version>5.0.1</hikaricp-version>
<nuprocess-version>2.0.5</nuprocess-version>
<postgresql-version>42.3.5</postgresql-version>
<postgresql-version>42.5.0</postgresql-version>
<json-path-version>2.7.0</json-path-version>
<scalaj-version>2.4.2</scalaj-version>
<unboundid-version>6.0.5</unboundid-version>
<unboundid-version>6.0.6</unboundid-version>
<fastparse-version>2.3.3</fastparse-version>
<config-version>1.4.2</config-version>
<caffeine-version>3.1.0</caffeine-version>
<caffeine-version>3.1.1</caffeine-version>
<jgrapht-version>1.5.1</jgrapht-version>
<reflections-version>0.10.2</reflections-version>
<graalvm-version>22.1.0</graalvm-version>
<chimney-version>0.6.1</chimney-version>
<graalvm-version>22.3.0</graalvm-version>
<chimney-version>0.6.2</chimney-version>
<cron4s-version>0.6.1</cron4s-version>
<ipaddress-version>5.3.3</ipaddress-version>
<snakeyaml-version>1.30</snakeyaml-version>
<ipaddress-version>5.3.4</ipaddress-version>
<snakeyaml-version>1.33</snakeyaml-version>

<zio-http-version>2.0.0-RC11</zio-http-version> <!-- used in datasources -->

Expand All @@ -451,14 +444,14 @@ limitations under the License.
We declare cats in "test" here, because it is not directly needed
in any project before rudder.
-->
<specs2-version>4.15.0</specs2-version>
<specs2-version>4.18.0</specs2-version>
<junit-version>4.13.2</junit-version>
<cats-version>2.7.0</cats-version>
<cats-version>2.8.0</cats-version>
<doobie-version>1.0.0-RC2</doobie-version>
<fs2-version>3.2.4</fs2-version>
<shapeless-version>2.3.7</shapeless-version>
<cats-effect-version>3.3.4</cats-effect-version>
<dev-zio-version>2.0.2</dev-zio-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>

Expand All @@ -469,8 +462,8 @@ limitations under the License.
or in ~/.m2/settings.xml with profiles.
-->

<jvmArg-Xmx>1G</jvmArg-Xmx>
<jvmArg-Xss>32m</jvmArg-Xss>
<jvmArg-Xmx>2G</jvmArg-Xmx>
<jvmArg-Xss>64m</jvmArg-Xss>
<jvmArg-arg0/>
<jvmArg-arg1/>
<jvmArg-arg2/>
Expand Down Expand Up @@ -558,7 +551,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<artifactId>postgresql</artifactId>
<version>${postgresql-version}</version>
</dependency>
<dependency>
Expand Down
13 changes: 7 additions & 6 deletions .../test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,14 +515,15 @@ class TestNodeAndGlobalParameterLookup extends Specification {
)
}

"parse node properties 'default:string' with unterminate quote lead to understandable message" in {
"parse node properties 'default:string' with unterminated quote lead to understandable message" in {
val s = """some text and ${node.properties[datacenter]|default= "missing end quote} and some more text"""
PropertyParser.parse(s) must beLeft(
beEqualTo(
Unexpected(
"""Error when parsing value (without ''): 'some text and ${node.properties[datacenter]|default= "missing end quote} and some more text'. Error message is: Expected (string | emptyString | variable):1:54, found "\"missing e""""
)
val err: RudderError = {
Unexpected(
"""Error when parsing value (without ''): 'some text and ${node.properties[datacenter]|default= "missing end quote} and some more text'. Error message is: Expected (string | emptyString | variable):1:54, found "\"missing e""""
)
}
PropertyParser.parse(s) must beLeft(
beEqualTo(err)
)
}

Expand Down

0 comments on commit 1bceca3

Please sign in to comment.