Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Just a "refresh" to the plugin.

Code
* Indexer code moved/donated to Apache, hence package names changes happened
* small Nexus API changes wrt ContentGenerator (getGeneratorId() introduced).

POM:
* dep versions bumped, recheck these, since I pushed JRuby to latest "dot" release (bugfix probably), and your ruby-tools from 0.3 to 0.5
* NOTE: Nexus since 1.9.x is Java 6!!!
  • Loading branch information...
commit 375ca684e227bfad4f6357ddfc72a70a5ae0b759 1 parent 1c1a458
Tamas Cservenak authored April 27, 2011
93  nexus-ruby-plugin/pom.xml
@@ -4,19 +4,22 @@
4 4
 
5 5
   <modelVersion>4.0.0</modelVersion>
6 6
 
  7
+  <parent>
  8
+    <groupId>org.sonatype.nexus.ruby</groupId>
  9
+    <artifactId>nexus-ruby-support</artifactId>
  10
+    <version>1.0.0-SNAPSHOT</version>
  11
+  </parent>
  12
+
7 13
   <groupId>org.sonatype.nexus.plugins</groupId>
8 14
   <artifactId>nexus-ruby-plugin</artifactId>
9  
-  <version>1.0.0-SNAPSHOT</version>
10  
-
11 15
   <packaging>nexus-plugin</packaging>
12 16
 
13 17
   <name>Nexus Ruby Plugin</name>
14  
-  
15 18
   <description>Nexus Ruby Plugin</description>
16 19
 
17 20
   <properties>
18 21
     <!-- Set the Nexus version here, against which you build the plugin -->
19  
-    <nexus-version>1.8.0</nexus-version>
  22
+    <nexus-version>1.9.1</nexus-version>
20 23
   </properties>
21 24
 
22 25
   <repositories>
@@ -31,13 +34,13 @@
31 34
     <dependency>
32 35
       <groupId>de.saumya.mojo</groupId>
33 36
       <artifactId>ruby-tools</artifactId>
34  
-      <version>0.3</version>
  37
+      <version>0.5</version>
35 38
     </dependency>
36 39
 
37 40
     <dependency>
38 41
       <groupId>org.jruby</groupId>
39 42
       <artifactId>jruby-complete</artifactId>
40  
-      <version>1.5.3</version>
  43
+      <version>1.5.6</version>
41 44
     </dependency>
42 45
 
43 46
     <dependency>
@@ -46,16 +49,10 @@
46 49
       <version>1.0.4</version>
47 50
     </dependency>
48 51
 
49  
-    <!--
50  
-      Note: there are two sets of dependencies here, the basic (minimal
51  
-      dependencies needed to build Nexus plugins), and the ITset, that
52  
-      is needed if you want to write IT tests using real Nexus
53  
-      environment to test your plugins. If you are using other technique
54  
-      (like having separate module for IT tests), you can freely remove
55  
-      or just move outside of this module these dependencies. The ITset
56  
-      of requirements in this POM are put in between "#ITSet BEGINS" and
57  
-      "#ITSet ENDS" pair of comments.
58  
-    -->
  52
+    <!-- Note: there are two sets of dependencies here, the basic (minimal dependencies needed to build Nexus plugins), and 
  53
+      the ITset, that is needed if you want to write IT tests using real Nexus environment to test your plugins. If you are using 
  54
+      other technique (like having separate module for IT tests), you can freely remove or just move outside of this module these 
  55
+      dependencies. The ITset of requirements in this POM are put in between "#ITSet BEGINS" and "#ITSet ENDS" pair of comments. -->
59 56
 
60 57
     <!-- Main plugin API, pulling in what is needed -->
61 58
     <dependency>
@@ -78,6 +75,7 @@
78 75
       <version>4.4</version>
79 76
       <scope>test</scope>
80 77
     </dependency>
  78
+
81 79
     <dependency>
82 80
       <groupId>rubygems</groupId>
83 81
       <artifactId>rspec</artifactId>
@@ -94,10 +92,7 @@
94 92
     </dependency>
95 93
 
96 94
     <!-- #ITSet BEGINS -->
97  
-    <!--
98  
-      Nexus IT setup (dependencies below are needed if you have
99  
-      extensive ITs and you want to use Nexus Environment)
100  
-    -->
  95
+    <!-- Nexus IT setup (dependencies below are needed if you have extensive ITs and you want to use Nexus Environment) -->
101 96
     <!-- There are plugins connected to this dependency, see below! -->
102 97
     <dependency>
103 98
       <groupId>org.sonatype.nexus</groupId>
@@ -110,14 +105,8 @@
110 105
   </dependencies>
111 106
 
112 107
   <!-- #ITSet BEGINS -->
113  
-  <!--
114  
-    Nexus IT setup (dependencies below are needed if you have extensive
115  
-    ITs and you want to use Nexus Environment)
116  
-  -->
117  
-  <!--
118  
-    There are plugins and dependencies connected to this import, see
119  
-    below and above!
120  
-  -->
  108
+  <!-- Nexus IT setup (dependencies below are needed if you have extensive ITs and you want to use Nexus Environment) -->
  109
+  <!-- There are plugins and dependencies connected to this import, see below and above! -->
121 110
   <dependencyManagement>
122 111
     <dependencies>
123 112
       <dependency>
@@ -136,7 +125,7 @@
136 125
       <plugin>
137 126
         <groupId>org.codehaus.plexus</groupId>
138 127
         <artifactId>plexus-component-metadata</artifactId>
139  
-        <version>1.2.1</version>
  128
+        <version>1.5.4</version>
140 129
         <executions>
141 130
           <execution>
142 131
             <id>process-classes</id>
@@ -157,13 +146,13 @@
157 146
       <plugin>
158 147
         <groupId>org.sonatype.plugins</groupId>
159 148
         <artifactId>app-lifecycle-maven-plugin</artifactId>
160  
-        <version>1.1</version>
  149
+        <version>1.4-SNAPSHOT</version>
161 150
         <extensions>true</extensions>
162 151
         <dependencies>
163 152
           <dependency>
164 153
             <groupId>org.sonatype.plugins</groupId>
165 154
             <artifactId>app-lifecycle-nexus</artifactId>
166  
-            <version>1.1</version>
  155
+            <version>1.4-SNAPSHOT</version>
167 156
           </dependency>
168 157
         </dependencies>
169 158
       </plugin>
@@ -171,16 +160,16 @@
171 160
       <!-- Have to set source level to Java5, we use annotations -->
172 161
       <plugin>
173 162
         <artifactId>maven-compiler-plugin</artifactId>
174  
-        <version>2.0.2</version>
  163
+        <version>2.3.2</version>
175 164
         <configuration>
176  
-          <source>1.5</source>
177  
-          <target>1.5</target>
  165
+          <source>1.6</source>
  166
+          <target>1.6</target>
178 167
         </configuration>
179 168
       </plugin>
180 169
       <plugin>
181 170
         <groupId>org.apache.maven.plugins</groupId>
182 171
         <artifactId>maven-surefire-plugin</artifactId>
183  
-        <version>2.4.3</version>
  172
+        <version>2.8.1</version>
184 173
         <configuration>
185 174
           <failIfNoTests>false</failIfNoTests>
186 175
           <argLine>-Xmx512m</argLine>
@@ -190,32 +179,26 @@
190 179
         <groupId>de.saumya.mojo</groupId>
191 180
         <artifactId>rspec-maven-plugin</artifactId>
192 181
         <version>0.22.0</version>
193  
-	<extensions>true</extensions>
  182
+        <extensions>true</extensions>
194 183
         <configuration>
195 184
           <specSourceDirectory>src/test/spec</specSourceDirectory>
196 185
         </configuration>
197  
-	<executions>
198  
-	  <execution>
199  
-	    <goals>
200  
-	      <goal>test</goal>
201  
-	    </goals>
202  
-	  </execution>
203  
-	</executions>
  186
+        <executions>
  187
+          <execution>
  188
+            <goals>
  189
+              <goal>test</goal>
  190
+            </goals>
  191
+          </execution>
  192
+        </executions>
204 193
       </plugin>
205 194
 
206 195
       <!-- #ITSet BEGINS -->
207  
-      <!--
208  
-        Nexus IT setup (dependencies below are needed if you have
209  
-        extensive ITs and you want to use Nexus Environment)
210  
-      -->
211  
-      <!--
212  
-        There are dependencies connected to this set of plugin, see
213  
-        above!
214  
-      -->
  196
+      <!-- Nexus IT setup (dependencies below are needed if you have extensive ITs and you want to use Nexus Environment) -->
  197
+      <!-- There are dependencies connected to this set of plugin, see above! -->
215 198
       <plugin>
216 199
         <groupId>org.sonatype.plugins</groupId>
217 200
         <artifactId>nexus-test-environment-maven-plugin</artifactId>
218  
-        <version>1.5</version>
  201
+        <version>1.6</version>
219 202
         <executions>
220 203
           <execution>
221 204
             <goals>
@@ -237,9 +220,9 @@
237 220
       </plugin>
238 221
 
239 222
       <plugin>
240  
-        <groupId>org.codehaus.mojo</groupId>
241  
-        <artifactId>failsafe-maven-plugin</artifactId>
242  
-        <version>2.4.3-alpha-2-SONATYPE-11146</version>
  223
+        <groupId>org.apache.maven.plugins</groupId>
  224
+        <artifactId>maven-failsafe-plugin</artifactId>
  225
+        <version>2.8.1</version>
243 226
         <executions>
244 227
           <execution>
245 228
             <goals>
4  nexus-ruby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/DefaultRubyRepositoryHelper.java
@@ -4,14 +4,14 @@
4 4
 import java.io.FileReader;
5 5
 import java.io.IOException;
6 6
 
  7
+import org.apache.maven.index.artifact.Gav;
  8
+import org.apache.maven.index.artifact.IllegalArtifactCoordinateException;
7 9
 import org.apache.maven.model.Model;
8 10
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
9 11
 import org.codehaus.plexus.component.annotations.Component;
10 12
 import org.codehaus.plexus.component.annotations.Requirement;
11 13
 import org.codehaus.plexus.util.IOUtil;
12 14
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
13  
-import org.sonatype.nexus.artifact.Gav;
14  
-import org.sonatype.nexus.artifact.IllegalArtifactCoordinateException;
15 15
 import org.sonatype.nexus.proxy.ResourceStoreRequest;
16 16
 import org.sonatype.nexus.proxy.StorageException;
17 17
 import org.sonatype.nexus.proxy.item.StorageFileItem;
5  ...uby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/shadow/Maven2RubyGemShadowContentGenerator.java
@@ -44,6 +44,11 @@ protected Logger getLogger()
44 44
 
45 45
     @Requirement
46 46
     private RubyGateway rubyGateway;
  47
+    
  48
+    public String getGeneratorId()
  49
+    {
  50
+        return ID;
  51
+    }
47 52
 
48 53
     /**
49 54
      * What we do here is pretty hacky: on-demand GEM creation. If this ContentGenerator is invoked, it means that an
9  pom.xml
@@ -11,7 +11,7 @@
11 11
   <packaging>pom</packaging>
12 12
 
13 13
   <name>Nexus Ruby Support (Aggregator)</name>
14  
-  
  14
+
15 15
   <description>Nexus Ruby Support</description>
16 16
 
17 17
   <scm>
@@ -20,14 +20,7 @@
20 20
   </scm>
21 21
 
22 22
   <modules>
23  
-  <!--  <module>nexus-ruby-tools</module> -->
24 23
     <module>nexus-ruby-plugin</module>
25 24
   </modules>
26 25
 
27  
-  <dependencies>
28  
-  </dependencies>
29  
-
30  
-  <build>
31  
-  </build>
32  
-
33 26
 </project>

0 notes on commit 375ca68

Please sign in to comment.
Something went wrong with that request. Please try again.