diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml index 716be90e..c62d714a 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml @@ -4,6 +4,14 @@ Gabriele Columbro + + + Updated to Alfresco 3.2r artifacts + + + Updated to new Sourcesense repository + + Added full AMP lifecycle management diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml index a088a928..80848004 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml @@ -4,6 +4,14 @@ Gabriele Columbro + + + Updated to Alfresco 3.2r artifacts + + + Updated to new Sourcesense repository + + Added full AMP lifecycle management. diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml index 26154147..4a622bd9 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml @@ -199,7 +199,7 @@ - src/main/properties/${env}/ application.properties + src/main/properties/${env}/application.properties diff --git a/plugins/maven-nosnapshot-plugin/src/test/java/com/sourcesense/maven/plugins/test/StripTest.java b/plugins/maven-nosnapshot-plugin/src/test/java/com/sourcesense/maven/plugins/test/StripTest.java deleted file mode 100644 index 20c9f588..00000000 --- a/plugins/maven-nosnapshot-plugin/src/test/java/com/sourcesense/maven/plugins/test/StripTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.sourcesense.maven.plugins.test; - - -import java.io.File; - -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; - -import com.sourcesense.maven.StripMojo; - -public class StripTest extends org.apache.maven.plugin.testing.AbstractMojoTestCase { - - File testPom; - MavenProject project = new MavenProject(); - - protected void setUp() throws Exception { - // required for mojo lookups to work - super.setUp(); - - } - - /** - * tests the proper discovery and configuration of the mojo - * - * @throws Exception - */ - public void testMojoDefaultEnvironment() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/snapshot-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - assertNotNull( mojo ); - - } - - public void testSnapshotVersion() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/snapshot-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0-SNAPSHOT"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testReleaseCandidateVersion() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/relcandidate-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0-RC1"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testIdempotent() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/snapshot-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testUnderscore() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/underscore-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0_RC1"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testCustomPropName() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/customprop-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0-RC1"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - "foobar")); - } - -} diff --git a/pom.xml b/pom.xml index c1c66328..e4cac743 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,9 @@ Maven Alfresco Lifecycle support base project http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.sites/maven-alfresco-lifecycle - This project is meant to gather all commons configurations, plugins and archetypes - for the full Maven Alfresco lifecycle support +This project is meant to gather all commons configurations, plugins and archetypes for the full Maven Alfresco lifecycle support. +It gathers the latest stable versions of the different components that are used to support Alfresco development on Maven in enterprise and +community contexts. Google Code @@ -122,20 +123,10 @@ org.apache.maven.plugins maven-changes-plugin - - - - announcement-generate - - announcement-generate - - - - announcement-mail - - announcement-mail - - + + 2.2-patched + + announcements + + true ${smtp.server} ${smtp.port} - columbro@gmail.com + maven-alfresco@googlegroups.com + announce@maven.apache.org + alfresco-dev@lists.sourcesense.com ${smtp.username} ${smtp.password} + ${smtp.sslMode} columbro + ${project.url}/index.html @@ -161,8 +160,7 @@ clean package - deploy site-deploy changes:announcement-generate - changes:announcement-mail site-deploy + deploy changes:announcement-generate site-deploy changes:announcement-mail ${svn.tags.url} false diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7a1469aa..604d931a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -1,10 +1,13 @@ - Maven Alfresco Extension archetype - Gabriele Columbro + Maven Alfresco Lifecycle + Gabriele Columbro + + Linked all sub modules. + Added this wrapper project to group all Maven Alfresco plugins and archetype useful for the Maven Alfresco Lifecycle support diff --git a/src/main/resources/announcements/custom-announcement.vm b/src/main/resources/announcements/custom-announcement.vm new file mode 100644 index 00000000..f98b24d3 --- /dev/null +++ b/src/main/resources/announcements/custom-announcement.vm @@ -0,0 +1,131 @@ +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +The ${developmentTeam} is pleased to announce the ${finalName} release! + +${introduction} + +See all the different components at the following links: +- maven-alfresco-archetypes: ${project.url}/maven-alfresco-archetypes/index.html +- maven-amp-plugin: ${project.url}/plugins/maven-amp-plugin/index.html +- maven-nosnpashot-plugin: ${project.url}/plugins/maven-nosnapshot-plugin/index.html + + +#if ($release.getActions().size() == 0) +No changes defined in this version. +#else +Changes in this version include: + +#if ($release.getActions('add').size() !=0) +New features: +#foreach($actionItem in $release.getActions('add')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end + +#if ($release.getActions('fix').size() !=0) +Fixed Bugs: +#foreach($actionItem in $release.getActions('fix')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end + +#if ($release.getActions('update').size() !=0) +Changes: +#foreach($actionItem in $release.getActions('update')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end + +#if ($release.getActions('remove').size() !=0) +Removed: +#foreach($actionItem in $release.getActions('remove')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end +## End of main loop +#end +See also specific modules changes for the latest release: + +maven-alfresco-amp-archetype: ${project.url}/maven-alfresco-archetypes/maven-alfresco-amp-archetype/changes-report.html +maven-alfresco-extension-archetype: ${project.url}/maven-alfresco-archetypes/maven-alfresco-extension-archetype/changes-report.html +maven-amp-plugin: ${project.url}/plugins/maven-amp-plugin/changes-report.html + +#if ($urlDownload) + +For a manual installation, you can download the ${finalName} here: +${urlDownload} +#end +(due to some issues with the sites repo, if you experience issues in accessing pages with Firefox you might just need to reload the page) + +Have fun! +-${developmentTeam}