Author: apo-guest
Date: 2013-11-21 10:35:04 +0000 (Thu, 21 Nov 2013)
New Revision: 17471
Added:
trunk/easymock/debian/README.Debian
trunk/easymock/debian/patches/no-android.patch
Removed:
trunk/easymock/debian/libeasymock-java-doc.doc-base
trunk/easymock/debian/patches/java7-compat.patch
Modified:
trunk/easymock/debian/build.xml
trunk/easymock/debian/changelog
trunk/easymock/debian/control
trunk/easymock/debian/patches/series
trunk/easymock/debian/pom.xml
trunk/easymock/debian/rules
Log:
Debian release 3.2+ds-1
Added: trunk/easymock/debian/README.Debian
===================================================================
--- trunk/easymock/debian/README.Debian (rev 0)
+++ trunk/easymock/debian/README.Debian 2013-11-21 10:35:04 UTC (rev 17471)
@@ -0,0 +1,5 @@
+EasyMock for Debian
+===================
+
+The Debian version of EasyMock does not support the Android platform because
+the optional dexmaker library has not been packaged yet.
Modified: trunk/easymock/debian/build.xml
===================================================================
--- trunk/easymock/debian/build.xml 2013-11-21 06:42:37 UTC (rev 17470)
+++ trunk/easymock/debian/build.xml 2013-11-21 10:35:04 UTC (rev 17471)
@@ -19,9 +19,9 @@
<pathelement location="${build.test}"/>
<pathelement location="/usr/share/java/junit4.jar"/>
<!-- only needed for version 3.2 and later -->
- <!-- <pathelement location="/usr/share/java/objenesis.jar"/>
+ <pathelement location="/usr/share/java/objenesis.jar"/>
<pathelement location="/usr/share/java/cglib.jar"/>
- <pathelement location="/usr/share/java/asm3.jar"/>-->
+ <pathelement location="/usr/share/java/asm3.jar"/>
</path>
<target name="init">
@@ -34,13 +34,19 @@
<target name="compile" depends="init" description="compile the source" >
<!-- Compile the java code from ${src} into ${build} -->
- <javac target="1.5" source="1.5" srcdir="${src}" includeantruntime="true"
destdir="${build}" classpathref="classpath"/>
+ <javac sourcepath="" target="1.6" source="1.6" includeantruntime="true"
srcdir="${src}"
+ classpathref="classpath" destdir="${build}" >
+ <include name="**/*.java"/>
+ <exclude name="**/AndroidClassProxyFactory.java"/>
+ </javac>
</target>
- <target name="compile-tests" depends="init,compile"
- description="compile the unit tests" >
- <javac target="1.5" source="1.5" srcdir="tests" includeantruntime="true"
destdir="${build.test}"
- classpathref="classpath" classpath="${build}"/>
+ <target name="compile-tests" depends="init,compile" description="compile the
unit tests" >
+ <javac sourcepath="" target="1.6" source="1.6" includeantruntime="true"
srcdir="tests"
+ destdir="${build.test}" classpathref="classpath" classpath="${build}" >
+ <include name="**/*.java"/>
+ <exclude name="**/ClassExtensionHelperTest.java"/>
+ </javac>
</target>
<target name="test" depends="init,compile,compile-tests" description="run
unit tests">
@@ -50,19 +56,23 @@
<batchtest>
<fileset dir="tests">
<include name="**/*Test*.java"/>
- <exclude name="**/*CaptureTest.java"/>
<exclude name="**/*EasyMockPropertiesTest.java"/>
<!-- only needed for version 3.2 and later -->
- <!-- <exclude name="**/*BaseEasyMockRunnerTest.java"/>
- <exclude name="**/*DependencyTest.java"/>-->
+ <exclude name="**/*BaseEasyMockRunnerTest.java"/>
+ <exclude name="**/*DependencyTest.java"/>
+ <exclude name="**/*ClassExtensionHelperTest.java"/>
+ <exclude name="**/*EasyMockSupportClassTest.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="javadoc" depends="init" description="generate api docs">
- <javadoc destdir="${javadoc}" source="1.5" classpathref="classpath">
- <fileset dir="${src}" defaultexcludes="yes"/>
+ <javadoc destdir="${javadoc}" source="1.6" classpathref="classpath">
+ <fileset dir="${src}"
+ defaultexcludes="yes"
+ excludes="**/*AndroidClassProxyFactory.java"
+ />
</javadoc>
</target>
Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog 2013-11-21 06:42:37 UTC (rev 17470)
+++ trunk/easymock/debian/changelog 2013-11-21 10:35:04 UTC (rev 17471)
@@ -1,3 +1,23 @@
+easymock (3.2+ds-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bump Standards-Version to 3.9.5, no changes.
+ * Drop java7-compat.patch. Fixed upstream.
+ * Update build.xml and pom.xml for new upstream release.
+ * debian/control:
+ - Add libcglib-java and libobjenesis-java to Build-Depends-Indep.
+ - Remove Suggests: junit4. Make it a full dependency instead.
+ * Add README.Debian. This version of EasyMock comes without support for the
+ Android platform.
+ * Update get-orig-source target.
+ * Update package description and remove hints to version 2 of EasyMock.
+ * Add no-android.patch because the dexmaker library has not been packaged for
+ Debian yet.
+ * Drop libeasymock-java-doc.doc-base because javahelper registers the
+ documentation with doc-base automatically.
+
+ -- Markus Koschany <[email protected]> Fri, 15 Nov 2013 10:22:23 +0100
+
easymock (2.5.2+ds-1) unstable; urgency=low
* New upstream release. (Closes: #713751)
Modified: trunk/easymock/debian/control
===================================================================
--- trunk/easymock/debian/control 2013-11-21 06:42:37 UTC (rev 17470)
+++ trunk/easymock/debian/control 2013-11-21 10:35:04 UTC (rev 17471)
@@ -13,8 +13,10 @@
maven-repo-helper
Build-Depends-Indep:
default-jdk,
- junit4
-Standards-Version: 3.9.4
+ junit4,
+ libcglib-java,
+ libobjenesis-java
+Standards-Version: 3.9.5
Homepage: http://www.easymock.org
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/easymock/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/easymock/
@@ -25,10 +27,9 @@
${java:Depends},
${misc:Depends}
Suggests:
- junit4,
libeasymock-java-doc
Description: Java library to generate Mock Objects for given interfaces
- EasyMock 2 is a library that provides an easy way to use Mock Objects for
+ EasyMock is a library that provides an easy way to use Mock Objects for
given interfaces. Mock Objects simulate parts of the behavior of domain code,
and are able to check whether they are used as defined. Domain classes can be
tested in isolation by simulating their collaborators with Mock Objects.
@@ -41,7 +42,7 @@
Enhances:
libeasymock-java
Description: Java library to generate Mock Objects for given interfaces
(documentation)
- EasyMock 2 is a library that provides an easy way to use Mock Objects for
+ EasyMock is a library that provides an easy way to use Mock Objects for
given interfaces. Mock Objects simulate parts of the behavior of domain code,
and are able to check whether they are used as defined. Domain classes can be
tested in isolation by simulating their collaborators with Mock Objects.
Deleted: trunk/easymock/debian/libeasymock-java-doc.doc-base
===================================================================
--- trunk/easymock/debian/libeasymock-java-doc.doc-base 2013-11-21 06:42:37 UTC
(rev 17470)
+++ trunk/easymock/debian/libeasymock-java-doc.doc-base 2013-11-21 10:35:04 UTC
(rev 17471)
@@ -1,16 +0,0 @@
-Document: easymock-manual
-Title: EasyMock
-Author: Tammo Freese
-Abstract: This document describes how to use the
- Java EasyMock library when testing your Java code.
- Contains API documentation and sample code.
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libeasymock-java-doc/Documentation.html
-Files: /usr/share/doc/libeasymock-java-doc/*.html
- /usr/share/doc/libeasymock-java-doc/api/*.html
- /usr/share/doc/libeasymock-java-doc/api/org/easymock/*.html
- /usr/share/doc/libeasymock-java-doc/api/org/easymock/internal/*.html
- /usr/share/doc/libeasymock-java-doc/api/org/easymock/internal/matchers/*.html
- /usr/share/doc/libeasymock-java-doc/samples/org/easymock/samples/*.java
Deleted: trunk/easymock/debian/patches/java7-compat.patch
===================================================================
--- trunk/easymock/debian/patches/java7-compat.patch 2013-11-21 06:42:37 UTC
(rev 17470)
+++ trunk/easymock/debian/patches/java7-compat.patch 2013-11-21 10:35:04 UTC
(rev 17471)
@@ -1,105 +0,0 @@
-From: James Page <[email protected]>
-Date: Tue, 6 Aug 2013 19:50:34 +0200
-Subject: java7 compat
-
-This patch works around tighter closure handling in Java 7 and aligns to
-changes in easymock 3.1 upstream. This patch should be dropped when the new
-version of easymock is uploaded.
-
-Forwarded: not-needed
-
----
- src/org/easymock/EasyMock.java | 12 ++++++------
- tests/org/easymock/tests2/CaptureTest.java | 14 +++++++-------
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/org/easymock/EasyMock.java b/src/org/easymock/EasyMock.java
-index 3b3309d..9b10b69 100644
---- a/src/org/easymock/EasyMock.java
-+++ b/src/org/easymock/EasyMock.java
-@@ -1468,7 +1468,7 @@ public class EasyMock {
- * @param captured Where the parameter is captured
- * @return <code>0</code>
- */
-- public static int capture(Capture<Integer> captured) {
-+ public static int captureInt(Capture<Integer> captured) {
- reportMatcher(new Captures<Integer>(captured));
- return 0;
- }
-@@ -1479,7 +1479,7 @@ public class EasyMock {
- * @param captured Where the parameter is captured
- * @return <code>0</code>
- */
-- public static long capture(Capture<Long> captured) {
-+ public static long captureLong(Capture<Long> captured) {
- reportMatcher(new Captures<Long>(captured));
- return 0;
- }
-@@ -1490,7 +1490,7 @@ public class EasyMock {
- * @param captured Where the parameter is captured
- * @return <code>0</code>
- */
-- public static float capture(Capture<Float> captured) {
-+ public static float captureFloat(Capture<Float> captured) {
- reportMatcher(new Captures<Float>(captured));
- return 0;
- }
-@@ -1501,7 +1501,7 @@ public class EasyMock {
- * @param captured Where the parameter is captured
- * @return <code>0</code>
- */
-- public static double capture(Capture<Double> captured) {
-+ public static double captureDouble(Capture<Double> captured) {
- reportMatcher(new Captures<Double>(captured));
- return 0;
- }
-@@ -1512,7 +1512,7 @@ public class EasyMock {
- * @param captured Where the parameter is captured
- * @return <code>0</code>
- */
-- public static byte capture(Capture<Byte> captured) {
-+ public static byte captureByte(Capture<Byte> captured) {
- reportMatcher(new Captures<Byte>(captured));
- return 0;
- }
-@@ -1523,7 +1523,7 @@ public class EasyMock {
- * @param captured Where the parameter is captured
- * @return <code>0</code>
- */
-- public static char capture(Capture<Character> captured) {
-+ public static char captureChar(Capture<Character> captured) {
- reportMatcher(new Captures<Character>(captured));
- return 0;
- }
-diff --git a/tests/org/easymock/tests2/CaptureTest.java
b/tests/org/easymock/tests2/CaptureTest.java
-index d1b4b98..19b880f 100644
---- a/tests/org/easymock/tests2/CaptureTest.java
-+++ b/tests/org/easymock/tests2/CaptureTest.java
-@@ -119,7 +119,7 @@ public class CaptureTest {
- Capture<Integer> capture = new Capture<Integer>();
- IMethods mock = createMock(IMethods.class);
-
-- expect(mock.oneArg(capture(capture))).andReturn("answer");
-+ expect(mock.oneArg(captureInt(capture))).andReturn("answer");
- expect(mock.oneArg((Integer) capture(capture))).andReturn("answer");
-
- replay(mock);
-@@ -160,12 +160,12 @@ public class CaptureTest {
-
- IMethods mock = createMock(IMethods.class);
-
-- expect(mock.oneArg(capture(captureI))).andReturn("answerI");
-- expect(mock.oneArg(capture(captureL))).andReturn("answerL");
-- expect(mock.oneArg(capture(captureF))).andReturn("answerF");
-- expect(mock.oneArg(capture(captureD))).andReturn("answerD");
-- expect(mock.oneArg(capture(captureB))).andReturn("answerB");
-- expect(mock.oneArg(capture(captureC))).andReturn("answerC");
-+ expect(mock.oneArg(captureInt(captureI))).andReturn("answerI");
-+ expect(mock.oneArg(captureLong(captureL))).andReturn("answerL");
-+ expect(mock.oneArg(captureFloat(captureF))).andReturn("answerF");
-+ expect(mock.oneArg(captureDouble(captureD))).andReturn("answerD");
-+ expect(mock.oneArg(captureByte(captureB))).andReturn("answerB");
-+ expect(mock.oneArg(captureChar(captureC))).andReturn("answerC");
-
- replay(mock);
-
Added: trunk/easymock/debian/patches/no-android.patch
===================================================================
--- trunk/easymock/debian/patches/no-android.patch
(rev 0)
+++ trunk/easymock/debian/patches/no-android.patch 2013-11-21 10:35:04 UTC
(rev 17471)
@@ -0,0 +1,25 @@
+From: Markus Koschany <[email protected]>
+Date: Wed, 13 Nov 2013 17:39:25 +0100
+Subject: no android
+
+---
+ src/org/easymock/internal/MocksControl.java | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/org/easymock/internal/MocksControl.java
b/src/org/easymock/internal/MocksControl.java
+index e709dc4..579a570 100644
+--- a/src/org/easymock/internal/MocksControl.java
++++ b/src/org/easymock/internal/MocksControl.java
+@@ -138,9 +138,9 @@ public class MocksControl implements IMocksControl,
IExpectationSetters<Object>,
+ }
+
+ // ///CLOVER:OFF
+- if (AndroidSupport.isAndroid()) {
+- return classProxyFactory = new AndroidClassProxyFactory();
+- }
++ // if (AndroidSupport.isAndroid()) {
++ // return classProxyFactory = new AndroidClassProxyFactory();
++ // }
+ // ///CLOVER:ON
+
+ try {
Modified: trunk/easymock/debian/patches/series
===================================================================
--- trunk/easymock/debian/patches/series 2013-11-21 06:42:37 UTC (rev
17470)
+++ trunk/easymock/debian/patches/series 2013-11-21 10:35:04 UTC (rev
17471)
@@ -1 +1 @@
-java7-compat.patch
+no-android.patch
Modified: trunk/easymock/debian/pom.xml
===================================================================
--- trunk/easymock/debian/pom.xml 2013-11-21 06:42:37 UTC (rev 17470)
+++ trunk/easymock/debian/pom.xml 2013-11-21 10:35:04 UTC (rev 17471)
@@ -1,338 +1,150 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-Copyright 2003-2009 Henri Tremblay
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.5.2</version>
- <packaging>jar</packaging>
- <name>EasyMock</name>
- <url>http://www.easymock.org</url>
- <description>EasyMock provides an easy way to create Mock Objects for
interfaces by generating them on the fly using Java's proxy
mechanism</description>
- <inceptionYear>2001</inceptionYear>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <organization>
- <name>OFFIS, Tammo Freese, Henri Tremblay</name>
- </organization>
- <developers>
- <developer>
- <id>tammo</id>
- <name>Tammo Freese</name>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>henri</id>
- <name>Henri Tremblay</name>
- <url>http://www.ossia-conseil.com/blog/henri</url>
- <organization>Ossia Conseil</organization>
- <organizationUrl>http://ossia-conseil.com</organizationUrl>
- <timezone>+1</timezone>
- </developer>
- </developers>
- <issueManagement>
- <system>SourceForge</system>
- <url>http://sourceforge.net/tracker/?group_id=82958</url>
- </issueManagement>
- <mailingLists>
- <mailingList>
- <name>User List</name>
- <subscribe>From Yahoo groups</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
- <archive>http://tech.groups.yahoo.com/group/easymock/</archive>
- </mailingList>
- </mailingLists>
- <scm>
-
<url>http://easymock.svn.sourceforge.net/viewvc/easymock/trunk/easymock/</url>
-
<developerConnection>scm:svn:https://easymock.svn.sourceforge.net/svnroot/easymock/trunk/easymock</developerConnection>
-
<connection>scm:svn:http://easymock.svn.sourceforge.net/svnroot/easymock/trunk/easymock</connection>
- </scm>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.keyboardsamurais.maven</groupId>
- <artifactId>maven-timestamp-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>date</id>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <propertyName>date</propertyName>
- <timestampPattern>yyyy-MM-dd</timestampPattern>
- </configuration>
- </execution>
- <execution>
- <id>year</id>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <propertyName>year</propertyName>
- <timestampPattern>yyyy</timestampPattern>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <configuration>
- <tasks />
- <testSourceRoot>${basedir}/src/samples/java</testSourceRoot>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
- <archive>
- <index>true</index>
- <addMavenDescriptor>false</addMavenDescriptor>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <configuration>
- <instructions>
-
<Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser,
org.easymock</Export-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>2.6.0</version>
- <configuration>
- <licenseLocation>${basedir}/clover.license</licenseLocation>
- <targetPercentage>100.00%</targetPercentage>
- <generateHtml>true</generateHtml>
- <generateXml>false</generateXml>
- <jdk>1.5</jdk>
- <excludes>
- <exclude>**/org/easymock/tests/IMethods.java</exclude>
- <exclude>**/org/easymock/tests/IVarArgs.java</exclude>
- <exclude>**/org/easymock/tests/Util.java</exclude>
- <exclude>**/org/easymock/samples/*.java</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>instrument</goal>
- <goal>clover</goal>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- Run the tests with JDK 1.5 to be sure EasyMock is compliant -->
- <jvm>${jdk1_5.jvm}</jvm>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
- <configuration>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <descriptors>
-
<descriptor>${basedir}/src/main/assembly/assembly-tests.xml</descriptor>
-
<descriptor>${basedir}/src/main/assembly/assembly-samples.xml</descriptor>
- <descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-5</version>
- </extension>
- </extensions>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>*.internal</excludePackageNames>
- <bottom><![CDATA[<i>Copyright ©
${project.inceptionYear}-${year} OFFIS, Tammo Freese, Henri Tremblay. This
documentation is provided under the terms of the Apache 2
licence.</i>]]></bottom>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>2.6.0</version>
- <configuration>
- <licenseLocation>${basedir}/clover.license</licenseLocation>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- </plugins>
- </reporting>
- <distributionManagement>
- <repository>
- <id>easymock-release</id>
- <name>EasyMock Repository</name>
-
<url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository</url>
- </repository>
- <snapshotRepository>
- <id>easymock-snapshot</id>
- <name>EasyMock Snapshot Repository</name>
-
<url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository-snapshot</url>
- </snapshotRepository>
- </distributionManagement>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock-parent</artifactId>
+ <version>3.2</version>
+ </parent>
+
+ <artifactId>easymock</artifactId>
+ <packaging>jar</packaging>
+ <name>EasyMock</name>
+ <description>EasyMock provides an easy way to create Mock Objects for
interfaces and classes generating them on the fly</description>
+ <inceptionYear>2001</inceptionYear>
+ <organization>
+ <name>OFFIS, Tammo Freese, Henri Tremblay</name>
+ </organization>
+ <developers>
+ <developer>
+ <id>tammo</id>
+ <name>Tammo Freese</name>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>henri</id>
+ <name>Henri Tremblay</name>
+ <url>http://henritremblay.blogspot.fr/</url>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <!-- Used for class mocking -->
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <!-- Used for class mocking -->
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <!-- Used for class mocking on Android (cglib replacement) -->
+ <dependency>
+ <groupId>com.google.dexmaker</groupId>
+ <artifactId>dexmaker</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/src/samples/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock</Export-Package>
+
<Import-Package>net.sf.cglib.core;resolution:=optional,net.sf.cglib.proxy;resolution:=optional,net.sf.cglib.reflect;resolution:=optional,org.easymock,org.easymock.internal;poweruser=true,org.objenesis;resolution:=optional</Import-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>fullBuild</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/org/easymock/tests/IMethods.java</exclude>
+ <exclude>**/org/easymock/tests/IVarArgs.java</exclude>
+ <exclude>**/org/easymock/tests/Util.java</exclude>
+ <exclude>**/org/easymock/samples/*.java</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>clover</goal>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>deployBuild</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>easymock-bundle</id>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Modified: trunk/easymock/debian/rules
===================================================================
--- trunk/easymock/debian/rules 2013-11-21 06:42:37 UTC (rev 17470)
+++ trunk/easymock/debian/rules 2013-11-21 10:35:04 UTC (rev 17471)
@@ -1,12 +1,13 @@
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
+export
CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib.jar:/usr/share/java/junit4.jar
PKD = $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if
m{^Version:\s*([\d\.]+)}')
DTYPE = +ds
%:
- dh $@ --with javahelper --with jh_maven_repo_helper
+ dh $@ --with javahelper,jh_maven_repo_helper
override_dh_auto_build:
ant -f $(CURDIR)/debian/build.xml jar javadoc test
@@ -36,8 +37,7 @@
unzip $(PKG)-$(VER)-PRE/easymock-$(VER)-tests.jar -d $(PKG)-$(VER)/tests
@echo "# Cleaning-up..."
$(RM) -r -v \
- $(PKG)-$(VER)-PRE/*.jar \
- $(PKG)-$(VER)-PRE/clover
+ $(PKG)-$(VER)-PRE/*.jar
cp -v $(PKG)-$(VER)-PRE/* $(PKG)-$(VER)
cd $(PKG)-$(VER) \
&& $(RM) -r -v \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
