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

Update JRuby and all JRuby/Maven plugins #263

Merged
merged 4 commits into from
Aug 25, 2023
Merged

Update JRuby and all JRuby/Maven plugins #263

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
b10aaad
Update JRuby and all JRuby/Maven plugins
headius Aug 3, 2023
408b6cc
Update jruby-maven-plugins to 3.0 and mavengem to 2.0
headius Aug 8, 2023
8673092
Use released maven-tools 1.2.0
headius Aug 9, 2023
d6d5a12
One last update to latest of everything
headius Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 20 additions & 7 deletions polyglot-ruby/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>9.2.19.0</version>
<version>9.4.3.0</version>
<type>pom</type>
</dependency>
<!-- Test -->
Expand All @@ -43,13 +43,26 @@
</dependencies>

<properties>
<mavengem-wagon.version>1.0.3</mavengem-wagon.version>
<mavengem-wagon.version>2.0.1</mavengem-wagon.version>
</properties>

<pluginRepositories>
<pluginRepository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>

<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>${mavengem-wagon.version}</version>
</extension>
Expand Down Expand Up @@ -87,7 +100,7 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>
gem-maven-plugin
</artifactId>
Expand Down Expand Up @@ -138,21 +151,21 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>maven-tools</artifactId>
<version>1.1.7</version>
<version>1.2.1</version>
<type>gem</type>
<scope>provided</scope>
</dependency>
</dependencies>

<properties>
<jruby.plugins.version>2.0.1</jruby.plugins.version>
<jruby.plugins.version>3.0.1</jruby.plugins.version>
</properties>

<build>

<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion polyglot-ruby/src/test/java/org/sonatype/maven/polyglot/ruby/AbstractInjectedTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ private String simplify( StringWriter xml, boolean debug )
// the one from this plugin
.replaceAll("[0-9]+(-SNAPSHOT)?", VERSION_PATTERN)
// fix absolute path for test_pom_from_jarfile
.replaceAll("..basedir./myfirst.jar", "uri:classloader://myfirst.jar")
.replaceAll("..basedir./myfirst.jar", "uri:classloader:/myfirst.jar")
// some of the configuration tags are empty - unify them
.replaceAll("></(arg|chmod)>", "/>");
if ( debug )
Expand Down
2 changes: 1 addition & 1 deletion polyglot-ruby/src/test/poms/jruby-test-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<defaultGoal>test</defaultGoal>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<inherited>false</inherited>
Expand Down