Author: juanpablo
Date: Thu Apr 18 22:34:57 2013
New Revision: 1469609
URL: http://svn.apache.org/r1469609
Log:
JSPWIKI-771:
- deleted configuration which is now on the parent pom
- groupId & version consistent across modules
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml?rev=1469609&r1=1469608&r2=1469609&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
Thu Apr 18 22:34:57 2013
@@ -3,12 +3,12 @@
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <groupId>jspwiki.it</groupId>
+ <groupId>org.apache.incubator.jspwiki.it</groupId>
<artifactId>jspwiki-it-vanilla</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>jspwiki-it-vanilla</name>
<description>selenium tests execution for jspwiki-vanilla (simple
war)</description>
- <version>1.0.0</version>
+ <version>2.9.1-SNAPSHOT</version>
<packaging>war</packaging> <!-- this enables tests reuse [1/2] -->
<build>
@@ -64,9 +64,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.incubator</groupId>
- <artifactId>jspwiki</artifactId>
- <version>2.9.1-SNAPSHOT</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-war</artifactId>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1469609&r1=1469608&r2=1469609&view=diff
==============================================================================
---
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
(original)
+++
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
Thu Apr 18 22:34:57 2013
@@ -3,10 +3,10 @@
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <groupId>jspwiki.it</groupId>
+ <groupId>org.apache.incubator.jspwiki.it</groupId>
<artifactId>jspwiki-selenium-tests</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>jspwiki-selenium-tests</name>
<description>selenium tests for jspwiki</description>
- <version>1.0.0</version>
+ <version>2.9.1-SNAPSHOT</version>
</project>
\ No newline at end of file
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml?rev=1469609&r1=1469608&r2=1469609&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml Thu Apr 18
22:34:57 2013
@@ -3,12 +3,12 @@
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <groupId>jspwiki.it</groupId>
+ <groupId>org.apache.incubator.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>jspwiki-it-builder</name>
<description>selenium tests execution for jspwiki</description>
- <version>1.0.0</version>
+ <version>2.9.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml?rev=1469609&r1=1469608&r2=1469609&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml Thu Apr 18
22:34:57 2013
@@ -20,8 +20,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.incubator</groupId>
- <artifactId>jspwiki</artifactId>
+ <groupId>org.apache.incubator.jspwiki</groupId>
+ <artifactId>jspwiki-war</artifactId>
<version>2.9.1-SNAPSHOT</version>
<name>Apache JSPWiki (Incubating)</name>
<description>Incubating Apache JSPWiki is a leading open source WikiWiki
engine, feature-rich
@@ -30,15 +30,6 @@
<packaging>war</packaging>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jspwiki.jdk.version>1.6</jspwiki.jdk.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>xmlrpc</groupId>
@@ -204,7 +195,6 @@
</dependency>
</dependencies>
-
<build>
<finalName>JSPWiki</finalName>
<sourceDirectory>${basedir}/src</sourceDirectory>
@@ -239,15 +229,7 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <source>${jspwiki.jdk.version}</source>
- <target>${jspwiki.jdk.version}</target>
- </configuration>
- </plugin>
+
<!-- With below plugin can deploy to an embedded Tomcat instance
via:
mvn clean install tomcat7:run-war [-Dmaven.test.skip]
...or standalone by adding a <server/> entry "myTomcat":
@@ -480,95 +462,6 @@
</webResources>
</configuration>
</plugin>
- <!-- Below plugin for Selenium tests (mvn integration-test, not
yet working) -->
- <!--plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>8.0.0.M3</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <contextPath>/</contextPath>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <stopKey>STOP</stopKey>
- <stopPort>8005</stopPort>
- <port>8080</port>
- </configuration>
- <executions>
- <execution>
- <id>start-jetty</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>stop</goal>
- <goal>run-exploded</goal>
- </goals>
- <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
- </configuration>
- </execution>
- <execution>
- <id>stop-jetty</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <browser>*firefox</browser>
-
<suite>tests/build/webtests/test-custom/selenium/TestSuite.html</suite>
- <startURL>http://localhost:8080/JSPWiki</startURL>
- </configuration>
- <executions>
- <execution>
- <id>Run-Selenese-Scripts</id>
- <phase>integration-test</phase>
- <goals>
- <goal>selenese</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store
Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-antrun-plugin</artifactId>
-
<versionRange>[1.7,)</versionRange>
-
<goals><goal>run</goal></goals>
-
</pluginExecutionFilter>
-
<action><ignore></ignore></action>
- </pluginExecution>
- <pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>net.alchim31.maven</groupId>
-
<artifactId>yuicompressor-maven-plugin</artifactId>
-
<versionRange>[1.3.2,)</versionRange>
-
<goals><goal>compress</goal></goals>
-
</pluginExecutionFilter>
-
<action><ignore></ignore></action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
</project>
