rspec/maven/model/model_spec.rb in maven-tools-0.32.4 vs rspec/maven/model/model_spec.rb in maven-tools-0.32.5

- old
+ new

@@ -19,10 +19,11 @@ XML end it 'should setup a minimal project' do project = Maven::Model::Project.new + project.dump_pom 'pom-ng.xml' project.artifact_id = 'mini' project.parent('test:parent', '1.2.3') project.to_xml.should == <<-XML <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> @@ -147,28 +148,28 @@ <groupId>test</groupId> <artifactId>project</artifactId> <version>0.0.0</version> <repositories> <repository> + <id>rubygems-releases</id> + <url>http://rubygems-proxy.torquebox.org/releases</url> + </repository> + <repository> <id>jboss-public-repository-group</id> <name>JBoss Public Maven Repository Group</name> <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> <releases> - <checksumPolicy>strict</checksumPolicy> <enabled>false</enabled> <updatePolicy>never</updatePolicy> + <checksumPolicy>strict</checksumPolicy> </releases> <snapshots> - <checksumPolicy>ignore</checksumPolicy> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> + <checksumPolicy>ignore</checksumPolicy> </snapshots> </repository> - <repository> - <id>rubygems-releases</id> - <url>http://rubygems-proxy.torquebox.org/releases</url> - </repository> </repositories> <pluginRepositories> <pluginRepository> <id>sonatype-snapshots</id> <url>http://oss.sonatype.org/content/repositories/snapshots</url> @@ -342,10 +343,13 @@ <artifactId>project</artifactId> <version>0.0.0</version> <build> <plugins> <plugin> + <artifactId>maven-release-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.4.1</version> </plugin> <plugin> <artifactId>maven-compile-plugin</artifactId> @@ -353,13 +357,10 @@ <configuration> <source>1.5</source> <target>1.5</target> </configuration> </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - </plugin> </plugins> </build> </project> XML end @@ -376,35 +377,35 @@ <version>0.0.0</version> <build> <plugins> <plugin> <groupId>de.saumya.mojo</groupId> - <artifactId>cucumber-maven-plugin</artifactId> + <artifactId>gem-maven-plugin</artifactId> + <extensions>true</extensions> <executions> <execution> - <id>in_phase_integration_test</id> - <phase>integration-test</phase> + <id>in_phase_pre_integration_test</id> + <phase>pre-integration-test</phase> <goals> - <goal>test</goal> + <goal>install</goal> </goals> - <configuration> - <cucumberArgs>--no-colors</cucumberArgs> - </configuration> </execution> </executions> </plugin> <plugin> <groupId>de.saumya.mojo</groupId> - <artifactId>gem-maven-plugin</artifactId> - <extensions>true</extensions> + <artifactId>cucumber-maven-plugin</artifactId> <executions> <execution> - <id>in_phase_pre_integration_test</id> - <phase>pre-integration-test</phase> + <id>in_phase_integration_test</id> + <phase>integration-test</phase> <goals> - <goal>install</goal> + <goal>test</goal> </goals> + <configuration> + <cucumberArgs>--no-colors</cucumberArgs> + </configuration> </execution> </executions> </plugin> </plugins> </build> @@ -454,35 +455,10 @@ <artifactId>project</artifactId> <version>0.0.0</version> <build> <plugins> <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>public</directory> - </resource> - <resource> - <directory>.</directory> - <includes> - <include>app/**</include> - <include>config/**</include> - <include>lib/**</include> - <include>vendor/**</include> - <include>Gemfile</include> - </includes> - <targetPath>WEB-INF</targetPath> - </resource> - <resource> - <directory>${gem.path}</directory> - <targetPath>WEB-INF/gems</targetPath> - </resource> - </webResources> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> <version>2.1.0</version> <configuration> <extraJvmArgs>-Xmx512m</extraJvmArgs> @@ -512,9 +488,34 @@ <keystore>${project.basedir}/src/test/resources/server.keystore</keystore> <keyPassword>123456</keyPassword> <password>123456</password> </connector> </connectors> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>public</directory> + </resource> + <resource> + <directory>.</directory> + <targetPath>WEB-INF</targetPath> + <includes> + <include>app/**</include> + <include>config/**</include> + <include>lib/**</include> + <include>vendor/**</include> + <include>Gemfile</include> + </includes> + </resource> + <resource> + <directory>${gem.path}</directory> + <targetPath>WEB-INF/gems</targetPath> + </resource> + </webResources> </configuration> </plugin> </plugins> </build> </project>