Skip to content

Commit

Permalink
Migrate to JRuby group ID and get things passing
Browse files Browse the repository at this point in the history 
This makes the following changes:

* de.saumya.mojo maven group ID changes to org.jruby.maven in all
  published artifacts
* mavengem is used for all gem retrieval instead of the defunct
  TorqueBox proxy server
* mavengem and related dependencies are now sourced from the
  org.jruby.maven 2.0.0 versions
* minor additional changes to get tests passing with the new
  artifacts

This passes all unit and integration tests and deploys
successfully as org.jruby.maven:jruby-maven-plugins:3.0.0-SNAPSHOT
and should now be immune to the v1/dependencies rubygems.org API
shutdown (jruby/mavengem#8).
  • Loading branch information
@headius
headius committed Aug 3, 2023
1 parent b328576 commit f0cb867
Show file tree
Hide file tree
Showing 121 changed files with 565 additions and 313 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ there is maven repository with torquebox.org which delivers gem (only ruby and j

<repositories>
<repository>
<id>rubygems-release</id>
<id>mavengems</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
Expand All @@ -34,7 +34,7 @@ just add the gem-maven-plugin in your pom and execute the 'initialize'. that wil
<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 All @@ -56,7 +56,7 @@ example: execute bin/compass from the compass gem
add the following to you pom

<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.parent.version@</version>
<executions>
Expand All @@ -75,7 +75,7 @@ this will execute **compass** from the compass gem during the *compile* phase. y


<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.parent.version@</version>
<executions>
Expand Down
4 changes: 2 additions & 2 deletions gem-extension/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>parent-mojo</artifactId>
<groupId>de.saumya.mojo</groupId>
<version>2.0.2-SNAPSHOT</version>
<groupId>org.jruby.maven</groupId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../parent-mojo/pom.xml</relativePath>
</parent>
<artifactId>gem-extension</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions gem-extension/src/main/resources/META-INF/plexus/components.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<configuration>
<phases>
<initialize>
de.saumya.mojo:gem-maven-plugin:initialize
org.jruby.maven:gem-maven-plugin:initialize
</initialize>
<process-resources>
org.apache.maven.plugins:maven-resources-plugin:resources
Expand All @@ -18,13 +18,13 @@
org.apache.maven.plugins:maven-compiler-plugin:compile
</compile>
<package>
de.saumya.mojo:gem-maven-plugin:package
org.jruby.maven:gem-maven-plugin:package
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:install
</install>
<deploy>
de.saumya.mojo:gem-maven-plugin:push
org.jruby.maven:gem-maven-plugin:push
</deploy>
</phases>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions gem-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>parent-mojo</artifactId>
<groupId>de.saumya.mojo</groupId>
<version>2.0.2-SNAPSHOT</version>
<groupId>org.jruby.maven</groupId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../parent-mojo/pom.xml</relativePath>
</parent>
<artifactId>gem-maven-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/exec-args-with-spaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>dummy</artifactId>
<version>testing</version>

<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
Expand Down
4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/exec-embed/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>dummy</artifactId>
<version>testing</version>

<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
15 changes: 11 additions & 4 deletions gem-maven-plugin/src/it/exec-file/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>dummy</artifactId>
<version>testing</version>
<repositories>
<repository>
<id>rubygems-release</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
</repositories>

Expand All @@ -27,9 +27,16 @@
</properties>

<build>
<extensions>
<extension>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>2.0.0-SNAPSHOT</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
Expand Down
13 changes: 10 additions & 3 deletions gem-maven-plugin/src/it/execute-compass-with-gems-from-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<version>0.0.0</version>
<pluginRepositories>
<pluginRepository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</pluginRepository>
</pluginRepositories>
<properties>
Expand All @@ -16,9 +16,16 @@
<gem.path>${root.dir}/target/rubygems</gem.path>
</properties>
<build>
<extensions>
<extension>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>2.0.0-SNAPSHOT</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.parent.version@</version>
<executions>
Expand Down
15 changes: 11 additions & 4 deletions gem-maven-plugin/src/it/gem-sets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,25 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>dummy</artifactId>
<version>testing</version>

<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
</repositories>

<build>
<extensions>
<extension>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>2.0.0-SNAPSHOT</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
Expand All @@ -26,7 +33,7 @@
</executions>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion gem-maven-plugin/src/it/gemfile-to-pom-forced/invoker.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
invoker.mavenOpts = -client

4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/gemfile-to-pom-forced/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>jruby-version</artifactId>
<version>testing</version>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion gem-maven-plugin/src/it/gemfile-to-pom/invoker.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
invoker.mavenOpts = -client

4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/gemfile-to-pom/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>jruby-version</artifactId>
<version>testing</version>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/gemify-complex/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>dummy</artifactId>
<version>testing</version>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion gem-maven-plugin/src/it/gemify-pom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion gem-maven-plugin/src/it/gemify-simple/goals.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de.saumya.mojo:gem-maven-plugin:gemify
org.jruby.maven:gem-maven-plugin:gemify
4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/gemify-simple/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>dummy</artifactId>
<version>testing</version>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
13 changes: 10 additions & 3 deletions gem-maven-plugin/src/it/gems-with-compile-test-and-provided-scope/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<version>0.0.0</version>
<repositories>
<repository>
<id>rubygems-release</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
</repositories>

Expand Down Expand Up @@ -43,9 +43,16 @@
</properties>

<build>
<extensions>
<extension>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>2.0.0-SNAPSHOT</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion gem-maven-plugin/src/it/gemspec-to-pom-forced/invoker.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
invoker.mavenOpts = -client

4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/gemspec-to-pom-forced/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>jruby-version</artifactId>
<version>testing</version>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion gem-maven-plugin/src/it/gemspec-to-pom/invoker.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
invoker.mavenOpts = -client

4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/gemspec-to-pom/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>jruby-version</artifactId>
<version>testing</version>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Expand Down
Loading

0 comments on commit f0cb867

Please sign in to comment.