SiteStats

sitestats-impl pom.xml

New <parent>

<parent>
   <artifactId>sakai-standard-tool</artifactId>
   <groupId>org.sakaiproject.purepoms</groupId>
   <version>2.7.0-build02-SNAPSHOT</version>
    
    <!-- 
        <artifactId>master</artifactId>
        <groupId>org.sakaiproject</groupId>
        <version>2.7.0-SNAPSHOT</version> 
    -->    
</parent>

Profile cleanup

Remove all "K1" and "pre-K1" build profiles as they are not required for Sitestats 2.1.

base pom <dependencyManagement> cleanup

Remove redundant dependencies and add versions for Sakai-specific dependencies

<dependencyManagement>
        <dependencies>
            
            <!-- Sakai other -->
            <dependency>
                <groupId>org.sakaiproject</groupId>
                <artifactId>sakai-comp-shared-scheduler</artifactId>
                <version>2.7.0-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.sakaiproject</groupId>
                <artifactId>sakai-mock</artifactId>
                <version>2.7.0-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.sakaiproject</groupId>
                <artifactId>sakai-scheduler-api</artifactId>
                <version>2.7.0-SNAPSHOT</version>
            </dependency>

            <!-- Remove these redundant testing dependencies -->
            <!--
            <dependency>
                <groupId>${sakai.spring.groupId}</groupId>
                <artifactId>${sakai.spring.test.artifactId}</artifactId>
                <version>${sakai.spring.test.version}</version>
            </dependency>
            <dependency>
                <groupId>hsqldb</groupId>
                <artifactId>hsqldb</artifactId>
                <version>${hsqldb.version}</version>
            </dependency>        
            <dependency>
                <groupId>dom4j</groupId>
                <artifactId>dom4j</artifactId>
                <version>${dom4j.version}</version>
            </dependency>
            <dependency>
                <groupId>jta</groupId>
                <artifactId>jta</artifactId>
                <version>${jta.version}</version>
            </dependency>
            <dependency>
                <groupId>cglib</groupId>
                <artifactId>cglib-nodep</artifactId>
                <version>${cglib-nodep.version}</version>
            </dependency> 
            <dependency>
                <groupId>commons-codec</groupId>
                <artifactId>commons-codec</artifactId>
                <version>${commons-codec.version}</version>
            </dependency>
            <dependency>
                <groupId>commons-collections</groupId>
                <artifactId>commons-collections</artifactId>
                <version>${commons-collection.version}</version>
            </dependency>
            <dependency>
                <groupId>${sakai.ehcache.groupId}</groupId>
                <artifactId>${sakai.ehcache.artifactId}</artifactId>
                <version>${sakai.ehcache.version}</version>
            </dependency>
            -->
        </dependencies>
    </dependencyManagement>

Redundant properties

parent: master

SiteStats properties inherited from master

<properties>
    <sakai.version>2.7.0-SNAPSHOT</sakai.version>
    <sakai.spring.groupId>org.springframework</sakai.spring.groupId>
    <sakai.spring.artifactId>spring</sakai.spring.artifactId>
    <sakai.spring.version>2.5.6.SEC01</sakai.spring.version>
    <sakai.spring.test.artifactId>spring-test</sakai.spring.test.artifactId>
    <sakai.spring.test.version>2.5.6.SEC01</sakai.spring.test.version>
    <sakai.hibernate.groupId>org.hibernate</sakai.hibernate.groupId>
    <sakai.hibernate.artifactId>hibernate</sakai.hibernate.artifactId>
    <sakai.hibernate.version>3.2.7.ga</sakai.hibernate.version>
    <sakai.ehcache.groupId>net.sf.ehcache</sakai.ehcache.groupId>
    <sakai.ehcache.artifactId>ehcache</sakai.ehcache.artifactId>
    <sakai.ehcache.version>1.3.0</sakai.ehcache.version>
    <sakai.servletapi.version>2.4</sakai.servletapi.version>
    <!-- Additional properties ignored in this example -->
</properties

SiteStats-specific properties

<properties>
    <entitybroker.version>[1.3.5-SNAPSHOT,1.4.0]</entitybroker.version>
    <commons-digester.version>1.6</commons-digester.version>
    <commons-betwixt.version>0.8</commons-betwixt.version>
    <commons-codec.version>1.3</commons-codec.version>
    <commons-collection.version>3.1</commons-collection.version>
    <easymock.version>2.4</easymock.version>
    <hsqldb.version>1.8.0.7</hsqldb.version>
    <h2.version>1.1.111</h2.version>
    <mysql.version>3.1.14</mysql.version>
    <!-- <ojdbc.version>10.2.0.2.0</ojdbc.version> -->
    <dom4j.version>1.6.1</dom4j.version>
    <jta.version>h2.1.8</jta.version> -->
    <cglib-nodep.version>2.1_3</cglib-nodep.version> -->
    <fop.version>0.95</fop.version>
    <poi.version>2.0-final-20040126</poi.version>
    <jfreechart.version>1.0.5</jfreechart.version>
    <sst.wicket.version>1.3.7</sst.wicket.version>
    <sst.slf4j.version>1.4.3</sst.slf4j.version>
</properties>

parent: sakai-standard-tool

SiteStats-specific properties

<properties>
    <commons-digester.version>1.6</commons-digester.version>
    <commons-betwixt.version>0.8</commons-betwixt.version>
    <easymock.version>2.4</easymock.version>
    <h2.version>1.1.111</h2.version>
    <mysql.version>3.1.14</mysql.version>
    <!-- <ojdbc.version>10.2.0.2.0</ojdbc.version> -->
    <fop.version>0.95</fop.version>
    <poi.version>2.0-final-20040126</poi.version>
    <jfreechart.version>1.0.5</jfreechart.version>
    <sst.wicket.version>1.3.7</sst.wicket.version>
    <sst.slf4j.version>1.4.3</sst.slf4j.version>
</properties>

Dependency adjustments

master pom

<dependency>
    <groupId>${sakai.spring.groupId}</groupId>
    <artifactId>${sakai.spring.artifactId}</artifactId>
</dependency>
<dependency>
    <groupId>${sakai.hibernate.groupId}</groupId>
    <artifactId>${sakai.hibernate.artifactId}</artifactId>
</dependency>

<!-- Test -->
<dependency>
    <groupId>${sakai.spring.groupId}</groupId>
    <artifactId>${sakai.spring.test.artifactId}</artifactId>
    <scope>test</scope>
</dependency>
<dependency>
    <groupId>${sakai.ehcache.groupId}</groupId>
    <artifactId>${sakai.ehcache.artifactId}</artifactId>
    <scope>test</scope>
</dependency>

sakai-standard-tool pom

<dependency>
    <groupId>org.hibernate</groupId>
    <artifactId>hibernate</artifactId>
</dependency>
<dependency>
    <groupId>org.springframework</groupId>
    <artifactId>spring</artifactId>
</dependency>

<!-- Test -->
<dependency>
    <groupId>org.springframework</groupId>
    <artifactId>spring-test</artifactId>
    <scope>test</scope>
</dependency>
<dependency>
    <groupId>net.sf.ehcache</groupId>
    <artifactId>ehcache</artifactId>
    <scope>test</scope>
</dependency>

Remove versions (K1 inheritance)

sitestats-impl pom

<dependency>
   <groupId>javax.servlet</groupId>
   <artifactId>servlet-api</artifactId>
   <!-- <version>${sakai.servletapi.version}</version> -->
   <scope>test</scope>
</dependency>

sitestats-impl pom

Explicit versions defined (ex-master inheritance)

<dependency>
     <groupId>quartz</groupId>
     <artifactId>quartz</artifactId>
     <version>1.5.2</version>
     <scope>provided</scope>
</dependency>