diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml index 25f7730c..0c18f61b 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml @@ -27,20 +27,14 @@ This archetype developed aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to - AMP builds, to be released as a different artifact ). Using standard m2 lifecycle commands (mvn compile package deploy) and generally - available plugins (cargo, release, assembly) we are able to cover a very high percentage of Alfresco lifecycle common use cases. It can be - used both with Maven2 and Ant build systems, but it must be clear that *only* the Maven2 approach provides all the automation features we will - describe in this website. In addition to that the m2 approach provides a zero-conf approach while ant requires (as usual) manual gathering and - selection of required alfresco libraries and webapp (please refer to README-ant.txt for further info about the Ant build). Last but not the - least, m2 build is more likely to be maintained and improved (especially in the likely case Alfresco moves to maven2). For more details on the - m2 apprach please refer instead to README Section (or directly and to README-m2.txt of the generated project). + AMP builds, to be released as a different artifact ). org.apache.maven.archetype archetype-packaging - 2.0-alpha-2 + 2.0 - + - + @@ -51,7 +51,7 @@ - + diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-share-archetype/pom.xml index 12fc5863..6c493d3d 100644 --- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-share-archetype/pom.xml @@ -17,13 +17,13 @@ org.apache.maven.archetype archetype-packaging - 2.0-alpha-4 + 2.0 maven-archetype-plugin - 2.0-alpha-4 + 2.0 true diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml index 595ae0d8..6f7091ce 100644 --- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml @@ -22,15 +22,15 @@ local - 3.2r + 3.4.a info 8081 - org.alfresco @@ -58,28 +58,28 @@ src/main/properties/${env}/application.properties - src/main/resources true - src/main/properties/${env} application.properties - alfresco/web-extension true diff --git a/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml index f22f49b1..d6fae32f 100644 --- a/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml @@ -18,13 +18,13 @@ org.apache.maven.archetype archetype-packaging - 2.0-alpha-4 + 2.0 maven-archetype-plugin - 2.0-alpha-4 + 2.0 true diff --git a/maven-alfresco-archetypes/pom.xml b/maven-alfresco-archetypes/pom.xml index c1dd3097..d8112ded 100644 --- a/maven-alfresco-archetypes/pom.xml +++ b/maven-alfresco-archetypes/pom.xml @@ -29,12 +29,13 @@ org.apache.maven.wagon wagon-http-shared - 1.0-beta-6-patched + 1.0 maven-archetype-plugin + 2.0 true diff --git a/plugins/maven-amp-plugin-test/pom.xml b/plugins/maven-amp-plugin-test/pom.xml index 6e4a3d39..0521d552 100755 --- a/plugins/maven-amp-plugin-test/pom.xml +++ b/plugins/maven-amp-plugin-test/pom.xml @@ -25,7 +25,7 @@ UTF-8 - 3.3-SNAPSHOT + 3.4.a 3.0.0.RELEASE 3.0.3-SNAPSHOT ${project.artifactId} @@ -39,6 +39,11 @@ provided community + + org.springframework + spring-context + 3.0.3.RELEASE + diff --git a/plugins/maven-amp-plugin/pom.xml b/plugins/maven-amp-plugin/pom.xml index e60267e7..790c029b 100644 --- a/plugins/maven-amp-plugin/pom.xml +++ b/plugins/maven-amp-plugin/pom.xml @@ -1,85 +1,100 @@ - - 4.0.0 - org.alfresco.maven.plugin - maven-amp-plugin - maven-plugin - Alfresco AMP Plugin - 3.0.3-SNAPSHOT - - org.alfresco - maven-alfresco-lifecycle - 1.1.1-SNAPSHOT - ../../pom.xml - - - This plugin defines a lifecycle for Alfresco ECM Modules packaging (.amp), handles AMP transitive dependencies from AMP and WAR projects, - providing a more enterprise oriented support alternative to the Alfresco MMT (module management tool) usage. It is used by - maven-alfresco-amp-archetype in order to package and test run an AMP and by the maven-alfresco-extension-archetype to depend transitively upon - AMPs and WARs. It is a modification of the org.apache.maven.plugins:maven-war-plugin of which it uses the whole core infrastructure. See - ${site.url} for more info - - - ${pom.description} - ${pom.url} - ${pom.groupId} - ${pom.artifactId} - ${pom.version} - ${svn.tags.url} - - - - columbro - Gabriele Columbro - gabriele.columbro@alfresco.com - - Alfresco - http://www.alfresco.com - - - rdanner - Russ Danner - - Rivet Logic - - + + 4.0.0 + org.alfresco.maven.plugin + maven-amp-plugin + maven-plugin + Alfresco AMP Plugin + 3.0.3-SNAPSHOT + + org.alfresco + maven-alfresco-lifecycle + 1.1.1-SNAPSHOT + ../../pom.xml + + + This plugin defines a lifecycle for Alfresco ECM Modules packaging (.amp), handles AMP transitive dependencies + from AMP and WAR projects, + providing a more enterprise oriented support alternative to the Alfresco MMT (module management tool) usage. It + is used by + maven-alfresco-amp-archetype in order to package and test run an AMP and by the + maven-alfresco-extension-archetype to depend transitively upon + AMPs and WARs. It is a modification of the org.apache.maven.plugins:maven-war-plugin of which it uses the whole + core infrastructure. See + ${site.url} for more info + + + ${project.description} + ${project.url} + ${project.groupId} + ${project.artifactId} + ${project.version} + ${svn.tags.url} + + + + columbro + Gabriele Columbro + gabriele.columbro@alfresco.com + + Alfresco + http://www.alfresco.com + + + rdanner + Russ Danner + + Rivet Logic + + - - - org.apache.maven - maven-plugin-api - 2.0.6 - - - org.apache.maven - maven-artifact - 2.0.6 - - - org.apache.maven - maven-archiver - 2.2 - - - org.codehaus.plexus - plexus-utils - 1.4.7 - - - com.thoughtworks.xstream - xstream - 1.2.2 - - - junit - junit - 3.8.1 - test - - - org.apache.maven.shared - maven-plugin-testing-harness - 1.1 - test - - + + + org.apache.maven + maven-plugin-api + 3.0.3 + + + org.apache.maven + maven-compat + 3.0-alpha-4 + + + org.apache.maven + maven-artifact + 3.0.3 + + + org.apache.maven + maven-project + 3.0-alpha-2 + + + org.apache.maven + maven-archiver + 2.4.1 + + + org.codehaus.plexus + plexus-interpolation + 1.13 + + + com.thoughtworks.xstream + xstream + 1.3.1 + + + junit + junit + 4.8.2 + test + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + 2.0-alpha-1 + test + + diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java index 8f983c5e..93b417dc 100644 --- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java +++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java @@ -282,7 +282,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo /** * The Jar archiver needed for archiving classes directory into jar file under WEB-INF/lib. * - * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}" + * @component role="${component.org.codehaus.plexus.archiver.Archiver#jar}" * @required */ private JarArchiver mJarArchiver; @@ -374,7 +374,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo /** * To look up Archiver/UnArchiver implementations * - * @parameter expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}" + * @component role="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}" * @required */ protected ArchiverManager mArchiverManager; diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java index ca81897f..2355d5b4 100644 --- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java +++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java @@ -28,7 +28,6 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProjectHelper; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.jar.ManifestException; -import org.codehaus.plexus.archiver.zip.ZipArchiver; import java.io.File; import java.io.IOException; @@ -229,8 +228,8 @@ public class AmpMojo extends AbstractAmpMojo * composes the full file name for the AMP and gets a file handle for that file * TODO: what happens when nulls are passed in * TODO: what does a null response mean? - * @param pBaseDir Base directory for AMP - * @param pFileName Final Name of AMP + * @param pBasedir Base directory for AMP + * @param pFinalName Final Name of AMP * @param pClassifier TODO: fill this in */ protected static File getAmpFile( File pBasedir, String pFinalName, String pClassifier ) @@ -263,8 +262,8 @@ public class AmpMojo extends AbstractAmpMojo protected void performPackaging(File pAmpFile) throws IOException, ArchiverException, - ManifestException, - DependencyResolutionRequiredException, + ManifestException, + DependencyResolutionRequiredException, MojoExecutionException, MojoFailureException { getLog().info( "Packaging Alfresco AMP (" + this.getAmpName() + ")" ); @@ -334,7 +333,7 @@ public class AmpMojo extends AbstractAmpMojo /** * The AMP archiver. - * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#amp}" + * @component role="${component.org.codehaus.plexus.archiver.Archiver}" roleHint="amp" * @required */ private AmpArchiver mAmpArchiver; diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AbstractAmpPackagingTask.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AbstractAmpPackagingTask.java index 4299c00b..6293a8f6 100644 --- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AbstractAmpPackagingTask.java +++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AbstractAmpPackagingTask.java @@ -263,11 +263,6 @@ public abstract class AbstractAmpPackagingTask unArchiver.setOverwrite( true ); unArchiver.extract(); } - catch ( IOException e ) - { - throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to[" + - unpackDirectory.getAbsolutePath() + "]", e ); - } catch ( ArchiverException e ) { throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to[" + diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/util/MappingUtils.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/util/MappingUtils.java index 5f1c24f2..af1a3141 100644 --- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/util/MappingUtils.java +++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/util/MappingUtils.java @@ -20,10 +20,12 @@ package org.alfresco.maven.plugin.amp.util; */ import org.apache.maven.artifact.Artifact; -import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource; -import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator; -import org.codehaus.plexus.util.interpolation.ValueSource; +import org.codehaus.plexus.interpolation.InterpolationException; +import org.codehaus.plexus.interpolation.RegexBasedInterpolator; +import org.codehaus.plexus.interpolation.ObjectBasedValueSource; +import org.codehaus.plexus.interpolation.ValueSource; +import java.util.List; import java.util.Properties; /** @@ -68,7 +70,11 @@ public class MappingUtils interpolator.addValueSource( new PropertiesInterpolationValueSource( classifierMask ) ); - value = interpolator.interpolate( value, "__artifact" ); + try { + value = interpolator.interpolate( value, "__artifact" ); + } catch (InterpolationException e) { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } return value; } @@ -90,6 +96,16 @@ public class MappingUtils return properties.getProperty( key ); } + @Override + public List getFeedback() { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public void clearFeedback() { + //To change body of implemented methods use File | Settings | File Templates. + } + } } diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java index 057830e8..9da815db 100644 --- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java +++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java @@ -61,7 +61,7 @@ public class AmpUnArchiver extends AbstractZipUnArchiver { @Override protected void execute() - throws ArchiverException, IOException + throws ArchiverException { getLogger().info( "Expanding: " + getSourceFile() + " into " + getDestDirectory() ); diff --git a/plugins/maven-nosnapshot-plugin/pom.xml b/plugins/maven-nosnapshot-plugin/pom.xml index 7deec602..bcb26ecb 100644 --- a/plugins/maven-nosnapshot-plugin/pom.xml +++ b/plugins/maven-nosnapshot-plugin/pom.xml @@ -16,23 +16,23 @@ org.apache.maven maven-plugin-api - 2.0 + 3.0.3 junit junit - 3.8.1 + 4.8.2 test org.apache.maven maven-project - 2.0.9 + 3.0-alpha-2 - org.apache.maven.shared + org.apache.maven.plugin-testing maven-plugin-testing-harness - 1.0-beta-1 + 2.0-alpha-1 test diff --git a/pom.xml b/pom.xml index cedfb534..84985b80 100644 --- a/pom.xml +++ b/pom.xml @@ -32,13 +32,14 @@ community contexts. These redundancies are due to filtering issues of Maven. See here http://maven.apache.org/plugins/maven-site-plugin/usage.html --> - ${pom.description} + ${project.description} ${project.url} ${project.groupId} ${project.artifactId} ${project.version} ${svn.tags.url} ${project.url} + UTF-8 scm:svn:https://maven-alfresco-archetypes.googlecode.com/svn/trunk @@ -122,22 +123,20 @@ community contexts. maven-compiler-plugin + 2.3.2 - 1.5 - 1.5 + 1.6 + 1.6 maven-site-plugin - 2.0.1 + 3.0 org.apache.maven.plugins maven-changes-plugin - - 2.2-patched + 2.6 - true ${smtp.server} ${smtp.port} @@ -181,7 +178,7 @@ community contexts. org.apache.maven.wagon wagon-webdav-jackrabbit - 1.0-beta-6 + 1.0 @@ -189,13 +186,15 @@ community contexts. maven-compiler-plugin + 2.3.2 - 1.5 - 1.5 + 1.6 + 1.6 maven-surefire-plugin + 2.9 @@ -206,13 +205,11 @@ community contexts. maven-javadoc-plugin - - - org.codehaus.mojo - jxr-maven-plugin + 2.8 maven-changes-plugin + 2.6