maven-surefire git commit: JDK 5 should be the min requirements in surefire project
Repository: maven-surefire
Updated Branches:
refs/heads/master f003abd6f - 4c07642ad
JDK 5 should be the min requirements in surefire project
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4c07642a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4c07642a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4c07642a
Branch: refs/heads/master
Commit: 4c07642adb892c2b8a34d8640fa6d571fbe84775
Parents: f003abd
Author: Tibor17 tibo...@lycos.com
Authored: Sat Dec 27 00:16:35 2014 +0100
Committer: Tibor17 tibo...@lycos.com
Committed: Sat Dec 27 00:16:35 2014 +0100
--
maven-failsafe-plugin/pom.xml| 5 -
maven-surefire-plugin/pom.xml| 5 -
maven-surefire-report-plugin/pom.xml | 5 -
3 files changed, 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4c07642a/maven-failsafe-plugin/pom.xml
--
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 8d55eac..16ae10d 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -215,11 +215,6 @@
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugin-plugin/artifactId
version${mavenPluginPluginVersion}/version
-configuration
- requirements
-jdk1.4/jdk
- /requirements
-/configuration
/plugin
/plugins
/reporting
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4c07642a/maven-surefire-plugin/pom.xml
--
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 2b1d440..c3f3fa7 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -129,11 +129,6 @@
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugin-plugin/artifactId
version${mavenPluginPluginVersion}/version
-configuration
- requirements
-jdk1.4/jdk
- /requirements
-/configuration
/plugin
/plugins
/reporting
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4c07642a/maven-surefire-report-plugin/pom.xml
--
diff --git a/maven-surefire-report-plugin/pom.xml
b/maven-surefire-report-plugin/pom.xml
index 96b3cbf..2a13789 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -164,11 +164,6 @@
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugin-plugin/artifactId
version${mavenPluginPluginVersion}/version
-configuration
- requirements
-jdk1.4/jdk
- /requirements
-/configuration
/plugin
/plugins
/reporting
maven-surefire git commit: [SUREFIRE-1128] Fix mvn 2.2.1 build process https://builds.apache.org/view/All/job/maven-surefire-mvn-2.2.1
Repository: maven-surefire
Updated Branches:
refs/heads/master 4c07642ad - 12d2c4b4a
[SUREFIRE-1128] Fix mvn 2.2.1 build process
https://builds.apache.org/view/All/job/maven-surefire-mvn-2.2.1
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/12d2c4b4
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/12d2c4b4
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/12d2c4b4
Branch: refs/heads/master
Commit: 12d2c4b4a44402f36fbc66ebabf1c400b5c6451a
Parents: 4c07642
Author: unknown digana.ti...@sk-za-04278.vsb
Authored: Fri Dec 26 21:35:50 2014 +0100
Committer: unknown digana.ti...@sk-za-04278.vsb
Committed: Sat Dec 27 11:07:16 2014 +0100
--
.../it/jetty-war-test-failing/invoker.properties | 3 +++
.../it/jetty-war-test-passing/invoker.properties | 3 +++
.../surefire/report/StatelessXmlReporterTest.java | 4 +++-
.../surefire-1055-parallelTestCount/pom.xml | 17 -
.../java/listeners/MarkAsFailureListener.java | 18 +-
5 files changed, 30 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
--
diff --git
a/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
b/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
index ab6608f..82e0bc1 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
@@ -17,3 +17,6 @@
# under the License.
#
invoker.buildResult=failure
+
+# build project if JRE version is 1.7 or higher
+invoker.java.version = 1.7+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
--
diff --git
a/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
b/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
index c56128f..dca9bcd 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
@@ -17,3 +17,6 @@
# under the License.
#
invoker.buildResult=success
+
+# build project if JRE version is 1.7 or higher
+invoker.java.version = 1.7+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
--
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
index 6c2982a..dad0ac2 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
@@ -60,6 +60,7 @@ public class StatelessXmlReporterTest
private final static String TEST_TWO = bTestMethod;
private final static String TEST_THREE = cTestMethod;
+@Override
protected void setUp()
throws Exception
{
@@ -71,7 +72,8 @@ public class StatelessXmlReporterTest
reporter.cleanTestHistoryMap();
}
-@Override protected void tearDown()
+@Override
+protected void tearDown()
throws Exception
{
super.tearDown();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
index 56f6457..d405a8c 100644
---
a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
+++
b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
@@ -20,9 +20,16 @@
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
+parent
+groupIdorg.apache.maven.surefire/groupId
+artifactIdit-parent/artifactId
+version1.0/version
+relativePath../pom.xml/relativePath
+/parent
+
groupIdfoo/groupId
artifactIdfoo/artifactId
-
svn commit: r1648045 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: hboutemy Date: Sat Dec 27 10:54:59 2014 New Revision: 1648045 URL: http://svn.apache.org/r1648045 Log: fixed build with mvn 2.2.1 Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1648045r1=1648044r2=1648045view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Dec 27 10:54:59 2014 @@ -120,18 +120,6 @@ under the License. scopeprovided/scope /dependency -!-- shared -- -dependency - groupIdorg.apache.maven.reporting/groupId - artifactIdmaven-reporting-api/artifactId - version3.0/version -/dependency -dependency - groupIdorg.apache.maven.reporting/groupId - artifactIdmaven-reporting-impl/artifactId - version2.3/version -/dependency - !-- doxia -- dependency groupIdorg.apache.maven.doxia/groupId @@ -171,6 +159,18 @@ under the License. /exclusions /dependency +!-- shared -- +dependency + groupIdorg.apache.maven.reporting/groupId + artifactIdmaven-reporting-api/artifactId + version3.0/version +/dependency +dependency + groupIdorg.apache.maven.reporting/groupId + artifactIdmaven-reporting-impl/artifactId + version2.3/version +/dependency + !-- plexus -- dependency groupIdorg.codehaus.plexus/groupId @@ -224,13 +224,19 @@ under the License. version1.52/version scopetest/scope exclusions - !-- wiremock brings slf4j 1.7.6, but maven-plugin-testing-harness brings 1.5.6 -- - exclusion - artifactIdslf4j-api/artifactId - groupIdorg.slf4j/groupId - /exclusion +!-- wiremock brings slf4j 1.7.6, but maven-plugin-testing-harness brings 1.5.6 -- +exclusion + groupIdorg.slf4j/groupId + artifactIdslf4j-api/artifactId +/exclusion /exclusions /dependency +dependency!-- wiremock requires 4.3.5 but Doxia brings 4.0.2 and httpcore 4.0.1 -- + groupIdorg.apache.httpcomponents/groupId + artifactIdhttpclient/artifactId + version4.3.5/version + scopetest/scope +/dependency /dependencies build
svn commit: r1648046 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
Author: khmarbaise
Date: Sat Dec 27 11:07:02 2014
New Revision: 1648046
URL: http://svn.apache.org/r1648046
Log:
Removed accidently added comment.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java?rev=1648046r1=1648045r2=1648046view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
Sat Dec 27 11:07:02 2014
@@ -37,9 +37,6 @@ import java.util.Set;
* @author a href=snic...@apache.orgStephane Nicoll/a
* @version $Id$
*/
-/**
- * @author kama
- */
public class JarModule
extends AbstractEarModule
{
svn commit: r1648051 - in /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear: AbstractEarMojo.java GenerateApplicationXmlMojo.java
Author: khmarbaise
Date: Sat Dec 27 12:55:58 2014
New Revision: 1648051
URL: http://svn.apache.org/r1648051
Log:
[MEAR-188] Project property cannot be resolved inside env-entry element
Introduced interpolation within the envEntries elements its no possible
having properties etc. within those elements.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1648051r1=1648050r2=1648051view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Sat Dec 27 12:55:58 2014
@@ -31,8 +31,10 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.ear.util.ArtifactTypeMappingService;
import org.apache.maven.plugin.ear.util.JavaEEVersion;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.filtering.MavenResourcesFiltering;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
@@ -159,6 +161,9 @@ public abstract class AbstractEarMojo
@Parameter( defaultValue = ${project.build.directory}, required = true )
private File tempFolder;
+@Component
+private MavenResourcesFiltering mavenResourcesFiltering;
+
private ListEarModule earModules;
private ListEarModule allModules;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=1648051r1=1648050r2=1648051view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
Sat Dec 27 12:55:58 2014
@@ -19,6 +19,12 @@ package org.apache.maven.plugin.ear;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.ear.util.JavaEEVersion;
@@ -28,14 +34,13 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.Interpolator;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.StringSearchInterpolator;
+import org.codehaus.plexus.interpolation.ValueSource;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
/**
* Generates the EAR deployment descriptor file(s).
*
@@ -44,7 +49,7 @@ import java.util.List;
*/
// CHECKSTYLE_OFF: LineLength
@Mojo( name = generate-application-xml, defaultPhase =
LifecyclePhase.GENERATE_RESOURCES, threadSafe = true,
requiresDependencyResolution = ResolutionScope.TEST )
-//CHECKSTYLE_ON: LineLength
+// CHECKSTYLE_ON: LineLength
public class GenerateApplicationXmlMojo
extends AbstractEarMojo
{
@@ -304,6 +309,28 @@ public class GenerateApplicationXmlMojo
}
/**
+ * This help method was needed otherwise the interpolate method of
interpolator will make an empty string of a
+ * {@code null} element which results in supplemental elements for
env-entry.
+ *
+ * @param interpolator The interpolator
+ * @param element The element
+ * @return The interpolated elements.
+ * @throws InterpolationException in case of an error.
+ */
+private String interpolate( Interpolator interpolator, String element )
+throws InterpolationException
+{
+if ( element == null )
+{
+return element;
+}
svn commit: r1648055 - in /maven/plugins/trunk/maven-ear-plugin/src: main/java/org/apache/maven/plugin/ear/ test/java/org/apache/maven/plugin/ear/it/ test/resources/projects/project-085/ test/resource
Author: khmarbaise
Date: Sat Dec 27 14:59:45 2014
New Revision: 1648055
URL: http://svn.apache.org/r1648055
Log:
[MEAR-181] Adding ejb-ref in application.xml
Added ejb-ref first implementation.
Added:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-085/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-085/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-085/expected-META-INF/application.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-085/pom.xml
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EnvEntry.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java?rev=1648055r1=1648054r2=1648055view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
Sat Dec 27 14:59:45 2014
@@ -130,6 +130,10 @@ final class ApplicationXmlWriter
{
envEntry.appendEnvEntry( writer );
}
+for ( EjbRef ejbEntry : context.getEjbEntries() )
+{
+ejbEntry.appendEjbRefEntry( writer );
+}
}
writer.endElement();
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java?rev=1648055r1=1648054r2=1648055view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
Sat Dec 27 14:59:45 2014
@@ -40,6 +40,8 @@ class ApplicationXmlWriterContext
private final ListSecurityRole securityRoles;
private final ListEnvEntry envEntries;
+
+private final ListEjbRef ejbEntries;
private final String displayName;
@@ -53,6 +55,7 @@ class ApplicationXmlWriterContext
public ApplicationXmlWriterContext( File destinationFile, ListEarModule
earModules,
ListSecurityRole securityRoles,
ListEnvEntry envEntries,
+ListEjbRef ejbEntries,
String displayName, String
description, String libraryDirectory,
String applicationName, Boolean
initializeInOrder )
{
@@ -60,6 +63,7 @@ class ApplicationXmlWriterContext
this.earModules = earModules;
this.securityRoles = securityRoles;
this.envEntries = envEntries;
+this.ejbEntries = ejbEntries;
this.displayName = displayName;
this.description = description;
this.libraryDirectory = libraryDirectory;
@@ -119,6 +123,16 @@ class ApplicationXmlWriterContext
}
/**
+ * Returns the list of {@link EjbRef}.
+ *
+ * @return the env-ref elements
+ */
+public ListEjbRef getEjbEntries()
+{
+return ejbEntries;
+}
+
+/**
* Returns the display name.
*
* @return the display name
Added:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java?rev=1648055view=auto
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java
(added)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java
Sat Dec 27 14:59:45 2014
@@ -0,0 +1,147 @@
+package org.apache.maven.plugin.ear;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or
svn commit: r1648057 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: khmarbaise
Date: Sat Dec 27 15:50:36 2014
New Revision: 1648057
URL: http://svn.apache.org/r1648057
Log:
Refactored code to get shorter methods.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1648057r1=1648056r2=1648057view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Sat Dec 27 15:50:36 2014
@@ -277,16 +277,7 @@ public class EjbMojo
File deploymentDescriptor = new File( outputDirectory, ejbJar );
/* test EJB version compliance */
-if ( !ejbVersion.matches( \\A[2-3]\\.[0-9]\\z ) )
-{
-throw new MojoExecutionException( ejbVersion is not valid: +
ejbVersion
-+ . Must be 2.x or 3.x (where x is a digit) );
-}
-
-if ( ejbVersion.matches( \\A2\\.[0-9]\\z )
!deploymentDescriptor.exists() )
-{
-throw new MojoExecutionException( Error assembling EJB: +
ejbJar + is required for ejbVersion 2.x );
-}
+ejbVersionCompliance( deploymentDescriptor );
try
{
@@ -306,20 +297,7 @@ public class EjbMojo
// EJB-34 Filter ejb-jar.xml
if ( filterDeploymentDescriptor )
{
-getLog().debug( Filtering deployment descriptor. );
-MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution();
-mavenResourcesExecution.setEscapeString( escapeString );
-ListFilterWrapper filterWrappers =
-mavenFileFilter.getDefaultFilterWrappers( project,
filters, escapeBackslashesInFilePath,
-
this.session, mavenResourcesExecution );
-
-// Create a temporary file that we can copy-and-filter
-File unfilteredDeploymentDescriptor = new File(
outputDirectory, ejbJar + .unfiltered );
-FileUtils.copyFile( deploymentDescriptor,
unfilteredDeploymentDescriptor );
-mavenFileFilter.copyFile( unfilteredDeploymentDescriptor,
deploymentDescriptor, true,
- filterWrappers, getEncoding(
unfilteredDeploymentDescriptor ) );
-// Remove the temporary file
-FileUtils.forceDelete( unfilteredDeploymentDescriptor );
+filterDeploymentDescriptor( deploymentDescriptor );
}
archiver.getArchiver().addFile( deploymentDescriptor, ejbJar );
}
@@ -361,74 +339,114 @@ public class EjbMojo
if ( generateClient )
{
-String clientJarName = jarName;
-if ( classifier != null )
-{
-clientJarName += - + classifier;
-}
+generateEjbClient();
+}
+}
-getLog().info( Building EJB client + clientJarName + -client
);
+private void generateEjbClient()
+throws MojoExecutionException
+{
+String clientJarName = jarName;
+if ( classifier != null )
+{
+clientJarName += - + classifier;
+}
-String[] excludes = DEFAULT_CLIENT_EXCLUDES;
-String[] includes = DEFAULT_INCLUDES;
+getLog().info( Building EJB client + clientJarName + -client );
-if ( clientIncludes != null !clientIncludes.isEmpty() )
-{
-includes = (String[]) clientIncludes.toArray( new
String[clientIncludes.size()] );
-}
+String[] excludes = DEFAULT_CLIENT_EXCLUDES;
+String[] includes = DEFAULT_INCLUDES;
-if ( clientExcludes != null !clientExcludes.isEmpty() )
-{
-excludes = (String[]) clientExcludes.toArray( new
String[clientExcludes.size()] );
-}
+if ( clientIncludes != null !clientIncludes.isEmpty() )
+{
+includes = (String[]) clientIncludes.toArray( new
String[clientIncludes.size()] );
+}
-File clientJarFile = new File( basedir, clientJarName +
-client.jar );
+if ( clientExcludes != null !clientExcludes.isEmpty() )
+{
+excludes = (String[]) clientExcludes.toArray( new
String[clientExcludes.size()] );
+}
-MavenArchiver clientArchiver = new MavenArchiver();
+File clientJarFile = new File( basedir, clientJarName + -client.jar
);
-
svn commit: r1648059 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: khmarbaise Date: Sat Dec 27 15:54:24 2014 New Revision: 1648059 URL: http://svn.apache.org/r1648059 Log: Fixed warning based on missing type. Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1648059r1=1648058r2=1648059view=diff == --- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original) +++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Sat Dec 27 15:54:24 2014 @@ -231,7 +231,7 @@ public class EjbMojo * @since 2.3 */ @Parameter -private List filters; +private ListString filters; /** * @since 2.3
svn commit: r1648062 - in /maven/plugins/trunk/maven-ejb-plugin/src: main/java/org/apache/maven/plugin/ejb/EjbMojo.java test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Author: khmarbaise
Date: Sat Dec 27 16:10:33 2014
New Revision: 1648062
URL: http://svn.apache.org/r1648062
Log:
Polished code.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1648062r1=1648061r2=1648062view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Sat Dec 27 16:10:33 2014
@@ -94,7 +94,7 @@ public class EjbMojo
* You can define the location of codeejb-jar.xml/code file.
*/
@Parameter( property = ejb.ejbJar, defaultValue = META-INF/ejb-jar.xml
)
-// The initalization is needed to get the unit tests running which seemed
to lack lookup for the defaultValue.
+// The initialization is needed to get the unit tests running which seemed
to lack lookup for the defaultValue.
private String ejbJar = META-INF/ejb-jar.xml;
/**
@@ -277,7 +277,7 @@ public class EjbMojo
File deploymentDescriptor = new File( outputDirectory, ejbJar );
/* test EJB version compliance */
-ejbVersionCompliance( deploymentDescriptor );
+checEJBVersionCompliance( deploymentDescriptor );
try
{
@@ -415,7 +415,7 @@ public class EjbMojo
}
}
-private void ejbVersionCompliance( File deploymentDescriptor )
+private void checEJBVersionCompliance( File deploymentDescriptor )
throws MojoExecutionException
{
if ( !ejbVersion.matches( \\A[2-3]\\.[0-9]\\z ) )
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java?rev=1648062r1=1648061r2=1648062view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Sat Dec 27 16:10:33 2014
@@ -19,6 +19,12 @@ package org.apache.maven.plugin.ejb;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.jar.JarFile;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.ejb.stub.MavenProjectResourcesStub;
import org.apache.maven.plugin.ejb.utils.JarContentChecker;
@@ -26,12 +32,6 @@ import org.apache.maven.plugin.testing.A
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.jar.JarFile;
-
-
/**
* EJB plugin Test Case
*/
@@ -183,10 +183,10 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, false );
-assertJarContent( project, new String[]{META-INF/MANIFEST.MF,
META-INF/ejb-jar.xml,
+assertJarContent( project, new String[] { META-INF/MANIFEST.MF,
META-INF/ejb-jar.xml,
META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml,
META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties,
org/sample/ejb/AppBean.class,
-org/sample/ejb/AppCMP.class, org/sample/ejb/AppSession.class},
null );
+org/sample/ejb/AppCMP.class, org/sample/ejb/AppSession.class
}, null );
}
/**
@@ -220,11 +220,12 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, true );
-assertClientJarContent( project, new String[]{META-INF/MANIFEST.MF,
-META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml,
-
META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties,
org/sample/ejb/AppStub.class},
- new String[]{META-INF/ejb-jar.xml,
org/sample/ejb/AppBean.class,
- org/sample/ejb/AppCMP.class,
org/sample/ejb/AppSession.class} );
+assertClientJarContent( project, new String[] { META-INF/MANIFEST.MF,
+
META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml,
+
META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties,
+org/sample/ejb/AppStub.class
svn commit: r1648069 - /maven/plugins/trunk/maven-deploy-plugin/src/site/apt/examples/deploy-ssh-external.apt
Author: michaelo Date: Sat Dec 27 16:55:13 2014 New Revision: 1648069 URL: http://svn.apache.org/r1648069 Log: [MDEPLOY-194] Deploy SSH external: copy and paste failure in POM snippet comment Modified: maven/plugins/trunk/maven-deploy-plugin/src/site/apt/examples/deploy-ssh-external.apt Modified: maven/plugins/trunk/maven-deploy-plugin/src/site/apt/examples/deploy-ssh-external.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/site/apt/examples/deploy-ssh-external.apt?rev=1648069r1=1648068r2=1648069view=diff == --- maven/plugins/trunk/maven-deploy-plugin/src/site/apt/examples/deploy-ssh-external.apt (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/site/apt/examples/deploy-ssh-external.apt Sat Dec 27 16:55:13 2014 @@ -45,7 +45,7 @@ Deployment of artifacts in an external S build extensions - !-- Enabling the use of FTP -- + !-- Enabling the use of SSH -- extension groupIdorg.apache.maven.wagon/groupId artifactIdwagon-ssh-external/artifactId
svn commit: r1648080 - in /maven/plugins/trunk/maven-javadoc-plugin/src/it: MJAVADOC-257/pom.xml MJAVADOC-259/src/main/java/com/mycompany/myapp/App.java MJAVADOC-262/src/main/java/com/mycompany/myapp/
Author: hboutemy
Date: Sat Dec 27 18:13:23 2014
New Revision: 1648080
URL: http://svn.apache.org/r1648080
Log:
fixed IT issues with JDK 8
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/src/main/java/com/mycompany/myapp/App.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/src/main/java/com/mycompany/myapp/App.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml?rev=1648080r1=1648079r2=1648080view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml Sat
Dec 27 18:13:23 2014
@@ -80,6 +80,15 @@
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-javadoc-plugin/artifactId
version@pom.version@/version
+configuration
+ tagletArtifacts
+tagletArtifact
+ groupIdorg.apache.maven.plugin-tools/groupId
+ artifactIdmaven-plugin-tools-javadoc/artifactId
+ version3.3/version
+/tagletArtifact
+ /tagletArtifacts
+/configuration
reportSets
reportSet
idaggregate/id
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/src/main/java/com/mycompany/myapp/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/src/main/java/com/mycompany/myapp/App.java?rev=1648080r1=1648079r2=1648080view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/src/main/java/com/mycompany/myapp/App.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/src/main/java/com/mycompany/myapp/App.java
Sat Dec 27 18:13:23 2014
@@ -22,7 +22,7 @@ package com.mycompany.myapp;
/**
* Hello world!
*
- * img src=doc-files/maven-feather.png alt=Maven/
+ * img src=doc-files/maven-feather.png alt=Maven
*/
public class App
{
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/src/main/java/com/mycompany/myapp/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/src/main/java/com/mycompany/myapp/App.java?rev=1648080r1=1648079r2=1648080view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/src/main/java/com/mycompany/myapp/App.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/src/main/java/com/mycompany/myapp/App.java
Sat Dec 27 18:13:23 2014
@@ -22,7 +22,7 @@ package com.mycompany.myapp;
/**
* Hello world!
*
- * img src=doc-files/maven-feather.png alt=Maven/
+ * img src=doc-files/maven-feather.png alt=Maven
*/
public class App
{
svn commit: r1648088 - /maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties
Author: hboutemy Date: Sat Dec 27 18:44:16 2014 New Revision: 1648088 URL: http://svn.apache.org/r1648088 Log: disabling error-prone compiler test with JDK 8: this should be tested in plexus-compiler Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties?rev=1648088r1=1648087r2=1648088view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties Sat Dec 27 18:44:16 2014 @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.7+ +invoker.java.version = 1.7 invoker.goals = clean compile invoker.buildResult = failure
Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG- [deleted] 1295d41c7
Git Push Summary
Repository: maven Updated Branches: refs/heads/maven-3.0.4-RCx [deleted] 63beaa103
svn commit: r1648121 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: khmarbaise
Date: Sat Dec 27 21:59:08 2014
New Revision: 1648121
URL: http://svn.apache.org/r1648121
Log:
Slight improvments.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1648121r1=1648120r2=1648121view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Sat Dec 27 21:59:08 2014
@@ -277,7 +277,7 @@ public class EjbMojo
File deploymentDescriptor = new File( outputDirectory, ejbJar );
/* test EJB version compliance */
-checEJBVersionCompliance( deploymentDescriptor );
+checkEJBVersionCompliance( deploymentDescriptor );
try
{
@@ -328,6 +328,7 @@ public class EjbMojo
}
// Handle the classifier if necessary
+// TODO: For 3.0 this should be changed having a separate classifier
for main artifact and ejb-client.
if ( classifier != null )
{
projectHelper.attachArtifact( project, ejb, classifier, jarFile
);
@@ -352,7 +353,8 @@ public class EjbMojo
clientJarName += - + classifier;
}
-getLog().info( Building EJB client + clientJarName + -client );
+String resultingClientJarNameWithClassifier = clientJarName +
-client;
+getLog().info( Building EJB client +
resultingClientJarNameWithClassifier );
String[] excludes = DEFAULT_CLIENT_EXCLUDES;
String[] includes = DEFAULT_INCLUDES;
@@ -367,7 +369,7 @@ public class EjbMojo
excludes = (String[]) clientExcludes.toArray( new
String[clientExcludes.size()] );
}
-File clientJarFile = new File( basedir, clientJarName + -client.jar
);
+File clientJarFile = new File( basedir,
resultingClientJarNameWithClassifier + .jar );
MavenArchiver clientArchiver = new MavenArchiver();
@@ -405,6 +407,7 @@ public class EjbMojo
}
// TODO: shouldn't need classifer
+// TODO: For 3.0 this should be changed having a separate classifier
for main artifact and ejb-client.
if ( classifier != null )
{
projectHelper.attachArtifact( project, ejb-client, classifier +
-client, clientJarFile );
@@ -415,7 +418,7 @@ public class EjbMojo
}
}
-private void checEJBVersionCompliance( File deploymentDescriptor )
+private void checkEJBVersionCompliance( File deploymentDescriptor )
throws MojoExecutionException
{
if ( !ejbVersion.matches( \\A[2-3]\\.[0-9]\\z ) )
maven-wagon git commit: [WAGON-429] add the missing WagonScp.getTransfer() to support 2G file
Repository: maven-wagon
Updated Branches:
refs/heads/master bcaf7300d - dd623e806
[WAGON-429] add the missing WagonScp.getTransfer() to support 2G file
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/dd623e80
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/dd623e80
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/dd623e80
Branch: refs/heads/master
Commit: dd623e8069221940439c8d4dbc867be91c75885d
Parents: bcaf730
Author: dantran dant...@gmail.com
Authored: Sat Dec 27 15:35:38 2014 -0800
Committer: dantran dant...@gmail.com
Committed: Sat Dec 27 15:35:38 2014 -0800
--
.../wagon/providers/ssh/jsch/ScpWagon.java | 894 ++-
1 file changed, 451 insertions(+), 443 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/dd623e80/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
--
diff --git
a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
index 9ce7561..c5290b2 100644
---
a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
+++
b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
@@ -1,443 +1,451 @@
-package org.apache.maven.wagon.providers.ssh.jsch;
-
-/*
- * 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.
- */
-
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.JSchException;
-import org.apache.maven.wagon.CommandExecutionException;
-import org.apache.maven.wagon.InputData;
-import org.apache.maven.wagon.OutputData;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.events.TransferEvent;
-import org.apache.maven.wagon.providers.ssh.ScpHelper;
-import org.apache.maven.wagon.repository.RepositoryPermissions;
-import org.apache.maven.wagon.resource.Resource;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * SCP protocol wagon.
- * p/
- * Note that this implementation is inot/i thread-safe, and multiple
channels can not be used on the session at
- * the same time.
- * p/
- * See a href=http://blogs.sun.com/janp/entry/how_the_scp_protocol_works;
- * http://blogs.sun.com/janp/entry/how_the_scp_protocol_works/a
- * for information on how the SCP protocol works.
- *
- *
- * @todo [BP] add compression flag
- * @plexus.component role=org.apache.maven.wagon.Wagon
- * role-hint=scp
- * instantiation-strategy=per-lookup
- */
-public class ScpWagon
-extends AbstractJschWagon
-{
-private static final char COPY_START_CHAR = 'C';
-
-private static final char ACK_SEPARATOR = ' ';
-
-private static final String END_OF_FILES_MSG = E\n;
-
-private static final int LINE_BUFFER_SIZE = 8192;
-
-private static final byte LF = '\n';
-
-private ChannelExec channel;
-
-private InputStream channelInputStream;
-
-private OutputStream channelOutputStream;
-
-private void setFileGroup( RepositoryPermissions permissions, String
basedir, Resource resource )
-throws CommandExecutionException
-{
-if ( permissions != null permissions.getGroup() != null )
-{
-//executeCommand( chgrp -f + permissions.getGroup() + +
getPath( basedir, resource.getName() ) );
-executeCommand( chgrp -f + permissions.getGroup() + \ +
getPath( basedir, resource.getName() ) + \ );
-}
-}
-
-protected void cleanupPutTransfer( Resource resource )
-{
-if ( channel != null )
-{
-channel.disconnect();
-channel = null;
-}
-}
-
-protected void finishPutTransfer( Resource resource, InputStream input,
OutputStream output )
-
svn commit: r1648129 - in /maven/plugins/trunk/maven-ejb-plugin/src: it/reactor/sub/pom.xml main/java/org/apache/maven/plugin/ejb/EjbMojo.java test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Author: khmarbaise
Date: Sat Dec 27 23:35:16 2014
New Revision: 1648129
URL: http://svn.apache.org/r1648129
Log:
[MEJB-63] outputDirectory is treated differently to ear, war plugins
Now we have a sourceDirectory and a outputDirectory which behave the
way you expect them to behave.
The sourceDirectory contains those elements which will be archived
and the outputDirectory contains the created archives.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml?rev=1648129r1=1648128r2=1648129view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml Sat Dec 27
23:35:16 2014
@@ -44,7 +44,7 @@ under the License.
version@project.version@/version
configuration
!-- Note the relative path here --
- outputDirectorytarget/classes/outputDirectory
+ sourceDirectorytarget/classes/sourceDirectory
/configuration
/plugin
/plugins
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1648129r1=1648128r2=1648129view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Sat Dec 27 23:35:16 2014
@@ -67,16 +67,17 @@ public class EjbMojo
**/*Session.class, **/package.html };
/**
- * The directory for the generated EJB.
+ * The directory location for the generated EJB.
*/
@Parameter( defaultValue = ${project.build.directory}, required = true,
readonly = true )
-private File basedir;
+private File outputDirectory;
/**
- * Directory that resources are copied to during the build.
+ * Directory that contains the resources which are packaged into
+ * the created archive {@code target/classes}.
*/
-@Parameter( property = outputDirectory, defaultValue =
${project.build.outputDirectory} )
-private File outputDirectory;
+@Parameter( defaultValue = ${project.build.outputDirectory}, required =
true )
+private File sourceDirectory;
/**
* The name of the EJB file to generate.
@@ -254,11 +255,11 @@ public class EjbMojo
throws MojoExecutionException
{
-if ( !outputDirectory.exists() )
+if ( !sourceDirectory.exists() )
{
-getLog().warn( The created EJB jar will be empty cause the +
outputDirectory.getPath()
+getLog().warn( The created EJB jar will be empty cause the +
sourceDirectory.getPath()
+ did not exist. );
-outputDirectory.mkdirs();
+sourceDirectory.mkdirs();
}
if ( getLog().isInfoEnabled() )
@@ -266,7 +267,7 @@ public class EjbMojo
getLog().info( Building EJB + jarName + with EJB version +
ejbVersion );
}
-File jarFile = getEJBJarFile( basedir, jarName, classifier );
+File jarFile = getEJBJarFile( outputDirectory, jarName, classifier );
MavenArchiver archiver = new MavenArchiver();
@@ -274,7 +275,7 @@ public class EjbMojo
archiver.setOutputFile( jarFile );
-File deploymentDescriptor = new File( outputDirectory, ejbJar );
+File deploymentDescriptor = new File( sourceDirectory, ejbJar );
/* test EJB version compliance */
checkEJBVersionCompliance( deploymentDescriptor );
@@ -290,7 +291,7 @@ public class EjbMojo
mainJarExcludes = (String[]) excludes.toArray( new
String[excludes.size()] );
}
-archiver.getArchiver().addDirectory( outputDirectory,
DEFAULT_INCLUDES, mainJarExcludes );
+archiver.getArchiver().addDirectory( sourceDirectory,
DEFAULT_INCLUDES, mainJarExcludes );
if ( deploymentDescriptor.exists() )
{
@@ -369,7 +370,7 @@ public class EjbMojo
excludes = (String[]) clientExcludes.toArray( new
String[clientExcludes.size()] );
}
-File clientJarFile = new File( basedir,
resultingClientJarNameWithClassifier + .jar );
+File clientJarFile = new File( outputDirectory,
resultingClientJarNameWithClassifier + .jar );
svn commit: r1648130 - in /maven/plugins/trunk/maven-gpg-plugin/src: it/settings.xml main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
Author: dantran
Date: Sat Dec 27 23:45:59 2014
New Revision: 1648130
URL: http://svn.apache.org/r1648130
Log:
[MGPG-31] fix typos from previous commit
Modified:
maven/plugins/trunk/maven-gpg-plugin/src/it/settings.xml
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
Modified: maven/plugins/trunk/maven-gpg-plugin/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/it/settings.xml?rev=1648130r1=1648129r2=1648130view=diff
==
--- maven/plugins/trunk/maven-gpg-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/it/settings.xml Sat Dec 27
23:45:59 2014
@@ -58,7 +58,7 @@ under the License.
servers
server
- idgpg.passphase/id
+ idgpg.passphrase/id
passphraseTEST/passphrase
/server
/servers
Modified:
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java?rev=1648130r1=1648129r2=1648130view=diff
==
---
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
(original)
+++
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
Sat Dec 27 23:45:59 2014
@@ -62,8 +62,8 @@ public abstract class AbstractGpgMojo
* Server id to lookup the passphase under Maven settings.
* @since 1.6
*/
-@Parameter( property = gpg.passphaseServerKey, defaultValue =
gpg.passphase )
-private String passphaseServerKey;
+@Parameter( property = gpg.passphraseServerKey, defaultValue =
gpg.passphrase )
+private String passphraseServerKey;
/**
* The name of the key to sign with. Passed to gpg as
code--local-user/code.
@@ -213,7 +213,7 @@ public abstract class AbstractGpgMojo
{
if ( StringUtils.isEmpty( this.passphrase ) )
{
-Server server = this.settings.getServer( passphaseServerKey );
+Server server = this.settings.getServer( passphraseServerKey );
if ( server != null )
{
