Page Comparison

...

Code Block

	xml
	xml

<parent>
    <groupId>org.sakaiproject.purepoms</groupId>
    <artifactId>sakai-standard-tool</artifactId>
    <version>2.7.0-build03</version>
</parent>

...

Child poms:

Code Block

	xml
	xml


 <properties><parent>
        <url.localsite>scp://source<groupId>org.sakaiproject.org/var/www/html/release/emailtemplateservice/${project.version}  </url.localsite>
</properties>

Delete this: redundant

Code Block
xml	xml	emailtemplateservice</groupId> <artifactId>emailtemplateservice</artifactId> <version>0.4-SNAPSHOT</version> </parent>

Delete this: redundant

Code Block

	xml
	xml


<relativePath>../pom.xml</relativePath>

...

Properties

Code Block

	xml
	xml


<properties>
  <scm>      <connection>scm:svn:https:<url.localsite>scp://source.sakaiproject.org/svn/emailtemplateservice/trunk</connection>
     /var/www/html/release/emailtemplateservice/${project.version}  </url.localsite>
</properties>

scm

Code Block

	xml
	xml


<scm>
     <connection>scm:svn:https://source.sakaiproject.org/svn/emailtemplateservice/trunk</connection>
     <developerConnection>scm:svn:https://source.sakaiproject.org/svn/emailtemplateservice/trunk</developerConnection>
     <url>https://source.sakaiproject.org/svn/emailtemplateservice/trunk</url>
</scm>

...

Repositories (minimum listing)

Code Block

xml

	xml
	xml


<repositories>
        <repository>
            <id>sakai-maven2</id>
            <name>Sakai Maven Repository</name>
            <layout>default</layout>
            <url>http://source.sakaiproject.org/maven2</url>
            <releases>
                <enabled>true</enabled>
            </releases>
            <snapshots>
                <enabled>false</enabled>
            </snapshots>
        </repository>
        <repository>
            <id>sakai-maven2-snapshots</id>
            <name>Sakai Maven Repo Snapshots</name>
            <layout>default</layout>
            <url>http://source.sakaiproject.org/maven2-snapshots</url>
            <releases>
                <enabled>false</enabled>
            </releases>
            <snapshots>
                <enabled>true</enabled>
            </snapshots>
        </repository>
        <repository>
            <id>default</id>
            <name>Maven Repository Switchboard</name>
            <layout>default</layout>
            <url>http://repo1.maven.org/maven2</url>
            <releases>
                <enabled>true</enabled>
            </releases>
            <snapshots>
                <enabled>false</enabled>
            </snapshots>
        </repository>
</repositories>

Distribution management

Code Block

	xml
	xml


<distributionManagement>
        <downloadUrl>http://source.sakaiproject.org/maven2/</downloadUrl>
        <snapshotRepository>
            <uniqueVersion>false</uniqueVersion>
            <id>sakai-maven-snapshots-scp</id>
            <name>Sakai snapshot Repo</name>
            <url>scp://source.sakaiproject.org/var/www/html/maven2-snapshots</url>
            <layout>default</layout>
        </snapshotRepository>
        <repository>
            <uniqueVersion>false</uniqueVersion>
            <id>sakai-maven2-scp</id>
            <name>Sakai maven2 repository</name>
            <url>scp://source.sakaiproject.org/var/www/html/maven2</url>
            <layout>default</layout>
        </repository>
        <site>
            <id>sakai-site</id>
            <name>Sakai release Site</name>
            <url>${url.localsite}</url>
        </site>
</distributionManagement>

Dependency Management

Code Block

	xml
	xml


<dependencyManagement>
        <dependencies>
            <dependency>
                <groupId>${project.groupId}</groupId>
                <artifactId>emailtemplateservice-api</artifactId>
                <version>${project.version}</version>
                <scope>provided</scope>
            </dependency>
            <dependency>
                <groupId>${project.groupId}</groupId>
                <artifactId>emailtemplateservice-impl</artifactId>
                <version>${project.version}</version>
            </dependency>
        </dependencies>
</dependencyManagement>

Child poms:

Impl

Code Block

	xml
	xml


<dependencies>
        <dependency>
        	<groupId>${project.groupId}</groupId>
        	<artifactId>emailtemplateservice-api</artifactId>
        </dependency>
</dependencies>

Impl: accomodate change from <parent> master to purepom:

Code Block

	xml
	xml


<dependency>
            <groupId>net.sf.ehcache</groupId>
            <artifactId>ehcache</artifactId>
            <version>${sakai.ehcache.version}</version>
            <scope>provided</scope>
</dependency>

Code Block

	xml
	xml


<dependency>
            <groupId>net.sf.ehcache</groupId>
            <artifactId>ehcache</artifactId>
</dependency>

Reporting

Code Block

	xml
	xml


<reporting>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
                <reportSets>
                  <reportSet>
                    <id>aggregate</id>
                    <configuration>
                      <aggregate>true</aggregate>
                          <source>1.5</source>
                      <encoding>UTF-8</encoding>
                        <links>
                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
                        <link>http://java.sun.com/products/servlet/2.3/javadoc/</link>
                      </links>
                      <breakiterator>true</breakiterator>
                      <verbose>false</verbose>
                      <maxmemory>512m</maxmemory>
                      <additionalJOption>
                        -J-Xms168m -J-Xmx512m -J-XX:PermSize=128m -J-XX:NewSize=64m
                      </additionalJOption>
                    </configuration>
                    <reports>
                      <report>aggregate</report>
                    </reports>
                  </reportSet>
                </reportSets>   
            </plugin>
        </plugins>
    </reporting>

Assembly: base pom

Code Block

	xml
	xml


<modules>
        <module>api</module>
        <module>assembly</module>
        <module>impl/logic</module>
        <module>pack</module>
        <module>tool</module>
    </modules>

h3 Assembly: pom

Code Block

	xml
	xml


<?xml version="1.0"?>
<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/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <parent>
        <groupId>org.sakaiproject.emailtemplateservice</groupId>
  <id>sakai-maven2</id>      <artifactId>emailtemplateservice</artifactId>
      <name>Sakai Maven Repository</name><version>0.4-SNAPSHOT</version>
    </parent>

    <name>Sakai emailtemplate <layout>default</layout>
     Assembly (emailtemplateservice-assembly)</name>
      <url>http://source<groupId>org.sakaiproject.orgemailtemplateservice</maven2</url>groupId>
    <artifactId>emailtemplateservice-assembly</artifactId>
    <packaging>pom</packaging>

 <releases>   <dependencies>
        <dependency>
    <enabled>true</enabled>        <groupId>${project.groupId}</groupId>
    </releases>        <artifactId>emailtemplateservice-api</artifactId>
    <snapshots>        <version>${project.version}</version>
        <enabled>false</enabled>    <scope>compile</scope>
        </snapshots>dependency>
        <dependency>
</repository>         <repository>   <groupId>${project.groupId}</groupId>
         <id>sakai-maven2-snapshots</id>   <artifactId>emailtemplateservice-impl</artifactId>
         <name>Sakai Maven Repo Snapshots</name> <version>${project.version}</version>
            <layout>default<<scope>compile</layout>scope>
            <url>http://source.sakaiproject.org/maven2-snapshots</url></dependency>
        <dependency>
        <releases>    <groupId>${project.groupId}</groupId>
            <enabled>false<<artifactId>emailtemplateservice-pack</enabled>artifactId>
            <version>${project.version}</releases>version>
            <snapshots><type>war</type>
            <!-- <type>sakai-component</type> -->
 <enabled>true</enabled>             <<scope>compile</snapshots>scope>
        </repository>dependency>
        <dependency>
    <repository>        <groupId>${project.groupId}</groupId>
    <id>default</id>        <artifactId>emailtemplateservice-tool</artifactId>
    <name>Maven Repository Switchboard</name>      <version>${project.version}</version>
      <layout>default</layout>      <type>war</type>
      <url>http://repo1.maven.org/maven2</url>      <scope>compile</scope>
      <releases>  </dependency>
    </dependencies>

    <build>
   <enabled>true</enabled>     <pluginManagement>
       </releases>     <plugins>
       <snapshots>         <plugin>
       <enabled>false</enabled>             </snapshots><groupId>org.apache.maven.plugins</groupId>
        </repository> </repositories>

Distribution management

Code Block

xml

 <distributionManagement>         <downloadUrl>http://source.sakaiproject.org/maven2/</downloadUrl><artifactId>maven-assembly-plugin</artifactId>
           <snapshotRepository>         <version>2.2-beta-2</version>
   <uniqueVersion>false</uniqueVersion>             <id>sakai-maven-snapshots-scp</id></plugin>
                <plugin>
     <name>Sakai snapshot Repo</name>             <url>scp://source.sakaiproject.org/var/www/html/maven2-snapshots</url><groupId>org.apache.maven.plugins</groupId>
              <layout>default</layout>      <artifactId>maven-install-plugin</artifactId>
  </snapshotRepository>         <repository>         <version>2.2</version>
   <uniqueVersion>false</uniqueVersion>             <id>sakai-maven2-scp</id></plugin>
            </plugins>
  <name>Sakai maven2 repository</name>    </pluginManagement>
        <url>scp://source.sakaiproject.org/var/www/html/maven2</url><plugins>
            <plugin>
  <layout>default</layout>         </repository>     <artifactId>maven-assembly-plugin
   <site>             <id>sakai-site</id></artifactId>
                <configuration>
   <name>Sakai release Site</name>             <url>${url.localsite}</url>  <descriptors>
      </site> </distributionManagement>

Dependency Management

Code Block

xml


<dependencyManagement>            <dependencies>     <descriptor>src/main/assembly/deploy.xml
       <dependency>                 <groupId>${project.groupId}</groupId>descriptor>
                    <artifactId>emailtemplateservice-api<</artifactId>descriptors>
                <version>${project.version}</version>configuration>
                <executions>
  <scope>provided</scope>             </dependency>     <execution>
       <dependency>                 <groupId>${project.groupId}</groupId>
       <id>make-assembly</id> <!-- this is used for inheritance merges -->
        <artifactId>emailtemplateservice-impl</artifactId>                 <version>${project.version}</version>
  <phase>package</phase> <!-- append to the packaging phase. -->
         </dependency>         </dependencies> </dependencyManagement>

Reporting

Code Block

xml


<reporting>     <goals>
      <plugins>             <plugin>         <goal>attached</goal>
       <groupId>org.apache.maven.plugins</groupId>                 <artifactId>maven-javadoc-plugin</artifactId></goals>
                <reportSets>    </execution>
              <reportSet>  </executions>
            </plugin>
     <id>aggregate</id>   </plugins>
    </build>
     </project>

h3 Assembly: deploy.xml

Code Block

	xml
	xml


<?xml version="1.0"?>
<assembly>
    <id>tomcat-overlay</id>
 <configuration>   <formats>
        <format>zip</format>
    </formats>
     <aggregate>true<<includeBaseDirectory>false</aggregate>includeBaseDirectory>
    <dependencySets>
        <dependencySet>
            <source>1.5</source><outputDirectory>shared/lib/</outputDirectory>
            <useTransitiveDependencies>false
         <encoding>UTF-8</encoding>             </useTransitiveDependencies>
           <links> <includes>
                <include>org.sakaiproject.emailtemplateservice:emailtemplateservice-api:jar:*</include>
      <link>http://java.sun.com/j2se/1.5.0/docs/api</link>      </includes>
            <unpack>false</unpack>
     <link>http://java.sun.com/products/servlet/2.3/javadoc/</link>   </dependencySet>
        <dependencySet>
             </links><outputDirectory>components/emailtemplateservice-pack</outputDirectory>
            <useTransitiveDependencies>false</useTransitiveDependencies>
         <breakiterator>true</breakiterator>   <includes>
                <include>org.sakaiproject.emailtemplateservice:emailtemplateservice-pack:war:*</include>
  <verbose>false</verbose>          </includes>
            <maxmemory>512m</maxmemory><unpack>true</unpack>
        </dependencySet>
        <dependencySet>
           <additionalJOption> <outputDirectory>webapps/</outputDirectory>
            <outputFileNameMapping>${artifact.artifactId}.war</outputFileNameMapping>
          -J-Xms168m -J-Xmx512m -J-XX:PermSize=128m -J-XX:NewSize=64m <useTransitiveDependencies>false</useTransitiveDependencies>
            <includes>
          </additionalJOption>        <include>org.sakaiproject.emailtemplateservice:emailtemplateservice-tool:war:*</include>
            </configuration>includes>
            <unpack>false</unpack>
       <reports> </dependencySet>
    </dependencySets>
    <fileSets>
        <fileSet>
  <report>aggregate</report>          <outputDirectory></outputDirectory>
          </reports>  <includes>
                <include>${project.basedir}/README*</reportSet>
   include>
            </reportSets>   
 includes>
          </plugin>
   fileSet>
    </plugins>
 fileSets>
  </reporting>assembly>

Versions Compared

Old Version 12

New Version Current

Key

Properties

scm

Repositories (minimum listing)

Distribution management

Dependency Management

Reporting

Assembly: base pom

Distribution management

Dependency Management

Reporting