Commit Graph
59 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 0841fd6421 - In modern code we've been exposing DescribableList directly since it's a lot richer.
- calling prebuild after build wrappers to align the semantics with freestyle projects.
2011-09-23 23:25:12 -07:00
imod cd968ce2d8 integrate m2extra-steps into maven-plugin 2011-09-07 22:11:50 +02:00
Olivier Lamy 9787c0719a maven native plugin is now aware of global maven settings configuration trough the config file provider plugin 2011-08-07 20:45:07 +02:00
Olivier Lamy c9688c345f change package import due to moove of config provider classes to a separate repo 2011-08-07 01:59:34 +02:00
Olivier Lamy 9a0ef226a7 add a marker interface MavenSettingsProvider in maven-plugin.
We will only use config provider which implements this.
Start work to use the provided settings for maven build
2011-08-07 01:59:33 +02:00
Kohsuke Kawaguchi a5f4bff5cb cleaned up the MAVEN_OPTS variable expansion story.
Most notably, we weren't expanding environment variables. (CLOUDBEES-1403)
2011-08-05 11:32:51 -07:00
Christoph Kutzinski fb9a266775 [FIXED JENKINS-10530] regression: plugins were no longer identified as upstream snapshot dependencies 2011-07-30 17:38:04 +02:00
Kohsuke Kawaguchi 039e43cf48 Merged ce27914ce9
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/model/AbstractProject.java
	core/src/main/java/hudson/model/Descriptor.java
	core/src/main/java/hudson/model/Hudson.java
	core/src/main/java/hudson/tasks/BuildTrigger.java
	core/src/main/resources/hudson/model/View/newJob.jelly
	core/src/main/resources/hudson/model/View/sidepanel.jelly
	core/src/main/resources/hudson/views/Messages_ja.properties
	maven-plugin/src/main/java/hudson/maven/MavenBuild.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
2011-07-05 19:42:20 -07:00
Kohsuke Kawaguchi ce27914ce9 fixed a bug where Maven projects couldn't be created inside containers. 2011-07-02 21:24:01 -07:00
Paul Sandoz d546378df7 Parent not Jenkins. 2011-06-29 16:06:47 +02:00
Kohsuke Kawaguchi df5862c97c This is more modern and amenable to CLI/tests 2011-06-17 08:22:18 -07:00
Nigel Magnay 2adef6719a Merge remote branch 'origin/master' into momo
* origin/master: (91 commits)
  Parsing can happen in the forked Maven process. Support remoting.
  Fixed the test failures.
  Strip whitespace on maven installation.
  updated ja.
  Use relative path to validate new view name (in order to allow ViewGroups like NestedView to override)
  Added i18n.
  moved to the model package to colocate with the Result class, since I don't think this class is tied by itself to the notification.
  doc improvements
  enum to describe a result trend - i.e. change from the previous to the current result
  Recording the previous change.
  Do not include trailing periods in console links.
  doc improvements
  Added a hook to customize the XML parser behaviour.
  - Renamed from 'linked' to 'base' - Fixed the bug where multi-level base setting wasn't working properly - Improved docs
  Updated style
  Added convenience method for getting configuration run
  Initial commit
  the trunk is toward 1.416-SNAPSHOT
  creating an RC branch
  updated changelog as a part of the release
  ...

Conflicts:
	core/src/main/java/hudson/slaves/NodeProvisioner.java
	maven-plugin/src/main/java/hudson/maven/MavenModule.java
	maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
2011-06-07 09:04:40 +01:00
Nicolas De Loof a84188ec2b Fixed JENKINS-9785 : option to run maven in headless mode to avoid boring dock icon to jump and take the focus on OSX 2011-05-31 15:20:38 +02:00
Nigel Magnay 5679d019ec Move hudson.model.Jenkins to be jenkins.model.Jenkins - part II
Just import changes, from hudson.model.Jenkins -> jenkins.model.Jenkins,
and Javadoc comments.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:06:28 +01:00
Nigel Magnay 70c1065814 Stage 1 : Create hudson.model.Jenkins, make Hudson derive from Jenkins.
Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:00:58 +01:00
Christoph Kutzinski 6a5330fd93 [FIXED JENKINS-7535] building up the dependency graph for maven jobs
takes too long
2011-03-25 18:49:10 +01:00
André Twupack 4802e09535 replaced hard coded error message and added German translations 2011-02-12 15:21:58 +01:00
Kohsuke Kawaguchi 70fde5f74e added a callback to be notified when a child is removed 2011-01-12 19:04:37 -08:00
Kohsuke Kawaguchi c15ba139b8 Exposed a new method to create a TopLevelItem under arbitrary ItemGroup. 2011-01-12 19:04:02 -08:00
Kohsuke Kawaguchi 072556e8c8 allowing TopLevelItems to be used under ItemGroups other than Hudson. 2011-01-12 19:04:02 -08:00
Olivier Lamy be7b3adb4a [HUDSON-8406] Add more options to configure maven project building 2011-01-10 18:30:22 +01:00
Olivier Lamy b02f9cc603 [HUDSON-8406] Add more options to configure maven project building
processPlugins and resolveDependencies are now configurable
2011-01-10 17:32:11 +01:00
Olivier Lamy b97ad46213 really fix use of env var in pols tru ${env.xxxx} 2011-01-08 22:25:08 +01:00
Olivier Lamy 0049d2408b update changelog for HUDSON-8395 and fix junit 2011-01-03 17:40:09 +01:00
Kohsuke Kawaguchi 4742d022a7 Moved the maven version information to MavenModuleSetBuild. 2010-12-31 21:00:28 -08:00
Seiji Sogabe c85e60f14e Sorry my mistake. 2010-12-24 22:19:10 +09:00
kohsuke be5ab5490b made the generated classes visible to the classloader.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@36008 71c3de6d-444a-0410-be80-ed276b4c234a
2010-10-17 07:43:09 +00:00
kohsuke 49d1b7830b fixed a compilation problem
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@35614 71c3de6d-444a-0410-be80-ed276b4c234a
2010-10-07 20:00:01 +00:00
kohsuke 0c6138c6af Fixed a race condition. The dead lock was between the transientActions object vs MavenModuleSet.
Found one Java-level deadlock:
=============================
"Handling GET /hudson/job/special_Build/api/json : http-8080-4":
  waiting to lock monitor 0x00000000460dfa98 (object 0x00002aab02808368, a java.util.Vector),
  which is held by "pool-6-thread-250"

"pool-6-thread-250":
  waiting to lock monitor 0x0000000046aca2b0 (object 0x00002aaab7099118, a hudson.maven.MavenModuleSet),
  which is held by "Handling GET /hudson/job/special_Build/api/json : http-8080-4"






"Handling GET /hudson/job/special_Build/api/json : http-8080-4":
        at java.util.Vector.toArray(Vector.java:643)
->      - waiting to lock <0x00002aab02808368> (a java.util.Vector)
        at java.util.Vector.addAll(Vector.java:830)
        - locked <0x00002aab02812710> (a java.util.Vector)
        at hudson.model.AbstractProject.getActions(AbstractProject.java:899)
->      - locked <0x00002aaab7099118> (a hudson.maven.MavenModuleSet)
        at sun.reflect.GeneratedMethodAccessor149.invoke(Unknown Source)
        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
        at java.lang.reflect.Method.invoke(Method.java:597)
        at org.kohsuke.stapler.export.MethodProperty.getValue(MethodProperty.java:43)
        at org.kohsuke.stapler.export.Property.writeTo(Property.java:83)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:156)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeTo(Model.java:129)
        at org.kohsuke.stapler.ResponseImpl.serveExposedBean(ResponseImpl.java:176)
        at hudson.model.Api.doJson(Api.java:181)



"pool-6-thread-250":
        at hudson.model.AbstractProject.getActions(AbstractProject.java:898)
->      - waiting to lock <0x00002aaab7099118> (a hudson.maven.MavenModuleSet)
        at hudson.model.Actionable.getActions(Actionable.java:75)
        at hudson.plugins.jobConfigHistory.JobConfigHistoryActionFactory.createFor(JobConfigHistoryActionFactory.java:30)
        at hudson.model.AbstractProject.updateTransientActions(AbstractProject.java:549)
        at hudson.maven.AbstractMavenProject.updateTransientActions(AbstractMavenProject.java:48)
->      - locked <0x00002aab02808368> (a java.util.Vector)
        at hudson.maven.MavenModuleSet.updateTransientActions(MavenModuleSet.java:199)
        at hudson.maven.MavenModuleSetBuild.notifyModuleBuild(MavenModuleSetBuild.java:347)
        - locked <0x00002aab0103d910> (a hudson.maven.MavenModuleSetBuild)
        at hudson.maven.MavenBuild$ProxyImpl2.end(MavenBuild.java:437)
        at sun.reflect.GeneratedMethodAccessor368.invoke(Unknown Source)

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@35610 71c3de6d-444a-0410-be80-ed276b4c234a
2010-10-07 18:59:21 +00:00
kohsuke c9ab4c0473 calling updateTransientActions() from the constructor means we end up calling the overrided methods in subtypes before subtype constructor kicks in. Probably not a good idea.
Instead, opted for a post-constructor hook.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34040 71c3de6d-444a-0410-be80-ed276b4c234a
2010-08-23 18:33:23 +00:00
km b228c24db5 [FIXED-HUDSON-7162]
Hudson ignores Maven pom.xml path when it is specified as absolute path.
Provided utility methods for checking whether a path is absolute and
absolutizing a given path (w.r.t. a base).
Provided a unit test case for this scenario (@Bug 7261).



git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34004 71c3de6d-444a-0410-be80-ed276b4c234a
2010-08-21 02:13:15 +00:00
olamy 8d82be4459 fix eclipse compilation
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@31074 71c3de6d-444a-0410-be80-ed276b4c234a
2010-05-16 19:47:43 +00:00
abayer d0f06f3deb [FIXED HUDSON-4693] Changed checkFileInWorkspace to look at getModuleRoot(), reverting to earlier behavior
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@28942 71c3de6d-444a-0410-be80-ed276b4c234a
2010-03-19 22:56:46 +00:00
abayer 86b2bcb094 [FIXED HUDSON-4693] Fixed handling of relative paths in alternate settings.xml in Maven 2 projects
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@28278 71c3de6d-444a-0410-be80-ed276b4c234a
2010-03-04 22:36:11 +00:00
abayer 37183f4c86 [FIXED HUDSON-5651] Removing excess whitespace from MAVEN_OPTS
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@27559 71c3de6d-444a-0410-be80-ed276b4c234a
2010-02-16 15:40:20 +00:00
abayer 23891487d2 [FIXED HUDSON-5405] Properly loading MavenModuleSet descriptor now
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@26620 71c3de6d-444a-0410-be80-ed276b4c234a
2010-01-28 02:18:38 +00:00
kohsuke 31a54f38f6 avoid double invocation of updateTransientActions by moving it to doConfigSubmit.
Discussion at http://n4.nabble.com/Bug-getProjectAction-is-always-called-twice-tp1294814p1294814.html

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@26479 71c3de6d-444a-0410-be80-ed276b4c234a
2010-01-27 00:01:02 +00:00
kohsuke 91f80263e5 Extension points can now contribute multiple actions.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@25771 71c3de6d-444a-0410-be80-ed276b4c234a
2010-01-13 20:07:01 +00:00
kohsuke f93ed3f2f8 added a setter
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@25745 71c3de6d-444a-0410-be80-ed276b4c234a
2010-01-13 01:26:17 +00:00
godin 3ae6fc5c89 Minor fix
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@25729 71c3de6d-444a-0410-be80-ed276b4c234a
2010-01-12 20:35:41 +00:00
abayer c809404615 [FIXED HUDSON-2932] Maven projects now properly fall back through project-defined MAVEN_OPTS to globally-defined MAVEN_OPTS to executor environment variable MAVEN_OPTS - also added globally-defined MAVEN_OPTS and related changes
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@24652 71c3de6d-444a-0410-be80-ed276b4c234a
2009-12-16 14:47:49 +00:00
kohsuke 36040b9a7a [FIXED HUDSON-4080] Node variables not passed through to Maven jobs. In 1.335.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23695 71c3de6d-444a-0410-be80-ed276b4c234a
2009-11-13 02:54:36 +00:00
abayer 43ca4c86d2 [FIXED HUDSON-4593] Added ability to make automatic Maven artifact archiving optional
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23363 71c3de6d-444a-0410-be80-ed276b4c234a
2009-10-31 00:22:19 +00:00
kohsuke fa3a50b96f Queue has too many inner classes to make it hard to read.
Moving some of the pieces into its own package.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22948 71c3de6d-444a-0410-be80-ed276b4c234a
2009-10-20 00:25:54 +00:00
abayer 2b12abbda2 [FIXED HUDSON-4637] Added check for leading slash, backslash, or Windows drive string in Alternate Settings File textfield, to reinforce that this is, in fact, a relative path in the workspace.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22659 71c3de6d-444a-0410-be80-ed276b4c234a
2009-10-12 15:17:48 +00:00
kohsuke 27041170d3 Merged revisions 22084-22085 via svnmerge from
https://www.dev.java.net/svn/hudson/branches/rc

........
  r22084 | kohsuke | 2009-09-23 17:35:53 -0700 (Wed, 23 Sep 2009) | 1 line
  
  getLastBuild() can return null.
........
  r22085 | kohsuke | 2009-09-23 18:01:05 -0700 (Wed, 23 Sep 2009) | 1 line
  
  fixing a test failure.
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22086 71c3de6d-444a-0410-be80-ed276b4c234a
2009-09-24 01:56:44 +00:00
abayer 5dfb1adb36 [maven-plugin] Cleanup of deprecated calls, updating POM to point to current versions of maven-hpi-plugin and maven-stapler-plugin.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22024 71c3de6d-444a-0410-be80-ed276b4c234a
2009-09-22 22:48:30 +00:00
abayer 112ad0089c [FIXED HUDSON-4491] If Maven is called with non-recursive flags, submodules are no longer parsed.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21856 71c3de6d-444a-0410-be80-ed276b4c234a
2009-09-18 14:58:32 +00:00
abayer eb19d208e5 Adding documentation
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20962 71c3de6d-444a-0410-be80-ed276b4c234a
2009-08-20 13:51:09 +00:00
abayer 44cde72932 Adding convenience methods for setting various boolean fields
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20770 71c3de6d-444a-0410-be80-ed276b4c234a
2009-08-16 19:49:56 +00:00