Merge pull request #2 from rbierman/JENKINS-9693

[Fixed JENKINS-9693] maven.build.timestamp.format is not obeyed in maven builds
jenkinsci · Mar 1, 2014 · 8b8c85a · 8b8c85a
2 parents 142041f + 7005329
commit 8b8c85a
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/...3-interceptor/src/main/java/org/apache/maven/cli/DefaultMavenExecutionRequestBuilder.java b/...3-interceptor/src/main/java/org/apache/maven/cli/DefaultMavenExecutionRequestBuilder.java
@@ -90,8 +90,6 @@ public class DefaultMavenExecutionRequestBuilder
 
     private DefaultSecDispatcher dispatcher;
 
-    static final String DEFAULT_BUILD_TIMESTAMP_FORMAT = "yyyyMMdd-HHmm";
-
     public void initialize()
         throws InitializationException
     {
@@ -129,18 +127,6 @@ public MavenExecutionRequest getMavenExecutionRequest( String[] args, PrintStrea
             encryption( cliRequest );
 
             MavenExecutionRequest request = executionRequestPopulator.populateDefaults( cliRequest.request );
-
-            // TODO move this in ASF sources ?
-
-            if (request.getProjectBuildingRequest().getRepositorySession()== null)
-            {
-                MavenRepositorySystemSession session = new MavenRepositorySystemSession();
-                if (session.getLocalRepositoryManager() == null)
-                {
-                    session.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( request.getLocalRepositoryPath() ) );
-                }
-                request.getProjectBuildingRequest().setRepositorySession( session );
-            }
 
             return request;
         }
@@ -347,7 +333,6 @@ static void populateProperties( CommandLine commandLine, Properties systemProper
         }
 
         systemProperties.putAll( System.getProperties() );
-        systemProperties.put( "maven.build.timestamp", new SimpleDateFormat(DEFAULT_BUILD_TIMESTAMP_FORMAT).format( new Date() ) );
     }
 
     private static void setCliProperty( String property, Properties properties )