| author | akozak | 2011-11-22 09:21:00 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:46:59 (EST) |
| commit | 191010ab1fcdff9b74509846317133eda4ac2b0d (patch) (side-by-side diff) | |
| tree | d7a25954ff080faff898e9d1e41f344f3d8b63ae | |
| parent | 378aba9f4582e9934353a26beb0d1ee00050e780 (diff) | |
| download | org.eclipse.hudson.core-191010ab1fcdff9b74509846317133eda4ac2b0d.zip org.eclipse.hudson.core-191010ab1fcdff9b74509846317133eda4ac2b0d.tar.gz org.eclipse.hudson.core-191010ab1fcdff9b74509846317133eda4ac2b0d.tar.bz2 | |
Returned back stapler 1.5 because of the http://issues.hudson-ci.org/browse/HUDSON-9021 and problems with JSON.
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
| -rw-r--r-- | hudson-core/pom.xml | 11 | ||||
| -rw-r--r-- | hudson-parent/pom.xml | 25 |
2 files changed, 11 insertions, 25 deletions
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml index 97673bd..715303c 100644 --- a/hudson-core/pom.xml +++ b/hudson-core/pom.xml @@ -23,6 +23,7 @@ </parent> <artifactId>hudson-core</artifactId> + <packaging>stapler-jar</packaging> <name>Hudson :: Core</name> <description> Contains the core Hudson code and view files to render HTML. @@ -36,7 +37,7 @@ <jtidy.version>r938</jtidy.version> <jna-posix.version>1.0.3</jna-posix.version> <trilead-putty-extension.version>1.0</trilead-putty-extension.version> - <stapler.version>1.174</stapler.version> + <stapler-jelly.version>1.167</stapler-jelly.version> <bridge-method-annotation.version>1.4</bridge-method-annotation.version> <json-lib.version>2.4</json-lib.version> <annotation-indexer.version>1.2</annotation-indexer.version> @@ -372,8 +373,8 @@ </dependency> <dependency> <groupId>org.kohsuke.stapler</groupId> - <artifactId>stapler-groovy</artifactId> - <version>${stapler.version}</version> + <artifactId>stapler-jelly</artifactId> + <version>${stapler-jelly.version}</version> <exclusions> <exclusion> <groupId>commons-jelly</groupId> @@ -384,10 +385,6 @@ <artifactId>commons-jexl</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - </exclusion> - <exclusion> <groupId>org.kohsuke.stapler</groupId> <artifactId>json-lib</artifactId> </exclusion> diff --git a/hudson-parent/pom.xml b/hudson-parent/pom.xml index 30b1142..be97691 100644 --- a/hudson-parent/pom.xml +++ b/hudson-parent/pom.xml @@ -57,6 +57,12 @@ <maven-localizer-plugin.version>1.10</maven-localizer-plugin.version> <maven-hpi-plugin.version>2.1.1</maven-hpi-plugin.version> <maven-stapler-plugin.version>1.16</maven-stapler-plugin.version> + + <!--Test dependencies--> + <junit.version>4.8.1</junit.version> + <easymock.version>3.0</easymock.version> + <mockito-core.version>1.8.5</mockito-core.version> + <powermock.version>1.4.10</powermock.version> </properties> <organization> @@ -215,6 +221,7 @@ <systemPropertyVariables> <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> </systemPropertyVariables> + <forkMode>always</forkMode> </configuration> </plugin> @@ -240,24 +247,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> <version>${maven-pmd-plugin.version}</version> - <!--configuration> - <verbose>true</verbose> - <targetJdk>1.5</targetJdk> - <outputDirectory>${project.reporting.outputDirectory}</outputDirectory> - <targetDirectory>${project.build.directory}</targetDirectory> - <excludeRoots> - <excludeRoot>${basedir}/target/generated-sources/</excludeRoot> - </excludeRoots> - </configuration> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>check</goal> - <goal>cpd-check</goal> - </goals> - </execution> - </executions--> </plugin> <plugin> |