Page Comparison

...

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


<reporting>
<dependency>
            <groupId>net.sf.ehcache</groupId>
            <plugins><artifactId>ehcache</artifactId>
            <plugin><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>
        <artifactId>emailtemplateservice</artifactId>
        <version>0.4-SNAPSHOT</version>
    </parent>

    <name>Sakai emailtemplate Assembly (emailtemplateservice-assembly)</name>
    <groupId>org.sakaiproject.emailtemplateservice</groupId>
    <artifactId>emailtemplateservice-assembly</artifactId>
    <packaging>pom</packaging>

    <dependencies>
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>emailtemplateservice-api</artifactId>
            <version>${project.version}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>emailtemplateservice-impl</artifactId>
            <version>${project.version}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>emailtemplateservice-pack</artifactId>
            <version>${project.version}</version>
            <type>war</type>
            <!-- <type>sakai-component</type> -->
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>emailtemplateservice-tool</artifactId>
            <version>${project.version}</version>
            <type>war</type>
            <scope>compile</scope>
        </dependency>
    </dependencies>

    <build>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-assembly-plugin</artifactId>
     <groupId>org.apache.maven.plugins</groupId>                 <artifactId>maven-javadoc-plugin</artifactId><version>2.2-beta-2</version>
                </plugin>
<reportSets>                <plugin>
  <reportSet>                  <groupId>org.apache.maven.plugins</groupId>
  <id>aggregate</id>                  <artifactId>maven-install-plugin</artifactId>
  <configuration>                  <version>2.2</version>
    <aggregate>true</aggregate>            </plugin>
            </plugins>
 <source>1.5</source>       </pluginManagement>
        <plugins>
      <encoding>UTF-8</encoding>      <plugin>
                <artifactId>maven-assembly-plugin
 <links>               </artifactId>
           <link>http://java.sun.com/j2se/1.5.0/docs/api</link>     <configuration>
                   <link>http://java.sun.com/products/servlet/2.3/javadoc/</link> <descriptors>
                        </links><descriptor>src/main/assembly/deploy.xml
                        <breakiterator>true</breakiterator></descriptor>
                    </descriptors>
         <verbose>false</verbose>       </configuration>
               <maxmemory>512m</maxmemory> <executions>
                    <execution>
<additionalJOption>                        <id>make-assembly</id> <!-J-Xms168m- this is used for inheritance merges -J-Xmx512m -J-XX:PermSize=128m -J-XX:NewSize=64m>
                        <<phase>package</additionalJOption>phase> <!-- append to the packaging phase. -->
             </configuration>           <goals>
         <reports>                   <goal>attached</goal>
   <report>aggregate</report>                     </reports>goals>
                    </reportSet>execution>
                </reportSets>   executions>
            </plugin>
        </plugins>
    </build>
</reporting>project>

h3 Assembly: deploy.xml

Code Block

	xml
	xml

<?xml version="1.0"?>
<assembly>
    <id>tomcat-overlay</id>
    <formats>
        <format>zip</format>
    </formats>
    <includeBaseDirectory>false</includeBaseDirectory>
    <dependencySets>
        <dependencySet>
            <outputDirectory>shared/lib/</outputDirectory>
            <useTransitiveDependencies>false
            </useTransitiveDependencies>
            <includes>
                <include>org.sakaiproject.emailtemplateservice:emailtemplateservice-api:jar:*</include>
            </includes>
            <unpack>false</unpack>
        </dependencySet>
        <dependencySet>
            <outputDirectory>components/emailtemplateservice-pack</outputDirectory>
            <useTransitiveDependencies>false</useTransitiveDependencies>
            <includes>
                <include>org.sakaiproject.emailtemplateservice:emailtemplateservice-pack:war:*</include>
            </includes>
            <unpack>true</unpack>
        </dependencySet>
        <dependencySet>
            <outputDirectory>webapps/</outputDirectory>
            <outputFileNameMapping>${artifact.artifactId}.war</outputFileNameMapping>
            <useTransitiveDependencies>false</useTransitiveDependencies>
            <includes>
                 <include>org.sakaiproject.emailtemplateservice:emailtemplateservice-tool:war:*</include>
            </includes>
            <unpack>false</unpack>
        </dependencySet>
    </dependencySets>
    <fileSets>
        <fileSet>
            <outputDirectory></outputDirectory>
            <includes>
                <include>${project.basedir}/README*</include>
            </includes>
        </fileSet>
    </fileSets>
</assembly>

Versions Compared

Old Version 15

New Version Current

Key

Reporting

Assembly: base pom