/[Apache-SVN]/maven/components/tags/maven-2.0.9/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
ViewVC logotype

Log of /maven/components/tags/maven-2.0.9/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 645582 - (view) (annotate) - [select for diffs]
Modified Mon Apr 7 16:02:54 2008 UTC (19 months, 2 weeks ago) by brianf
File length: 6401 byte(s)
Diff to previous 641419 (colored)
[maven-release-plugin]  copy for tag maven-2.0.9

Revision 641419 - (view) (annotate) - [select for diffs]
Modified Wed Mar 26 17:25:26 2008 UTC (20 months ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 6401 byte(s)
Diff to previous 641126 (colored)
use beta-2 of the assembly plugin

Revision 641126 - (view) (annotate) - [select for diffs]
Modified Wed Mar 26 03:00:32 2008 UTC (20 months ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 6401 byte(s)
Diff to previous 639743 (colored)
using the corrected plugin tools

Revision 639743 - (view) (annotate) - [select for diffs]
Modified Fri Mar 21 18:15:47 2008 UTC (20 months ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 6399 byte(s)
Diff to previous 638898 (colored)
going back to assembly beta-1 as there is an important regression in assembly:attached. MASSEMBLY-301

Revision 638898 - (view) (annotate) - [select for diffs]
Modified Wed Mar 19 15:57:51 2008 UTC (20 months, 1 week ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 6399 byte(s)
Diff to previous 638010 (colored)
MNG-3395: adjust the ear plugin version

Revision 638010 - (view) (annotate) - [select for diffs]
Modified Mon Mar 17 18:32:08 2008 UTC (20 months, 1 week ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 6397 byte(s)
Diff to previous 637994 (colored)
MNG-3395: lock clean plugin version

Revision 637994 - (view) (annotate) - [select for diffs]
Modified Mon Mar 17 17:50:13 2008 UTC (20 months, 1 week ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 6271 byte(s)
Diff to previous 637973 (colored)
MNG-3395: adjust plugin and release version

Revision 637973 - (view) (annotate) - [select for diffs]
Modified Mon Mar 17 17:11:40 2008 UTC (20 months, 1 week ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 5993 byte(s)
Diff to previous 634820 (colored)
MNG-3395: adjust jdoc and assembly version

Revision 634820 - (view) (annotate) - [select for diffs]
Modified Fri Mar 7 21:00:33 2008 UTC (20 months, 2 weeks ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 5994 byte(s)
Diff to previous 634816 (colored)
use the correct property syntax

Revision 634816 - (view) (annotate) - [select for diffs]
Modified Fri Mar 7 20:47:21 2008 UTC (20 months, 2 weeks ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 5978 byte(s)
Diff to previous 634815 (colored)
MNG-3395: fixed the surefire version

Revision 634815 - (view) (annotate) - [select for diffs]
Modified Fri Mar 7 20:44:30 2008 UTC (20 months, 2 weeks ago) by brianf
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 5976 byte(s)
Diff to previous 495147 (colored)
MNG-3395: defaulted apache plugin versions in the superpom

Revision 495147 - (view) (annotate) - [select for diffs]
Modified Thu Jan 11 07:47:53 2007 UTC (2 years, 10 months ago) by jvanzyl
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3954 byte(s)
Diff to previous 379293 (colored)
o updating license headers

Revision 379293 - (view) (annotate) - [select for diffs]
Modified Mon Feb 20 23:51:53 2006 UTC (3 years, 9 months ago) by jdcasey
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3187 byte(s)
Diff to previous 356204 (colored)
[MNG-2078] Added <value>true</value> to profile activation for -DperformRelease system property in super-POM.

(merged from 379288)

Revision 356204 - (view) (annotate) - [select for diffs]
Modified Mon Dec 12 07:47:34 2005 UTC (3 years, 11 months ago) by jdcasey
Original Path: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3157 byte(s)
Diff to previous 356095 (colored)
Creating branch for 2.0.1-2.0.x work.

Revision 356095 - (view) (annotate) - [select for diffs]
Modified Mon Dec 12 01:34:27 2005 UTC (3 years, 11 months ago) by jdcasey
Original Path: maven/components/tags/maven-2.0.1/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3157 byte(s)
Diff to previous 326633 (colored)
[maven-scm] copy for tag maven-2.0.1

Revision 326633 - (view) (annotate) - [select for diffs]
Modified Wed Oct 19 18:31:30 2005 UTC (4 years, 1 month ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3157 byte(s)
Diff to previous 326009 (colored)
merge from tag maven-2.0 up to rev 326624

Revision 326009 - (view) (annotate) - [select for diffs]
Modified Tue Oct 18 01:40:05 2005 UTC (4 years, 1 month ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3079 byte(s)
Diff to previous 320991 (colored)
try using repo1 again to see if it avoids the 503 errors

Revision 320991 - (view) (annotate) - [select for diffs]
Modified Fri Oct 14 03:50:52 2005 UTC (4 years, 1 month ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3079 byte(s)
Diff to previous 320693 (colored)
bundle javadoc with java source releases

Revision 320693 - (view) (annotate) - [select for diffs]
Modified Thu Oct 13 08:39:01 2005 UTC (4 years, 1 month ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2620 byte(s)
Diff to previous 292103 (colored)
change main repo until we stabilise maven.org

Revision 292103 - (view) (annotate) - [select for diffs]
Modified Wed Sep 28 03:14:06 2005 UTC (4 years, 1 month ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2508 byte(s)
Diff to previous 289180 (colored)
PR: MNG-677
default output directory should be set in reporting

Revision 289180 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 08:42:04 2005 UTC (4 years, 2 months ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2467 byte(s)
Diff to previous 289179 (colored)
updated repository ids

Revision 289179 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 08:36:32 2005 UTC (4 years, 2 months ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2475 byte(s)
Diff to previous 233245 (colored)
switch plugin repo back to main

Revision 233245 - (view) (annotate) - [select for diffs]
Modified Wed Aug 17 19:23:45 2005 UTC (4 years, 3 months ago) by jdcasey
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2483 byte(s)
Diff to previous 233021 (colored)
Fixing some things:

o Artifact attachment via MavenProjectHelper was using string literals of the variables I was trying to use to fill in type and classifier (dumb, I know!)

o Source plugin didn't have an @phase for the JarSourceMojo...added, then added the goal configuration in the release profile in the super-pom

o Removed the source plugin bindings for the lifecycle mappings in maven-core

o Re-added [deprecated] method MavenProjectBuilder.build( File, ArtifactRepository, List )...you should use MavenProjectBuilder.build( File, ArtifactRepository, ProfileManager ) instead.

o Added profile handling/injection for the super-pom in two places: in buildStandaloneSuperPom() and in private build(..). This enables injection of the release profile which is provided in the super-pom.

o Added integration test to verify that using -DperformRelease=true results in the sources being attached...to override this behavior, another profile keyed on -DperformRelease could turn the 'attach' param for the source plugin off.


Revision 233021 - (view) (annotate) - [select for diffs]
Modified Tue Aug 16 18:03:20 2005 UTC (4 years, 3 months ago) by jdcasey
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2242 byte(s)
Diff to previous 233013 (colored)
Working on MNG-483

o Added @requiresDirectInvocation (was: @cliOnly, but this implies m2 is run from CLI...counter-intuitive for embedding)

o Added handling for new @requiresDirectInvocation (generation/parsing, MojoDescriptor support, etc.)

o Added check in DefaultLifecycleExecutor to throw a LifecycleExecutionException if a mojo specified in a lifecycle binding is marked as direct-invocation only.

o Added MavenProjectHelper/DefaultMavenProjectHelper to provide convenience methods for manipulating MavenProject instances (for example, attaching artifacts or adding resources)

o Removed maven-artifact dependency from maven-source-plugin, and added dependency on maven-plugin-api (should've been there)


Revision 233013 - (view) (annotate) - [select for diffs]
Modified Tue Aug 16 16:31:02 2005 UTC (4 years, 3 months ago) by jdcasey
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2234 byte(s)
Diff to previous 225715 (colored)
Working on: MNG-483

Fixing profile application to separate profiles discovered in and around POM from those in settings.xml, and apply them separately in the order: 

for-each-project-in-inheritance:{POM, profiles.xml}, settings.xml

Added common interface for accumulating, explicitly activating and deactivating, and retrieving profiles to be applied to a given project. This manager interface (ProfileManager) is general enough to be applicable to both the project-level and settings-level profiles.

Added 'performRelease'-keyed profile to super-POM which will be used by the release plugin and anyone using a parallel process, and which will enable '-DupdateReleaseInfo=true' for the deploy mojo, along with enabling the source attachment for the project.

Added 'attach' parameter to JarSourceMojo to allow local POM to turn off source attachments, overriding release profile in super-pom.

Updated the release:perform mojo to use '-DperformRelease=true' for switching on the new release profile, rather than just using '-DupdateReleaseInfo=true'...


Revision 225715 - (view) (annotate) - [select for diffs]
Modified Thu Jul 28 06:38:25 2005 UTC (4 years, 3 months ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1441 byte(s)
Diff to previous 193085 (colored)
ibiblio only has releases

Revision 193085 - (view) (annotate) - [select for diffs]
Modified Thu Jun 23 06:08:23 2005 UTC (4 years, 5 months ago) by jdcasey
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1301 byte(s)
Diff to previous 193081 (colored)
Upating repository id for super-pom pluginRepository.

Revision 193081 - (view) (annotate) - [select for diffs]
Modified Thu Jun 23 06:00:33 2005 UTC (4 years, 5 months ago) by jdcasey
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1293 byte(s)
Diff to previous 191634 (colored)
Changing DefaultPluginManager to lookup a plugin's artifact from pluginRepositories, and changing the location of the super-pom's pluginRepository.

Revision 191634 - (view) (annotate) - [select for diffs]
Modified Tue Jun 21 06:49:49 2005 UTC (4 years, 5 months ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1285 byte(s)
Diff to previous 189684 (colored)
PR: MNG-140

split artifact impl from api so that dep resolution can be used independently of wagon
only the first step in making maven-artifact more useful as a public api - more changes to be made

Revision 189684 - (view) (annotate) - [select for diffs]
Modified Thu Jun 9 02:05:37 2005 UTC (4 years, 5 months ago) by jvanzyl
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1281 byte(s)
Diff to previous 169484 (colored)
adding snippet markers so i can reference with a macro inside doxia doco

Revision 169484 - (view) (annotate) - [select for diffs]
Modified Tue May 10 15:04:06 2005 UTC (4 years, 6 months ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1218 byte(s)
Diff to previous 168292 (colored)
remove default plugin versions from super POM, rely on discovery of releases. Write out the current version during bootstrap to force its usage (unfortunately enforcing it on other installs, however...)

Revision 168292 - (view) (annotate) - [select for diffs]
Modified Thu May 5 07:16:07 2005 UTC (4 years, 6 months ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3391 byte(s)
Diff to previous 164217 (colored)
PR: MNG-145
Implement and document repository download mirrors

Revision 164217 - (view) (annotate) - [select for diffs]
Modified Fri Apr 22 11:01:33 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3398 byte(s)
Copied from: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml revision 164214
Diff to previous 163927 (colored)
separate maven-project code

Revision 163927 - (view) (annotate) - [select for diffs]
Modified Wed Apr 13 05:11:49 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3398 byte(s)
Diff to previous 163922 (colored)
split the plugin API and the plugin descriptor code

Revision 163922 - (view) (annotate) - [select for diffs]
Modified Wed Apr 13 01:54:15 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3326 byte(s)
Diff to previous 163902 (colored)
comment on MNG-229

Revision 163902 - (view) (annotate) - [select for diffs]
Modified Mon Apr 11 13:07:38 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3319 byte(s)
Diff to previous 163870 (colored)
use new compiler

Revision 163870 - (view) (annotate) - [select for diffs]
Modified Fri Apr 8 10:05:06 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3369 byte(s)
Diff to previous 163855 (colored)
release alpha-1 plugins

Revision 163855 - (view) (annotate) - [select for diffs]
Modified Fri Apr 8 04:48:04 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3378 byte(s)
Diff to previous 163827 (colored)
merge from branch

Revision 163827 - (view) (annotate) - [select for diffs]
Modified Thu Apr 7 04:59:12 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3374 byte(s)
Diff to previous 163791 (colored)
back to repo1.maven.org, which is now at ibiblio

Revision 163791 - (view) (annotate) - [select for diffs]
Modified Wed Apr 6 01:28:29 2005 UTC (4 years, 7 months ago) by jdcasey
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3392 byte(s)
Diff to previous 163772 (colored)
o Changed the repository to test.maven.codehaus.org for testing of the new repository and layout.
o Added <layout/> element to <repository/> elements in the maven.mdo
o Added pluginRepository configuration to the super-POM.
o Tested it all.

Revision 163772 - (view) (annotate) - [select for diffs]
Modified Mon Apr 4 21:32:53 2005 UTC (4 years, 7 months ago) by jdcasey
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 3104 byte(s)
Diff to previous 163740 (colored)
o Simplified the ResourcesMojo to eliminate the need for a ResourceEntry class, which is easily replaced by usage of a TreeMap (avoid the NoClassDefFoundError from before SEE MNG-243)
o Changed the references to repo1.maven.org for central repository to repo1.maven.org/maven2 in preparation for switchover to ibiblio.org

    This will allow us to transparently switch between redirects and CNAME changes for referencing ibiblio.org, since ibiblio will not allow a
    vhost for m2 or a rewrite rule...switching the URL for the repo will allow changes to the CNAME (satisfy ibiblio's pathing) while at the same
    time allowing the use of redirects (redirect can be at /maven2/index.html rather than /index.html, f.e.).

Revision 163740 - (view) (annotate) - [select for diffs]
Modified Fri Apr 1 05:47:29 2005 UTC (4 years, 7 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2926 byte(s)
Diff to previous 163558 (colored)
put back default test includes/excludes

Revision 163558 - (view) (annotate) - [select for diffs]
Modified Tue Mar 15 21:41:06 2005 UTC (4 years, 8 months ago) by jdcasey
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2609 byte(s)
Diff to previous 163527 (colored)
o Removed AuthenticationInfoProvider stuff
o Added ArtifactRepositoryFactory stuff to construct with AuthenticationInfo if possible.
o Added UserModelBuilder stuff for componentizing UserModel construction.
  -> DefaultUserModelBuilder has a configuration point 'userModelPath' which can redirect where it reads user.xml from (${user.home} is substitutable here).
o Added warning message to deployment plugin when deployment repo has no authentication info available.
o Added warning message for repos with null <id/> (auth info cannot be assigned here).
o Added a couple of debug-level messages for aid in debugging repo- and userModel-related problems.

Revision 163527 - (view) (annotate) - [select for diffs]
Modified Thu Mar 10 23:01:38 2005 UTC (4 years, 8 months ago) by jdcasey
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2625 byte(s)
Diff to previous 163525 (colored)
o Moved the default plugin stuff to <pluginManagement/>. Plugin config will be pulled from here and injected into <plugins/> as needed to satisfy type-handlers at runtime.
o Added the ability for DefaultMaven to load only the super-pom in the event that no pom.xml exists to initiate the assembly.

Revision 163525 - (view) (annotate) - [select for diffs]
Modified Thu Mar 10 21:36:58 2005 UTC (4 years, 8 months ago) by jdcasey
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 2484 byte(s)
Diff to previous 163511 (colored)
o Added plugin version management/enforcement through the POM's build section.

Revision 163511 - (view) (annotate) - [select for diffs]
Modified Thu Mar 10 01:35:25 2005 UTC (4 years, 8 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 996 byte(s)
Diff to previous 163381 (colored)
flip pom format

Revision 163381 - (view) (annotate) - [select for diffs]
Modified Wed Feb 23 03:56:25 2005 UTC (4 years, 9 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1401 byte(s)
Diff to previous 163380 (colored)
use ${..} style interpolation

Revision 163380 - (view) (annotate) - [select for diffs]
Modified Wed Feb 23 03:27:00 2005 UTC (4 years, 9 months ago) by brett
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1397 byte(s)
Diff to previous 163238 (colored)
refactoring:
- use an expression in the suport POM to set up finalName
- have interpolator and injector deal only with model

Revision 163238 - (view) (annotate) - [select for diffs]
Modified Sun Dec 5 04:16:07 2004 UTC (4 years, 11 months ago) by jvanzyl
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1527 byte(s)
Diff to previous 163141 (colored)
o Trying to keep only keep the main entry point into maven as the only classes in the top level package.

Revision 163141 - (view) (annotate) - [select for diffs]
Modified Thu Sep 23 16:26:22 2004 UTC (5 years, 2 months ago) by jvanzyl
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1527 byte(s)
Diff to previous 163086 (colored)
o point the remote repo download to the first dispatcher

Revision 163086 - (view) (annotate) - [select for diffs]
Added Thu Sep 16 14:26:18 2004 UTC (5 years, 2 months ago) by jdcasey
Original Path: maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
File length: 1540 byte(s)
o Changed maven-core's super-pom from pom.xml to pom-4.0.0.xml
o Added validation logic for non-heritable pom elements to the default project builder
o Changed default builder to select the correct super-pom from the project pom's modelVersion.

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2