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

Mild updates, align to latest Maven #322

Merged
merged 4 commits into from
Sep 7, 2024
Merged

Mild updates, align to latest Maven #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9102980
Mild updates, align to latest Maven
cstamas Aug 12, 2024
f954c61
Merge remote-tracking branch 'origin/master' into mild-updates
cstamas Sep 7, 2024
d9a69af
Use latest maven
cstamas Sep 7, 2024
29ca34f
More mild ones
cstamas Sep 7, 2024
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
8 changes: 7 additions & 1 deletion polyglot-kotlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@
<artifactId>kotlin-script-runtime</artifactId>
<version>${kotlin.version}</version>
</dependency>
<!-- Maven Core dropped commons-lang3 dependency; also, "best practice" is to declare what you code against -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.12.0</version>
</dependency>

<!-- Test -->
<dependency>
Expand Down Expand Up @@ -86,7 +92,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.version>2.0.0</kotlin.version>
<kotlin.version>2.0.20</kotlin.version>
<commons-lang3.version>3.8.1</commons-lang3.version>
<skipTests>false</skipTests>
<invoker.skip>${skipTests}</invoker.skip>
Expand Down
2 changes: 1 addition & 1 deletion polyglot-kotlin/src/main/kotlin/org/sonatype/maven/polyglot/kotlin/dsl/DSLSupport.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.sonatype.maven.polyglot.kotlin.dsl

import org.apache.commons.lang3.StringEscapeUtils.escapeJava
import org.apache.commons.text.StringEscapeUtils.escapeJava

internal var propertiesFactory: () -> java.util.Properties = { java.util.Properties() }

Expand Down
2 changes: 1 addition & 1 deletion polyglot-ruby/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
</dependencies>

<properties>
<jruby.plugins.version>3.0.2</jruby.plugins.version>
<jruby.plugins.version>3.0.3</jruby.plugins.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion polyglot-scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.9.1</version>
<version>4.9.2</version>
<executions>
<execution>
<goals>
Expand Down
1 change: 1 addition & 0 deletions polyglot-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>2.4.0</version>
<configuration>
<models>
<model>src/main/mdo/maven.mdo</model>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</licenses>

<properties>
<mavenVersion>3.9.5</mavenVersion>
<sisuInjectVersion>0.9.0.M2</sisuInjectVersion>
<mavenVersion>3.9.9</mavenVersion>
<sisuInjectVersion>0.9.0.M3</sisuInjectVersion>
<plexusUtilsVersion>3.5.1</plexusUtilsVersion>
<!-- last that works with Java 8: FIXED to this version as long we insist on Java 8 building this project -->
<!-- BUT: signArtifacts goal with this version is busted, so we need to use other means to sign -->
Expand Down Expand Up @@ -223,7 +223,7 @@
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.6.1</version>
<version>3.8.0</version>
<configuration>
<scope>test</scope>
<postBuildHookScript>verify</postBuildHookScript>
Expand Down Expand Up @@ -276,7 +276,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.4</version>
<version>3.2.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down