Skip to content

Commit f0cb867

Browse files
headiusheadius
committed
Migrate to JRuby group ID and get things passing
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).
1 parent b328576 commit f0cb867

File tree

121 files changed

+565
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+565
-313
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ there is maven repository with torquebox.org which delivers gem (only ruby and j
1010

1111
<repositories>
1212
<repository>
13-
<id>rubygems-release</id>
13+
<id>mavengems</id>
1414
<url>http://rubygems-proxy.torquebox.org/releases</url>
1515
</repository>
1616
</repositories>
@@ -34,7 +34,7 @@ just add the gem-maven-plugin in your pom and execute the 'initialize'. that wil
3434
<build>
3535
<plugins>
3636
<plugin>
37-
<groupId>de.saumya.mojo</groupId>
37+
<groupId>org.jruby.maven</groupId>
3838
<artifactId>gem-maven-plugin</artifactId>
3939
<version>${jruby.plugins.version}</version>
4040
<executions>
@@ -56,7 +56,7 @@ example: execute bin/compass from the compass gem
5656
add the following to you pom
5757

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

7676

7777
<plugin>
78-
<groupId>de.saumya.mojo</groupId>
78+
<groupId>org.jruby.maven</groupId>
7979
<artifactId>gem-maven-plugin</artifactId>
8080
<version>@project.parent.version@</version>
8181
<executions>

‎gem-extension/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<artifactId>parent-mojo</artifactId>
6-
<groupId>de.saumya.mojo</groupId>
7-
<version>2.0.2-SNAPSHOT</version>
6+
<groupId>org.jruby.maven</groupId>
7+
<version>3.0.0-SNAPSHOT</version>
88
<relativePath>../parent-mojo/pom.xml</relativePath>
99
</parent>
1010
<artifactId>gem-extension</artifactId>

‎gem-extension/src/main/resources/META-INF/plexus/components.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<configuration>
1010
<phases>
1111
<initialize>
12-
de.saumya.mojo:gem-maven-plugin:initialize
12+
org.jruby.maven:gem-maven-plugin:initialize
1313
</initialize>
1414
<process-resources>
1515
org.apache.maven.plugins:maven-resources-plugin:resources
@@ -18,13 +18,13 @@
1818
org.apache.maven.plugins:maven-compiler-plugin:compile
1919
</compile>
2020
<package>
21-
de.saumya.mojo:gem-maven-plugin:package
21+
org.jruby.maven:gem-maven-plugin:package
2222
</package>
2323
<install>
2424
org.apache.maven.plugins:maven-install-plugin:install
2525
</install>
2626
<deploy>
27-
de.saumya.mojo:gem-maven-plugin:push
27+
org.jruby.maven:gem-maven-plugin:push
2828
</deploy>
2929
</phases>
3030
</configuration>

‎gem-maven-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<artifactId>parent-mojo</artifactId>
6-
<groupId>de.saumya.mojo</groupId>
7-
<version>2.0.2-SNAPSHOT</version>
6+
<groupId>org.jruby.maven</groupId>
7+
<version>3.0.0-SNAPSHOT</version>
88
<relativePath>../parent-mojo/pom.xml</relativePath>
99
</parent>
1010
<artifactId>gem-maven-plugin</artifactId>

‎gem-maven-plugin/src/it/exec-args-with-spaces/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
44
http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>de.saumya.mojo</groupId>
6+
<groupId>org.jruby.maven</groupId>
77
<artifactId>dummy</artifactId>
88
<version>testing</version>
99

1010
<build>
1111
<plugins>
1212
<plugin>
13-
<groupId>de.saumya.mojo</groupId>
13+
<groupId>org.jruby.maven</groupId>
1414
<artifactId>gem-maven-plugin</artifactId>
1515
<version>@project.version@</version>
1616
<configuration>

‎gem-maven-plugin/src/it/exec-embed/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
44
http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>de.saumya.mojo</groupId>
6+
<groupId>org.jruby.maven</groupId>
77
<artifactId>dummy</artifactId>
88
<version>testing</version>
99

1010
<build>
1111
<plugins>
1212
<plugin>
13-
<groupId>de.saumya.mojo</groupId>
13+
<groupId>org.jruby.maven</groupId>
1414
<artifactId>gem-maven-plugin</artifactId>
1515
<version>@project.version@</version>
1616
</plugin>

‎gem-maven-plugin/src/it/exec-file/pom.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>de.saumya.mojo</groupId>
4+
<groupId>org.jruby.maven</groupId>
55
<artifactId>dummy</artifactId>
66
<version>testing</version>
77
<repositories>
88
<repository>
9-
<id>rubygems-release</id>
10-
<url>http://rubygems-proxy.torquebox.org/releases</url>
9+
<id>mavengems</id>
10+
<url>mavengem:https://rubygems.org</url>
1111
</repository>
1212
</repositories>
1313

@@ -27,9 +27,16 @@
2727
</properties>
2828

2929
<build>
30+
<extensions>
31+
<extension>
32+
<groupId>org.jruby.maven</groupId>
33+
<artifactId>mavengem-wagon</artifactId>
34+
<version>2.0.0-SNAPSHOT</version>
35+
</extension>
36+
</extensions>
3037
<plugins>
3138
<plugin>
32-
<groupId>de.saumya.mojo</groupId>
39+
<groupId>org.jruby.maven</groupId>
3340
<artifactId>gem-maven-plugin</artifactId>
3441
<version>@project.version@</version>
3542
<configuration>

‎gem-maven-plugin/src/it/execute-compass-with-gems-from-plugin/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<version>0.0.0</version>
77
<pluginRepositories>
88
<pluginRepository>
9-
<id>rubygems-releases</id>
10-
<url>http://rubygems-proxy.torquebox.org/releases</url>
9+
<id>mavengems</id>
10+
<url>mavengem:https://rubygems.org</url>
1111
</pluginRepository>
1212
</pluginRepositories>
1313
<properties>
@@ -16,9 +16,16 @@
1616
<gem.path>${root.dir}/target/rubygems</gem.path>
1717
</properties>
1818
<build>
19+
<extensions>
20+
<extension>
21+
<groupId>org.jruby.maven</groupId>
22+
<artifactId>mavengem-wagon</artifactId>
23+
<version>2.0.0-SNAPSHOT</version>
24+
</extension>
25+
</extensions>
1926
<plugins>
2027
<plugin>
21-
<groupId>de.saumya.mojo</groupId>
28+
<groupId>org.jruby.maven</groupId>
2229
<artifactId>gem-maven-plugin</artifactId>
2330
<version>@project.parent.version@</version>
2431
<executions>

‎gem-maven-plugin/src/it/gem-sets/pom.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
44
http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>de.saumya.mojo</groupId>
6+
<groupId>org.jruby.maven</groupId>
77
<artifactId>dummy</artifactId>
88
<version>testing</version>
99

1010
<repositories>
1111
<repository>
12-
<id>rubygems-releases</id>
13-
<url>http://rubygems-proxy.torquebox.org/releases</url>
12+
<id>mavengems</id>
13+
<url>mavengem:https://rubygems.org</url>
1414
</repository>
1515
</repositories>
1616

1717
<build>
18+
<extensions>
19+
<extension>
20+
<groupId>org.jruby.maven</groupId>
21+
<artifactId>mavengem-wagon</artifactId>
22+
<version>2.0.0-SNAPSHOT</version>
23+
</extension>
24+
</extensions>
1825
<plugins>
1926
<plugin>
2027
<artifactId>maven-clean-plugin</artifactId>
@@ -26,7 +33,7 @@
2633
</executions>
2734
</plugin>
2835
<plugin>
29-
<groupId>de.saumya.mojo</groupId>
36+
<groupId>org.jruby.maven</groupId>
3037
<artifactId>gem-maven-plugin</artifactId>
3138
<version>@project.version@</version>
3239
<executions>

‎gem-maven-plugin/src/it/gemfile-to-pom-forced/invoker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
1+
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
22
invoker.mavenOpts = -client
33

‎gem-maven-plugin/src/it/gemfile-to-pom-forced/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>de.saumya.mojo</groupId>
4+
<groupId>org.jruby.maven</groupId>
55
<artifactId>jruby-version</artifactId>
66
<version>testing</version>
77
<build>
88
<plugins>
99
<plugin>
10-
<groupId>de.saumya.mojo</groupId>
10+
<groupId>org.jruby.maven</groupId>
1111
<artifactId>gem-maven-plugin</artifactId>
1212
<version>@project.version@</version>
1313
</plugin>

‎gem-maven-plugin/src/it/gemfile-to-pom/invoker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
1+
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
22
invoker.mavenOpts = -client
33

‎gem-maven-plugin/src/it/gemfile-to-pom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>de.saumya.mojo</groupId>
4+
<groupId>org.jruby.maven</groupId>
55
<artifactId>jruby-version</artifactId>
66
<version>testing</version>
77
<build>
88
<plugins>
99
<plugin>
10-
<groupId>de.saumya.mojo</groupId>
10+
<groupId>org.jruby.maven</groupId>
1111
<artifactId>gem-maven-plugin</artifactId>
1212
<version>@project.version@</version>
1313
</plugin>

‎gem-maven-plugin/src/it/gemify-complex/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>de.saumya.mojo</groupId>
4+
<groupId>org.jruby.maven</groupId>
55
<artifactId>dummy</artifactId>
66
<version>testing</version>
77
<build>
88
<plugins>
99
<plugin>
10-
<groupId>de.saumya.mojo</groupId>
10+
<groupId>org.jruby.maven</groupId>
1111
<artifactId>gem-maven-plugin</artifactId>
1212
<version>@project.version@</version>
1313
</plugin>

‎gem-maven-plugin/src/it/gemify-pom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<build>
1919
<plugins>
2020
<plugin>
21-
<groupId>de.saumya.mojo</groupId>
21+
<groupId>org.jruby.maven</groupId>
2222
<artifactId>gem-maven-plugin</artifactId>
2323
<version>@project.version@</version>
2424
</plugin>

‎gem-maven-plugin/src/it/gemify-simple/goals.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
de.saumya.mojo:gem-maven-plugin:gemify
1+
org.jruby.maven:gem-maven-plugin:gemify

‎gem-maven-plugin/src/it/gemify-simple/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>de.saumya.mojo</groupId>
4+
<groupId>org.jruby.maven</groupId>
55
<artifactId>dummy</artifactId>
66
<version>testing</version>
77
<build>
88
<plugins>
99
<plugin>
10-
<groupId>de.saumya.mojo</groupId>
10+
<groupId>org.jruby.maven</groupId>
1111
<artifactId>gem-maven-plugin</artifactId>
1212
<version>@project.version@</version>
1313
</plugin>

‎gem-maven-plugin/src/it/gems-with-compile-test-and-provided-scope/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<version>0.0.0</version>
77
<repositories>
88
<repository>
9-
<id>rubygems-release</id>
10-
<url>http://rubygems-proxy.torquebox.org/releases</url>
9+
<id>mavengems</id>
10+
<url>mavengem:https://rubygems.org</url>
1111
</repository>
1212
</repositories>
1313

@@ -43,9 +43,16 @@
4343
</properties>
4444

4545
<build>
46+
<extensions>
47+
<extension>
48+
<groupId>org.jruby.maven</groupId>
49+
<artifactId>mavengem-wagon</artifactId>
50+
<version>2.0.0-SNAPSHOT</version>
51+
</extension>
52+
</extensions>
4653
<plugins>
4754
<plugin>
48-
<groupId>de.saumya.mojo</groupId>
55+
<groupId>org.jruby.maven</groupId>
4956
<artifactId>gem-maven-plugin</artifactId>
5057
<version>@project.version@</version>
5158
<executions>

‎gem-maven-plugin/src/it/gemspec-to-pom-forced/invoker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
1+
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
22
invoker.mavenOpts = -client
33

‎gem-maven-plugin/src/it/gemspec-to-pom-forced/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>de.saumya.mojo</groupId>
4+
<groupId>org.jruby.maven</groupId>
55
<artifactId>jruby-version</artifactId>
66
<version>testing</version>
77
<build>
88
<plugins>
99
<plugin>
10-
<groupId>de.saumya.mojo</groupId>
10+
<groupId>org.jruby.maven</groupId>
1111
<artifactId>gem-maven-plugin</artifactId>
1212
<version>@project.version@</version>
1313
</plugin>

‎gem-maven-plugin/src/it/gemspec-to-pom/invoker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
invoker.goals = de.saumya.mojo:gem-maven-plugin:${project.version}:pom
1+
invoker.goals = org.jruby.maven:gem-maven-plugin:${project.version}:pom
22
invoker.mavenOpts = -client
33

‎gem-maven-plugin/src/it/gemspec-to-pom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>de.saumya.mojo</groupId>
4+
<groupId>org.jruby.maven</groupId>
55
<artifactId>jruby-version</artifactId>
66
<version>testing</version>
77
<build>
88
<plugins>
99
<plugin>
10-
<groupId>de.saumya.mojo</groupId>
10+
<groupId>org.jruby.maven</groupId>
1111
<artifactId>gem-maven-plugin</artifactId>
1212
<version>@project.version@</version>
1313
</plugin>

0 commit comments

Comments
 (0)