You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/04/22 23:54:58 UTC

svn commit: r1470730 - in /incubator/jspwiki/branches/MVN3_BRANCH: jspwiki-it-tests/jspwiki-it-vanilla/pom.xml jspwiki-it-tests/jspwiki-selenium-tests/pom.xml jspwiki-it-tests/pom.xml jspwiki-war/pom.xml mvn_cheat-sheet.txt pom.xml

Author: juanpablo
Date: Mon Apr 22 21:54:57 2013
New Revision: 1470730

URL: http://svn.apache.org/r1470730
Log:
groupId moved to org.apache.jspwiki, in order to keep the statistics at analysis.a.o when we make the switch from Ant to Maven

JSPWIKI-771: release profile to attach source, javadocs and sign generated artifacts 

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
    incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt
    incubator/jspwiki/branches/MVN3_BRANCH/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=1470730&r1=1470729&r2=1470730&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 Mon Apr 22 21:54:57 2013
@@ -22,7 +22,7 @@
          xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <groupId>org.apache.incubator.jspwiki.it</groupId>
+    <groupId>org.apache.jspwiki.it</groupId>
     <artifactId>jspwiki-it-builder</artifactId>
     <version>2.9.1-SNAPSHOT</version>
   </parent>
@@ -86,7 +86,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.incubator.jspwiki</groupId>
+      <groupId>org.apache.jspwiki</groupId>
       <artifactId>jspwiki-war</artifactId>
       <version>${project.version}</version>
       <type>war</type>

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=1470730&r1=1470729&r2=1470730&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 Mon Apr 22 21:54:57 2013
@@ -22,7 +22,7 @@
          xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <groupId>org.apache.incubator.jspwiki</groupId>
+    <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
     <version>2.9.1-SNAPSHOT</version>
     <relativePath>../../pom.xml<relativePath>

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=1470730&r1=1470729&r2=1470730&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml Mon Apr 22 21:54:57 2013
@@ -22,7 +22,7 @@
          xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <groupId>org.apache.incubator.jspwiki</groupId>
+    <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
     <version>2.9.1-SNAPSHOT</version>
   </parent>

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=1470730&r1=1470729&r2=1470730&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml Mon Apr 22 21:54:57 2013
@@ -22,7 +22,7 @@
          xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <parent>
-      <groupId>org.apache.incubator.jspwiki</groupId>
+      <groupId>org.apache.jspwiki</groupId>
       <artifactId>jspwiki-builder</artifactId>
       <version>2.9.1-SNAPSHOT</version>
     </parent>

Modified: incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt?rev=1470730&r1=1470729&r2=1470730&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt Mon Apr 22 21:54:57 2013
@@ -5,17 +5,19 @@ mvn idea:idea       : generates IDEA Int
 
 Build specific
 **************
-mvn clean install                    : performs a build
-mvn clean install -Dmaven.skip.test  : performs a build, skipping the tests (not recommended)
-mvn clean test                       : compiles the source and executes the tests
-mvn tomcat7:run                      : (from a war module) starts JSPWiki on a 
-                                       Tomcat7 instance at http://localhost:8080/JSPWiki
+mvn clean install                                        : performs a build
+mvn clean install -Dmaven.skip.test                      : performs a build, skipping the tests (not recommended)
+mvn clean test                                           : compiles the source and executes the tests
+mvn tomcat7:run                                          : (from a war module) starts JSPWiki on a 
+                                                           Tomcat7 instance at http://localhost:8080/JSPWiki
+mvn clean deploy -Prelease -Dgpg.passphrase=<passphrase> : deploys generated artifact to a repository
+                                                           If -Dgpg.passphrase is not given, it'll be asked
                                        
 Selenium execution: go to jspwiki-it-tests module and execute mvn clean test
 
 Reports specific
 ****************
-mvn javadoc:javadoc : creates javadocs; if graphviz binaries (www.graphviz.org) 
-                      are found on $PATH, the javadocs will display some UML 
-                      class/package level diagrams
-mvn apache-rat      : creates a RAT report
\ No newline at end of file
+mvn javadoc:javadoc  : creates javadocs; if graphviz binaries (www.graphviz.org) 
+                       are found on $PATH, the javadocs will display some UML 
+                       class/package level diagrams
+mvn apache-rat:check : creates a RAT report
\ No newline at end of file

Modified: incubator/jspwiki/branches/MVN3_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/pom.xml?rev=1470730&r1=1470729&r2=1470730&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/pom.xml Mon Apr 22 21:54:57 2013
@@ -21,10 +21,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>org.apache.incubator.jspwiki</groupId>
+  <groupId>org.apache.jspwiki</groupId>
   <artifactId>jspwiki-builder</artifactId>
   <modelVersion>4.0.0</modelVersion>
-  <name>Apache JSPWiki (incubating)</name>
+  <name>Apache JSPWiki (Incubating)</name>
   <version>2.9.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich 
@@ -156,7 +156,6 @@
       <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-chrome-driver</artifactId>
-        <artifactId>selenium-firefox-driver</artifactId>
         <version>2.32.0</version>
       </dependency>
 
@@ -332,6 +331,11 @@
             </rules>
           </configuration>
         </plugin>
+        
+        <plugin>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.4</version>
+        </plugin>
           
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
@@ -371,7 +375,7 @@
             <docletArtifact>
             <groupId>org.jboss.apiviz</groupId>
             <artifactId>apiviz</artifactId>
-            <version>1.3.1.GA</version>
+            <version>1.3.2.GA</version>
           </docletArtifact>
           <encoding>${project.build.sourceEncoding}</encoding>
           </configuration>
@@ -543,6 +547,52 @@
     </pluginManagement>
   </build>
   
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          
+          <plugin>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
   <organization>
     <name>The Apache Software Foundation</name>
     <url>http://www.apache.org/</url>