Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@cstamas cstamas authored
View
93 nexus-ruby-plugin/pom.xml
@@ -4,19 +4,22 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.sonatype.nexus.ruby</groupId>
+ <artifactId>nexus-ruby-support</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
<groupId>org.sonatype.nexus.plugins</groupId>
<artifactId>nexus-ruby-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
<packaging>nexus-plugin</packaging>
<name>Nexus Ruby Plugin</name>
-
<description>Nexus Ruby Plugin</description>
<properties>
<!-- Set the Nexus version here, against which you build the plugin -->
- <nexus-version>1.8.0</nexus-version>
+ <nexus-version>1.9.1</nexus-version>
</properties>
<repositories>
@@ -31,13 +34,13 @@
<dependency>
<groupId>de.saumya.mojo</groupId>
<artifactId>ruby-tools</artifactId>
- <version>0.3</version>
+ <version>0.5</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>1.5.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
@@ -46,16 +49,10 @@
<version>1.0.4</version>
</dependency>
- <!--
- Note: there are two sets of dependencies here, the basic (minimal
- dependencies needed to build Nexus plugins), and the ITset, that
- is needed if you want to write IT tests using real Nexus
- environment to test your plugins. If you are using other technique
- (like having separate module for IT tests), you can freely remove
- or just move outside of this module these dependencies. The ITset
- of requirements in this POM are put in between "#ITSet BEGINS" and
- "#ITSet ENDS" pair of comments.
- -->
+ <!-- Note: there are two sets of dependencies here, the basic (minimal dependencies needed to build Nexus plugins), and
+ the ITset, that is needed if you want to write IT tests using real Nexus environment to test your plugins. If you are using
+ other technique (like having separate module for IT tests), you can freely remove or just move outside of this module these
+ dependencies. The ITset of requirements in this POM are put in between "#ITSet BEGINS" and "#ITSet ENDS" pair of comments. -->
<!-- Main plugin API, pulling in what is needed -->
<dependency>
@@ -78,6 +75,7 @@
<version>4.4</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>rubygems</groupId>
<artifactId>rspec</artifactId>
@@ -94,10 +92,7 @@
</dependency>
<!-- #ITSet BEGINS -->
- <!--
- Nexus IT setup (dependencies below are needed if you have
- extensive ITs and you want to use Nexus Environment)
- -->
+ <!-- Nexus IT setup (dependencies below are needed if you have extensive ITs and you want to use Nexus Environment) -->
<!-- There are plugins connected to this dependency, see below! -->
<dependency>
<groupId>org.sonatype.nexus</groupId>
@@ -110,14 +105,8 @@
</dependencies>
<!-- #ITSet BEGINS -->
- <!--
- Nexus IT setup (dependencies below are needed if you have extensive
- ITs and you want to use Nexus Environment)
- -->
- <!--
- There are plugins and dependencies connected to this import, see
- below and above!
- -->
+ <!-- Nexus IT setup (dependencies below are needed if you have extensive ITs and you want to use Nexus Environment) -->
+ <!-- There are plugins and dependencies connected to this import, see below and above! -->
<dependencyManagement>
<dependencies>
<dependency>
@@ -136,7 +125,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.2.1</version>
+ <version>1.5.4</version>
<executions>
<execution>
<id>process-classes</id>
@@ -157,13 +146,13 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>app-lifecycle-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.4-SNAPSHOT</version>
<extensions>true</extensions>
<dependencies>
<dependency>
<groupId>org.sonatype.plugins</groupId>
<artifactId>app-lifecycle-nexus</artifactId>
- <version>1.1</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -171,16 +160,16 @@
<!-- Have to set source level to Java5, we use annotations -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.8.1</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
<argLine>-Xmx512m</argLine>
@@ -190,32 +179,26 @@
<groupId>de.saumya.mojo</groupId>
<artifactId>rspec-maven-plugin</artifactId>
<version>0.22.0</version>
- <extensions>true</extensions>
+ <extensions>true</extensions>
<configuration>
<specSourceDirectory>src/test/spec</specSourceDirectory>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<!-- #ITSet BEGINS -->
- <!--
- Nexus IT setup (dependencies below are needed if you have
- extensive ITs and you want to use Nexus Environment)
- -->
- <!--
- There are dependencies connected to this set of plugin, see
- above!
- -->
+ <!-- Nexus IT setup (dependencies below are needed if you have extensive ITs and you want to use Nexus Environment) -->
+ <!-- There are dependencies connected to this set of plugin, see above! -->
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-test-environment-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
<executions>
<execution>
<goals>
@@ -237,9 +220,9 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- <version>2.4.3-alpha-2-SONATYPE-11146</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.8.1</version>
<executions>
<execution>
<goals>
View
4 nexus-ruby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/DefaultRubyRepositoryHelper.java
@@ -4,14 +4,14 @@
import java.io.FileReader;
import java.io.IOException;
+import org.apache.maven.index.artifact.Gav;
+import org.apache.maven.index.artifact.IllegalArtifactCoordinateException;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.sonatype.nexus.artifact.Gav;
-import org.sonatype.nexus.artifact.IllegalArtifactCoordinateException;
import org.sonatype.nexus.proxy.ResourceStoreRequest;
import org.sonatype.nexus.proxy.StorageException;
import org.sonatype.nexus.proxy.item.StorageFileItem;
View
5 ...uby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/shadow/Maven2RubyGemShadowContentGenerator.java
@@ -44,6 +44,11 @@ protected Logger getLogger()
@Requirement
private RubyGateway rubyGateway;
+
+ public String getGeneratorId()
+ {
+ return ID;
+ }
/**
* What we do here is pretty hacky: on-demand GEM creation. If this ContentGenerator is invoked, it means that an
View
9 pom.xml
@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<name>Nexus Ruby Support (Aggregator)</name>
-
+
<description>Nexus Ruby Support</description>
<scm>
@@ -20,14 +20,7 @@
</scm>
<modules>
- <!-- <module>nexus-ruby-tools</module> -->
<module>nexus-ruby-plugin</module>
</modules>
- <dependencies>
- </dependencies>
-
- <build>
- </build>
-
</project>
Please sign in to comment.
Something went wrong with that request. Please try again.