Skip to content

Commit 69e6907

Browse files
headiusheadius
authored
Merge pull request #126 from headius/move_to_jruby
Migrate to JRuby group ID and get things passing
2 parents b328576 + 9e1500c commit 69e6907

File tree

123 files changed

+1095
-345
lines changed

Some content is hidden

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

123 files changed

+1095
-345
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ jobs:
2222
uses: actions/checkout@v2
2323

2424
- name: Set up java
25-
uses: actions/setup-java@v2
25+
uses: actions/setup-java@v3
2626
with:
2727
distribution: zulu
2828
java-version: ${{ matrix.java }}
29+
cache: maven
2930

3031
- name: Install dependencies
31-
run: ./mvnw install -Dmaven.test.skip -Dinvoker.skip
32+
run: ./mvnw install -B -Dmaven.test.skip -Dinvoker.skip
3233

3334
- name: Run tests
34-
run: ./mvnw verify -Pintegration-test
35+
run: ./mvnw verify -B -Pintegration-test

‎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: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
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>
7+
<pluginRepositories>
8+
<pluginRepository>
9+
<releases>
10+
<enabled>false</enabled>
11+
</releases>
12+
<snapshots>
13+
<enabled>true</enabled>
14+
</snapshots>
15+
<id>sonatype</id>
16+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
17+
</pluginRepository>
18+
</pluginRepositories>
19+
720
<repositories>
821
<repository>
9-
<id>rubygems-release</id>
10-
<url>http://rubygems-proxy.torquebox.org/releases</url>
22+
<id>mavengems</id>
23+
<url>mavengem:https://rubygems.org</url>
1124
</repository>
1225
</repositories>
1326

@@ -27,9 +40,16 @@
2740
</properties>
2841

2942
<build>
43+
<extensions>
44+
<extension>
45+
<groupId>org.jruby.maven</groupId>
46+
<artifactId>mavengem-wagon</artifactId>
47+
<version>2.0.0-SNAPSHOT</version>
48+
</extension>
49+
</extensions>
3050
<plugins>
3151
<plugin>
32-
<groupId>de.saumya.mojo</groupId>
52+
<groupId>org.jruby.maven</groupId>
3353
<artifactId>gem-maven-plugin</artifactId>
3454
<version>@project.version@</version>
3555
<configuration>

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,43 @@
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>
11+
</pluginRepository>
12+
<pluginRepository>
13+
<releases>
14+
<enabled>false</enabled>
15+
</releases>
16+
<snapshots>
17+
<enabled>true</enabled>
18+
</snapshots>
19+
<id>sonatype</id>
20+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
1121
</pluginRepository>
1222
</pluginRepositories>
23+
24+
<repositories>
25+
<repository>
26+
<id>mavengems</id>
27+
<url>mavengem:https://rubygems.org</url>
28+
</repository>
29+
</repositories>
1330
<properties>
1431
<root.dir>${basedir}</root.dir>
1532
<gem.home>${root.dir}/target/rubygems</gem.home>
1633
<gem.path>${root.dir}/target/rubygems</gem.path>
1734
</properties>
1835
<build>
36+
<extensions>
37+
<extension>
38+
<groupId>org.jruby.maven</groupId>
39+
<artifactId>mavengem-wagon</artifactId>
40+
<version>2.0.0-SNAPSHOT</version>
41+
</extension>
42+
</extensions>
1943
<plugins>
2044
<plugin>
21-
<groupId>de.saumya.mojo</groupId>
45+
<groupId>org.jruby.maven</groupId>
2246
<artifactId>gem-maven-plugin</artifactId>
2347
<version>@project.parent.version@</version>
2448
<executions>

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,38 @@
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

10+
<pluginRepositories>
11+
<pluginRepository>
12+
<releases>
13+
<enabled>false</enabled>
14+
</releases>
15+
<snapshots>
16+
<enabled>true</enabled>
17+
</snapshots>
18+
<id>sonatype</id>
19+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
20+
</pluginRepository>
21+
</pluginRepositories>
22+
1023
<repositories>
1124
<repository>
12-
<id>rubygems-releases</id>
13-
<url>http://rubygems-proxy.torquebox.org/releases</url>
25+
<id>mavengems</id>
26+
<url>mavengem:https://rubygems.org</url>
1427
</repository>
1528
</repositories>
1629

1730
<build>
31+
<extensions>
32+
<extension>
33+
<groupId>org.jruby.maven</groupId>
34+
<artifactId>mavengem-wagon</artifactId>
35+
<version>2.0.0-SNAPSHOT</version>
36+
</extension>
37+
</extensions>
1838
<plugins>
1939
<plugin>
2040
<artifactId>maven-clean-plugin</artifactId>
@@ -26,7 +46,7 @@
2646
</executions>
2747
</plugin>
2848
<plugin>
29-
<groupId>de.saumya.mojo</groupId>
49+
<groupId>org.jruby.maven</groupId>
3050
<artifactId>gem-maven-plugin</artifactId>
3151
<version>@project.version@</version>
3252
<executions>

0 commit comments

Comments
 (0)