continue work...

pom.xml

@@ -150,39 +150,41 @@
     </dependency>
   </dependencies>
   <modules>
-    <module>xwiki-platform-model</module>
-    <module>xwiki-platform-xmlrpc</module>
-    <module>xwiki-platform-cache</module>
-    <module>xwiki-platform-xml</module>
-    <module>xwiki-platform-core</module>
-    <module>xwiki-platform-component</module>
-    <module>xwiki-platform-url</module>
-    <module>xwiki-platform-containers</module>
+    <!-- Sorted Alphabetically -->
     <module>xwiki-platform-action</module>
-    <module>xwiki-platform-velocity</module>
-    <module>xwiki-platform-observation</module>
+    <module>xwiki-platform-activitystream</module>
+    <module>xwiki-platform-annotations</module>
     <module>xwiki-platform-bridge</module>
-    <module>xwiki-platform-rendering</module>
-    <module>xwiki-platform-configuration</module>
-    <module>xwiki-platform-query</module>
-    <module>xwiki-platform-webdav</module>
-    <module>xwiki-platform-office</module>
-    <module>xwiki-platform-rest</module>
-    <module>xwiki-platform-refactoring</module>
+    <module>xwiki-platform-cache</module>
+    <module>xwiki-platform-captcha</module>
     <module>xwiki-platform-chart</module>
-    <module>xwiki-platform-formula</module>
     <module>xwiki-platform-classloader</module>
-    <module>xwiki-platform-captcha</module>
-    <module>xwiki-platform-annotations</module>
+    <module>xwiki-platform-component</module>
+    <module>xwiki-platform-configuration</module>
+    <module>xwiki-platform-containers</module>
+    <module>xwiki-platform-core</module>
     <module>xwiki-platform-crypto</module>
     <module>xwiki-platform-csrf</module>
+    <module>xwiki-platform-eventstream</module>
     <module>xwiki-platform-extension</module>
+    <module>xwiki-platform-formula</module>
     <module>xwiki-platform-legacy</module>
+    <module>xwiki-platform-messagestream</module>
+    <module>xwiki-platform-model</module>
+    <module>xwiki-platform-observation</module>
+    <module>xwiki-platform-office</module>
+    <module>xwiki-platform-query</module>
+    <module>xwiki-platform-refactoring</module>
+    <module>xwiki-platform-rendering</module>
+    <module>xwiki-platform-rest</module>
     <module>xwiki-platform-skin</module>
     <module>xwiki-platform-store</module>
-    <module>xwiki-platform-eventstream</module>
-    <module>xwiki-platform-messagestream</module>
     <module>xwiki-platform-test</module>
+    <module>xwiki-platform-url</module>
+    <module>xwiki-platform-velocity</module>
+    <module>xwiki-platform-xml</module>
+    <module>xwiki-platform-xmlrpc</module>
+    <module>xwiki-platform-webdav</module>
   </modules>
   <profiles>
     <profile>

xwiki-platform-activitystream/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <!--
  *
  * See the NOTICE file distributed with this work for additional
@@ -31,69 +30,52 @@
     <version>3.1-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-plugin-activitystream</artifactId>
-  <version>1.13-SNAPSHOT</version>
   <name>XWiki Platform - Plugins - Activity Stream</name>
   <packaging>jar</packaging>
   <description>XWiki Platform - Plugins - Activity Stream</description>
-  <properties>
-    <platform.core.version>3.0-SNAPSHOT</platform.core.version>
-    <platform.plugin.scheduler.version>1.26-SNAPSHOT</platform.plugin.scheduler.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>com.xpn.xwiki.platform</groupId>
       <artifactId>xwiki-core</artifactId>
-      <version>${platform.core.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-bridge</artifactId>
-      <version>${platform.core.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-observation-remote</artifactId>
-      <version>${platform.core.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-annotations-core</artifactId>
-      <version>${platform.core.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.xpn.xwiki.platform.plugins</groupId>
       <artifactId>xwiki-plugin-scheduler</artifactId>
-      <version>${platform.plugin.scheduler.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-query-manager</artifactId>
-      <version>${platform.core.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-eventstream</artifactId>
-      <version>${platform.core.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock-cglib</artifactId>
-      <version>1.2.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -108,21 +90,10 @@
             <!-- Some methods in the APIs have more than 7 arguments, the 3 classes bellow can't pass our checkstyle -->
             com/xpn/xwiki/plugin/activitystream/api/ActivityStream.java,
             com/xpn/xwiki/plugin/activitystream/impl/ActivityStreamImpl.java,
-            com/xpn/xwiki/plugin/activitystream/plugin/ActivityStreamPluginApi.java,
+            com/xpn/xwiki/plugin/activitystream/plugin/ActivityStreamPluginApi.java
           </excludes>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  <!-- We must configure SCM in each module. For more information see:
-       http://svn.xwiki.org/svnroot/xwiki/platform/pom/trunk/pom.xml -->
-  <scm>
-    <connection>scm:svn:http://svn.xwiki.org/svnroot/xwiki/platform/xwiki-plugins/trunk/activitystream</connection>
-    <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/platform/xwiki-plugins/trunk/activitystream</developerConnection>
-    <url>http://svn.xwiki.org/svnroot/xwiki/platform/xwiki-plugins/trunk/activitystream</url>
-  </scm>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.xwiki.org/jira/browse/XPAS</url>
-  </issueManagement>
-</project>      
+</project>