|
 |
7f0bec7 |
diff -Nru maven/jmock-junit4/pom.xml maven-gil/jmock-junit4/pom.xml
|
|
|
7f0bec7 |
--- maven/jmock-junit4/pom.xml 2008-08-26 16:28:52.000000000 +0200
|
|
|
7f0bec7 |
+++ maven-gil/jmock-junit4/pom.xml 2012-04-19 11:05:33.000000000 +0200
|
|
|
7f0bec7 |
@@ -17,7 +17,7 @@
|
|
|
7f0bec7 |
</dependency>
|
|
|
7f0bec7 |
<dependency>
|
|
|
7f0bec7 |
<groupId>junit</groupId>
|
|
|
7f0bec7 |
- <artifactId>junit-dep</artifactId>
|
|
|
7f0bec7 |
+ <artifactId>junit</artifactId>
|
|
|
7f0bec7 |
<version>4.4</version>
|
|
|
7f0bec7 |
<exclusions>
|
|
|
7f0bec7 |
<exclusion>
|
|
|
7f0bec7 |
diff -Nru maven/jmock-legacy/pom.xml maven-gil/jmock-legacy/pom.xml
|
|
|
7f0bec7 |
--- maven/jmock-legacy/pom.xml 2008-08-26 16:28:52.000000000 +0200
|
|
|
7f0bec7 |
+++ maven-gil/jmock-legacy/pom.xml 2012-04-19 11:03:42.000000000 +0200
|
|
|
7f0bec7 |
@@ -21,9 +21,9 @@
|
|
|
7f0bec7 |
<version>1.0</version>
|
|
|
7f0bec7 |
</dependency>
|
|
|
7f0bec7 |
<dependency>
|
|
|
7f0bec7 |
- <groupId>cglib</groupId>
|
|
|
7f0bec7 |
- <artifactId>cglib-nodep</artifactId>
|
|
|
7f0bec7 |
- <version>2.1_3</version>
|
|
|
7f0bec7 |
+ <groupId>net.sf.cglib</groupId>
|
|
|
7f0bec7 |
+ <artifactId>cglib</artifactId>
|
|
|
7f0bec7 |
+ <version>2.2</version>
|
|
|
7f0bec7 |
</dependency>
|
|
|
7f0bec7 |
</dependencies>
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
diff -Nru maven/jmock-script/pom.xml maven-gil/jmock-script/pom.xml
|
|
|
7f0bec7 |
--- maven/jmock-script/pom.xml 2008-08-26 16:28:52.000000000 +0200
|
|
|
7f0bec7 |
+++ maven-gil/jmock-script/pom.xml 2012-04-19 10:58:33.000000000 +0200
|
|
|
7f0bec7 |
@@ -15,9 +15,9 @@
|
|
|
7f0bec7 |
<version>${pom.version}</version>
|
|
|
7f0bec7 |
</dependency>
|
|
|
7f0bec7 |
<dependency>
|
|
|
7f0bec7 |
- <groupId>org.beanshell</groupId>
|
|
|
7f0bec7 |
+ <groupId>bsh</groupId>
|
|
|
7f0bec7 |
<artifactId>bsh</artifactId>
|
|
|
7f0bec7 |
- <version>2.0b4</version>
|
|
|
7f0bec7 |
+ <version>1.3.0</version>
|
|
|
7f0bec7 |
</dependency>
|
|
|
7f0bec7 |
</dependencies>
|
|
|
7f0bec7 |
</project>
|
|
|
7f0bec7 |
\ Manca newline alla fine del file
|
|
|
7f0bec7 |
diff -Nru maven/pom.xml maven-gil/pom.xml
|
|
|
7f0bec7 |
--- maven/pom.xml 2008-08-26 16:28:52.000000000 +0200
|
|
|
7f0bec7 |
+++ maven-gil/pom.xml 2012-04-19 11:14:07.786932958 +0200
|
|
|
7f0bec7 |
@@ -52,7 +52,7 @@
|
|
|
7f0bec7 |
</archive>
|
|
|
7f0bec7 |
</configuration>
|
|
|
7f0bec7 |
</plugin>
|
|
|
7f0bec7 |
- <plugin>
|
|
|
7f0bec7 |
+
|
|
|
7f0bec7 |
<groupId>org.codehaus.groovy.maven</groupId>
|
|
|
7f0bec7 |
<artifactId>gmaven-plugin</artifactId>
|
|
|
7f0bec7 |
<version>1.0-rc-2</version>
|
|
|
7f0bec7 |
@@ -103,7 +103,7 @@
|
|
|
7f0bec7 |
</configuration>
|
|
|
7f0bec7 |
</execution>
|
|
|
7f0bec7 |
</executions>
|
|
|
7f0bec7 |
- </plugin>
|
|
|
7f0bec7 |
+ </plugin-->
|
|
|
7f0bec7 |
<plugin>
|
|
|
7f0bec7 |
<groupId>org.codehaus.mojo</groupId>
|
|
|
7f0bec7 |
<artifactId>build-helper-maven-plugin</artifactId>
|
|
|
7f0bec7 |
@@ -134,13 +134,13 @@
|
|
|
7f0bec7 |
</configuration>
|
|
|
7f0bec7 |
</plugin>
|
|
|
7f0bec7 |
</plugins>
|
|
|
7f0bec7 |
- <extensions>
|
|
|
7f0bec7 |
+
|
|
|
7f0bec7 |
<extension>
|
|
|
7f0bec7 |
<groupId>org.apache.maven.wagon</groupId>
|
|
|
7f0bec7 |
<artifactId>wagon-webdav</artifactId>
|
|
|
7f0bec7 |
<version>1.0-beta-2</version>
|
|
|
7f0bec7 |
</extension>
|
|
|
7f0bec7 |
- </extensions>
|
|
|
7f0bec7 |
+ </extensions-->
|
|
|
7f0bec7 |
</build>
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
<properties>
|
|
|
7f0bec7 |
@@ -150,7 +150,7 @@
|
|
|
7f0bec7 |
</properties>
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
<profiles>
|
|
|
7f0bec7 |
- <profile>
|
|
|
7f0bec7 |
+
|
|
|
7f0bec7 |
<id>jmock1</id>
|
|
|
7f0bec7 |
<modules>
|
|
|
7f0bec7 |
<module>jmock-core</module>
|
|
|
7f0bec7 |
@@ -160,7 +160,7 @@
|
|
|
7f0bec7 |
<release.version>1.2.0</release.version>
|
|
|
7f0bec7 |
<download.artifact.dir>${basedir}/../${download.dir}/${download.name}</download.artifact.dir>
|
|
|
7f0bec7 |
</properties>
|
|
|
7f0bec7 |
- </profile>
|
|
|
7f0bec7 |
+ </profile-->
|
|
|
7f0bec7 |
<profile>
|
|
|
7f0bec7 |
<id>jmock2</id>
|
|
|
7f0bec7 |
<modules>
|