Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,704 Commits 84 Branches 96 Tags 108 MiB
Commit Graph

2615 Commits

Author SHA1 Message Date
Arnaud Héritier d92746dc25 Code cleanup - Maven requires Java 5+ : Replace for and while loops by for each 2013-06-11 22:21:54 +02:00
Arnaud Héritier 1f84f8f296 Code cleanup - Maven requires Java 5+ : Replace String.indexOf() by String.contains() 2013-06-11 22:19:20 +02:00
Arnaud Héritier 9e5183f0ad Code cleanup - Various code simplifications (tests, loops, …) 2013-06-11 22:09:51 +02:00
Arnaud Héritier c8e94a5b08 Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations 2013-06-11 21:58:50 +02:00
Arnaud Héritier 96db1abbe9 Code cleanup - Maven requires Java 5+ : Remove unnecessary boxing 2013-06-11 21:43:53 +02:00
Arnaud Héritier 143216f93a Fix misprint 2013-06-11 20:53:31 +02:00
Hervé Boutemy 4ec06bf67c default m-site-p plugin is 3.3 2013-06-02 12:40:38 +02:00
Jason van Zyl e1286aea83 [maven-release-plugin] prepare for next development iteration 2013-06-01 08:56:26 -04:00
Jason van Zyl c726cdd3a9 [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-06-01 08:56:20 -04:00
Hervé Boutemy ac64dd6bb6 [MNG-5482] detect missing Sonatype Aether classes to give a hint to 
AetherClassNotFound Wiki article
 2013-05-30 03:10:51 +02:00
rfscholte 4cc6a3fdef Fix Javadoc warnings 2013-05-28 23:29:01 +02:00
Stephen Connolly 85eed72eb1 In the canonical pom order, i.e. our pom.xml code style, <pluginManagement> comes before <plugins> 2013-05-28 10:49:38 +01:00
Stephen Connolly 348f716433 Add Apache RAT pluging configuration to exclude files that have a legitimate reason for being excluded 
- We should maybe review this list periodically, but to my mind there are legitimate reasons for excluding all of these files from the ASL license header requirements
 2013-05-28 10:37:02 +01:00
Stephen Connolly c6c6bdc49f Add ASL license header 2013-05-28 10:19:32 +01:00
Jason van Zyl 326303e22a [maven-release-plugin] prepare for next development iteration 2013-05-25 08:33:08 -04:00
Jason van Zyl 42b69f0b0a [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-25 08:33:02 -04:00
Jason van Zyl 00b9029094 [maven-release-plugin] prepare for next development iteration 2013-05-23 10:23:11 -04:00
Jason van Zyl 32d720ea0c [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-23 10:23:05 -04:00
Hervé Boutemy d7b31b3c90 reapplied commit 994a27d004 after Eclipse 
Aether merge:
removed code duplication: maven-core should use base
MavenRepositorySystemUtils provided by maven-aether-provider as a
basis before adding environment configuration instead of copy/paste
Aether configuration
 2013-04-09 08:27:06 +02:00
Jason van Zyl 95fbf6f445 [maven-release-plugin] prepare for next development iteration 2013-03-30 10:52:15 -04:00
Jason van Zyl 262b9bb1ef [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-03-30 10:52:10 -04:00
Jason van Zyl 08eab1953d o revert release plugin commits 2013-03-30 10:50:39 -04:00
Jason van Zyl 01c969e1eb [maven-release-plugin] prepare for next development iteration 2013-03-30 10:21:32 -04:00
Jason van Zyl 2decac4869 [maven-release-plugin] prepare release maven-3.1.0 2013-03-30 10:19:45 -04:00
Hervé Boutemy 42962fa281 code formatting 2013-03-30 09:37:11 +01:00
Kristian Rosenvold 973673721b [MNG-5456] Incorrect exception handling in parallel build 2013-03-30 07:00:05 +01:00
Jason van Zyl ebf2e4ddea Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into eclipse-aether 
Conflicts:
	.gitignore
	pom.xml
 2013-03-14 13:03:31 -07:00
Stuart McCulloch 2c2bf6e6e5 Use Eclipse/Sisu 0.0.0.M2 milestone 
Signed-off-by: Jason van Zyl <jason@tesla.io>
 2013-03-13 08:49:00 -04:00
Igor Fedorenko 9b58a3cfdc MNG-5444 fixed building MavenProject from ModelSource 
To maintain compatibility with (the extremely unlikely) existing
implementations of ModelSource, the new API methods are provided
via optional ModelSource2 interface. Updated javadoc to encourage
use of the new API.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
 2013-03-03 22:03:50 -05:00
rfscholte f6f4ef5e03 [MNG-3131] Error message is misleading if a missing plugin parameter is of a type like List 2013-03-01 16:14:22 +01:00
Jason van Zyl de40fe19a8 o update for changes in Aether APIs 2013-02-16 22:48:55 -05:00
rfscholte 56cd921fbd MNG-3131: Error message is misleading if a missing plugin parameter is of a type like List 2013-02-16 14:49:19 +01:00
Jason van Zyl 137cbd8a97 Merge branch 'trunk' into eclipse-aether 
Conflicts:
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
	maven-core/src/main/java/org/apache/maven/DefaultMaven.java
	maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
	maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
	maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
	pom.xml
	src/site/site.xml
 2013-02-14 22:08:26 -05:00
Jason van Zyl 27ad9858d2 Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 
Conflicts:
	.gitignore
	apache-maven/pom.xml
	maven-aether-provider/pom.xml
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenServiceLocator.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
	maven-artifact/pom.xml
	maven-compat/pom.xml
	maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
	maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
	maven-core/pom.xml
	maven-core/src/main/java/org/apache/maven/DefaultMaven.java
	maven-core/src/main/java/org/apache/maven/ReactorReader.java
	maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
	maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
	maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
	maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
	maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
	maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
	maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
	maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
	maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
	maven-embedder/pom.xml
	maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
	maven-model-builder/pom.xml
	maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
	maven-model/pom.xml
	maven-plugin-api/pom.xml
	maven-plugin-api/src/main/mdo/plugin.mdo
	maven-plugin-api/src/site/apt/index.apt
	maven-repository-metadata/pom.xml
	maven-settings-builder/pom.xml
	maven-settings/pom.xml
	pom.xml
	src/site/site.xml
 2013-02-14 20:21:50 -05:00
Benjamin Bentmann 4fdcdbd262 Followed change to DependencyNode.getPremanaged*() 2013-02-10 19:11:11 +01:00
Hervé Boutemy 720bef7df7 [MNG-5181] renamed *simple* local repository *manager* to *legacy* local 
repository
 2013-02-09 15:43:00 +01:00
Hervé Boutemy 114c98f310 [MNG-5181] added a warning when enhanced local repository manager is 
disabled: this should be avoided
 2013-02-04 01:27:53 +01:00
Benjamin Bentmann b5e0532310 Updated for latest ConflictResolver 2013-02-03 20:44:44 +01:00
Hervé Boutemy 5d06bc6a25 fixed typo 2013-02-02 16:59:20 +01:00
Hervé Boutemy 71dd7f3d2a code formatting 2013-02-02 16:52:16 +01:00
Hervé Boutemy 7196f82ff2 improved javadoc 2013-02-02 09:40:06 +01:00
olivier lamy 27f8b0f81a [MNG-5185] [MNG-5181] 
add cli flag to be able to remove use of EnhancedLocalRepositoryManager.
 2013-02-01 00:35:46 +01:00
Kristian Rosenvold 176a85f43c Fixed line feeds, added .gitattributes 2013-01-29 16:27:02 +01:00
Benjamin Bentmann 3916201b98 Used improved conflict resolver 2012-12-29 22:25:25 +01:00
Hervé Boutemy 3849bbd46a fixed errors reported by Checkstyle 2012-12-16 21:49:18 +01:00
Hervé Boutemy 915b1553f2 changed MavenModelMerger extensions visibility to protected to improve 
documentation
 2012-12-15 21:12:22 +01:00
Hervé Boutemy 87952bd073 added link to Plexus Classworlds 2012-12-12 17:37:03 +01:00
Hervé Boutemy 3d4a06c700 added ClassRealmManager entry point 2012-12-12 01:57:02 +01:00
Jason van Zyl c8536bf89f - make m2e happy on import 2012-12-08 19:30:57 -05:00
Hervé Boutemy d6544c4814 reverted change that got in previous commit by inadvertance 2012-12-08 17:47:12 +01:00
Hervé Boutemy 23bd8d98a6 added @since info 2012-12-08 16:05:37 +01:00
Anders Hammar f95ab2e7cd [MNG-5402] Better build number for git 
Signed-off-by: Anders Hammar <anders@hammar.net>
 2012-12-05 14:21:04 +01:00
Jason van Zyl 73e1445987 [maven-release-plugin] prepare for next development iteration 2012-12-03 19:58:46 -08:00
Jason van Zyl 618d12906d [maven-release-plugin] prepare release maven-3.1.0 2012-12-03 19:58:40 -08:00
Hervé Boutemy ac213ec571 [MNG-5245] updated maven-site-plugin to 3.2 2012-12-03 23:27:47 +01:00
Hervé Boutemy b63904c9db fixed errors reported by Checkstyle (once again...) 2012-12-03 02:21:58 +01:00
Hervé Boutemy 543870467f fixed errors reported by Checkstyle 2012-12-02 20:22:52 +01:00
Hervé Boutemy 71a8427df6 code formatting 2012-12-02 12:38:12 +01:00
Kristian Rosenvold 75ea1e4297 [MNG-5208] Parallel (-T option) multi module build fires wrong project failed event 
Patch by Stefan Eder , applied with minor modifications
 2012-12-02 11:05:37 +01:00
Hervé Boutemy fee1640d65 [MNG-5395] don't inject DefaultMavenPluginManager's logger into Mojos 
but create a dedicated logger with Mojo implementation name
 2012-12-01 04:27:23 +01:00
Kristian Rosenvold a278bec9d3 o Fixed another super-subtle classloader leak 2012-11-30 11:46:23 +01:00
Kristian Rosenvold 2103c82d57 o Changed array to atomicreference since arrays are not thread-safe 2012-11-30 07:33:31 +01:00
Jason van Zyl 97e8ae2737 - wind this back to version 2.2 2012-11-29 08:47:44 -08:00
Jason van Zyl fcffe3c9d5 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413481 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-26 05:07:28 +00:00
Jason van Zyl 29c9b29f68 [maven-release-plugin] prepare release maven-3.1.0 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413479 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-26 05:07:15 +00:00
Herve Boutemy 614e7bd173 separate SLF4J export from JSR-330 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413416 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 21:02:47 +00:00
Jason van Zyl d3756b95cc MNG-5381: Restore MavenSession.getRepositoryCache() for Tycho users so they are not forced to upgrade to 3.1 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413391 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 19:09:44 +00:00
Jason van Zyl b5f1798f2d - revert the release as we're missing MNG-5381 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413389 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 19:07:27 +00:00
Jason van Zyl 84b15b971b [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413381 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 17:59:53 +00:00
Jason van Zyl 7815ab87ad [maven-release-plugin] prepare release maven-3.1.0 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413379 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 17:59:36 +00:00
Herve Boutemy 9009b8f858 fixed errors reported by Checkstyle 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413335 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 11:04:16 +00:00
Jason van Zyl 451c43152b cleanup of the class realm purging 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413287 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 03:12:49 +00:00
Benson Margulies 1d4d1df865 MNG-5387: Add ability to replace an artifact in mid-build 
o change MavenProject#addArtifact to use the *last* version of a given artifact passed to it instead of the first.
o add comments.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413286 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 02:26:42 +00:00
Herve Boutemy 4e52800a1b [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when building MavenProject (still need to check if content is not trimmed when injected into plugin) 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412310 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-21 21:36:19 +00:00
Kristian Rosenvold b766d34b70 [MNG-5245] Update maven plugin versions 
- components.xml
  - maven-clean-plugin up to 2.5
  - maven-site-plugin up to 3.1
- default-bindings.xml
  - maven-install-plugin up to 2.4
  - maven-resources-plugin up to 2.6
  - maven-compiler-plugin up to 2.5.1
  - maven-surefire-plugin up to 2.12.4
  - maven-jar-plugin up to 2.4
  - maven-plugin-pugin up to 3.2
  - maven-war-plugin up to 2.3
  - maven-ear-plugin up to 2.8

Author:    Karl Heinz Marbaise <info@soebes.de>

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410570 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-16 21:09:49 +00:00
Herve Boutemy a8a59d6e13 fixed typo 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407893 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 22:15:18 +00:00
Herve Boutemy 994a27d004 removed code duplication: maven-core can use base MavenRepositorySystemSession provided by maven-aether-provider as a basis before adding environment configuration 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407851 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 17:14:21 +00:00
Herve Boutemy 13bb4ba1be removed dead code 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407835 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 15:26:34 +00:00
Herve Boutemy 09750f1a78 generics 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407834 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 15:25:30 +00:00
Herve Boutemy 3cbed6a1ca [MNG-5372] removed RepositoryCache, added in 3.0-alpha-3 and deprecated in 3.0-beta-3 with Aether integration (r988749) 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407827 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 15:04:20 +00:00
Herve Boutemy 6c032edddb |MNG-5370] moved plugin bindings to default lifecycle configuration to default-bindings.xml to let only artifact handlers configuration in artifact-handlers.xml 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407821 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 14:21:58 +00:00
Herve Boutemy 3bab630d58 little explanation improvement 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407757 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 11:04:38 +00:00
Herve Boutemy 4758085459 ordering 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402784 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-27 11:54:00 +00:00
Herve Boutemy 98944027a5 removed unused @SuppresWarnings 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402781 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-27 11:24:12 +00:00
Herve Boutemy 9a2b77d8be fixed warnings 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402780 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-27 11:15:58 +00:00
Herve Boutemy 390122c170 restore Java 5 API compatibility 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402776 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-27 10:19:32 +00:00
Barrie Treloar 0dca478eb8 [MNG-5162] Maven stuck on downloading dependencies when using java 7. 
A ConnectException references https://cwiki.apache.org/confluence/display/MAVEN/ConnectException

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1401982 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-25 05:42:39 +00:00
Herve Boutemy 9f28c88bc9 improved message 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1400382 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-20 07:37:40 +00:00
Herve Boutemy 23097a37a0 [MNG-5350] improved warning message: when in debug mode, list the goals and not only the plugins 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1398044 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-14 09:46:54 +00:00
Herve Boutemy 49d8d172d9 next version will be 3.1 (Jira updated accordingly: 3.1 renamed to 3.2) 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1395257 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-07 09:14:21 +00:00
Benjamin Bentmann 42536ce88f Accounted for refactoring of aether-api 2012-09-30 17:37:09 +02:00
Herve Boutemy 12632512dd added a link to Maven component (*THE* core :) ) 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391791 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 12:13:08 +00:00
Herve Boutemy 6215e507a5 added generics 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391579 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-28 18:02:20 +00:00
Benjamin Bentmann 2838745156 o Accounted for refactoring of aether-api 2012-09-17 00:05:23 +02:00
Herve Boutemy 3501485ed2 fixed typo 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1382585 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-09 21:46:28 +00:00
Jason van Zyl 6e901c5797 o Enabled support and discovery of JSR-330 components 
o Added Slf4j logger factory to support generic JSR-330 logging

o Exported Guice package for components that access Guice (or better it's injector) directly

Widen export of Guice packages (not ideal, need to look into ways to avoid this)

o use specific exports

o for now we will attempt to hide all of Guice in plugin realms and we'll do a bit of testing

closes #3

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1380105 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-03 01:07:31 +00:00
Herve Boutemy e82f1ca7b4 added a reference item for artifact handlers 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1380040 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-02 19:43:23 +00:00
Herve Boutemy 6d48f251e4 added missing license header 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1372515 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-13 17:07:29 +00:00
Herve Boutemy 19924774d9 added default artifact handlers reference documentation 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1372514 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-13 17:06:44 +00:00
Olivier Lamy aa7d0a5985 [MNG-5245] default plugin version surefire to 2.12.1 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1369644 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-05 19:15:41 +00:00