[maven-shared-io] Migrate from easymock 1 to easymock 3
by Mikolaj Izdebski
commit de7589a89bdb3960452d43213e13afc0eb8666b3
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Aug 30 10:20:53 2013 +0200
Migrate from easymock 1 to easymock 3
- Resolves: rhbz#1002479
Signed-off-by: Mikolaj Izdebski <mizdebsk(a)redhat.com>
0001-Update-to-easymock-3.2.patch | 665 +++++++++++++++++++++++++++++++++++++
maven-shared-io.spec | 8 +-
2 files changed, 672 insertions(+), 1 deletions(-)
---
diff --git a/0001-Update-to-easymock-3.2.patch b/0001-Update-to-easymock-3.2.patch
new file mode 100644
index 0000000..7e9f2b8
--- /dev/null
+++ b/0001-Update-to-easymock-3.2.patch
@@ -0,0 +1,665 @@
+From fb5a20cb3ee156dc7a3c4e7ff0dbd501e217ea67 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Fri, 30 Aug 2013 09:45:04 +0200
+Subject: [PATCH] Update to easymock 3.2
+
+---
+ pom.xml | 13 +-
+ .../org/apache/maven/shared/io/MockManager.java | 23 ++--
+ .../io/download/DefaultDownloadManagerTest.java | 104 ++++----------
+ .../io/location/ArtifactLocatorStrategyTest.java | 153 ++++++---------------
+ .../maven/shared/io/location/LocatorTest.java | 19 +--
+ 5 files changed, 93 insertions(+), 219 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 0f26ad8..c00fe34 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -80,9 +80,9 @@
+ </dependency>
+
+ <dependency>
+- <groupId>easymock</groupId>
++ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+- <version>1.2_Java1.3</version>
++ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+@@ -90,6 +90,15 @@
+ <build>
+ <plugins>
+ <plugin>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <version>3.1</version>
++ <configuration>
++ <source>1.5</source>
++ <target>1.5</target>
++ </configuration>
++ </plugin>
++
++ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+diff --git a/src/test/java/org/apache/maven/shared/io/MockManager.java b/src/test/java/org/apache/maven/shared/io/MockManager.java
+index 93c2c5d..56e0b8c 100644
+--- a/src/test/java/org/apache/maven/shared/io/MockManager.java
++++ b/src/test/java/org/apache/maven/shared/io/MockManager.java
+@@ -20,38 +20,35 @@ package org.apache.maven.shared.io;
+ */
+
+ import java.util.ArrayList;
+-import java.util.Iterator;
+ import java.util.List;
+
+-import org.easymock.MockControl;
++import org.easymock.EasyMock;
+
+ public class MockManager
+ {
+
+- private List mockControls = new ArrayList();
++ private List<Object> mocks = new ArrayList<Object>();
+
+- public void add( MockControl control )
++ public <T> T add( Class<T> clazz )
+ {
+- mockControls.add( control );
++ T mock = EasyMock.createMock( clazz );
++ mocks.add( mock );
++ return mock;
+ }
+
+ public void replayAll()
+ {
+- for ( Iterator it = mockControls.iterator(); it.hasNext(); )
++ for ( Object mock : mocks )
+ {
+- MockControl control = (MockControl) it.next();
+-
+- control.replay();
++ EasyMock.replay( mock );
+ }
+ }
+
+ public void verifyAll()
+ {
+- for ( Iterator it = mockControls.iterator(); it.hasNext(); )
++ for ( Object mock : mocks )
+ {
+- MockControl control = (MockControl) it.next();
+-
+- control.verify();
++ EasyMock.verify( mock );
+ }
+ }
+
+diff --git a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java
+index 218ffc8..f99bccb 100644
+--- a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java
++++ b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java
+@@ -40,7 +40,7 @@ import org.apache.maven.wagon.events.TransferListener;
+ import org.apache.maven.wagon.proxy.ProxyInfo;
+ import org.apache.maven.wagon.repository.Repository;
+ import org.codehaus.plexus.PlexusTestCase;
+-import org.easymock.MockControl;
++import static org.easymock.EasyMock.*;
+
+ public class DefaultDownloadManagerTest
+ extends PlexusTestCase
+@@ -48,12 +48,8 @@ public class DefaultDownloadManagerTest
+
+ private MockManager mockManager;
+
+- private MockControl wagonManagerControl;
+-
+ private WagonManager wagonManager;
+
+- private MockControl wagonControl;
+-
+ private Wagon wagon;
+
+ public void setUp()
+@@ -63,15 +59,9 @@ public class DefaultDownloadManagerTest
+
+ mockManager = new MockManager();
+
+- wagonManagerControl = MockControl.createControl( WagonManager.class );
+- mockManager.add( wagonManagerControl );
+-
+- wagonManager = (WagonManager) wagonManagerControl.getMock();
++ wagonManager = mockManager.add( WagonManager.class );
+
+- wagonControl = MockControl.createControl( Wagon.class );
+- mockManager.add( wagonControl );
+-
+- wagon = (Wagon) wagonControl.getMock();
++ wagon = mockManager.add( Wagon.class );
+ }
+
+ public void testShouldConstructWithNoParamsAndHaveNonNullMessageHolder()
+@@ -83,10 +73,7 @@ public class DefaultDownloadManagerTest
+ {
+ MockManager mockManager = new MockManager();
+
+- MockControl ctl = MockControl.createControl( WagonManager.class );
+- mockManager.add( ctl );
+-
+- WagonManager wagonManager = (WagonManager) ctl.getMock();
++ WagonManager wagonManager = mockManager.add( WagonManager.class );
+
+ mockManager.replayAll();
+
+@@ -105,10 +92,7 @@ public class DefaultDownloadManagerTest
+ {
+ MockManager mockManager = new MockManager();
+
+- MockControl ctl = MockControl.createControl( WagonManager.class );
+- mockManager.add( ctl );
+-
+- WagonManager wagonManager = (WagonManager) ctl.getMock();
++ WagonManager wagonManager = mockManager.add( WagonManager.class );
+
+ mockManager.replayAll();
+
+@@ -178,10 +162,7 @@ public class DefaultDownloadManagerTest
+
+ setupDefaultMockConfiguration();
+
+- MockControl transferListenerControl = MockControl.createControl( TransferListener.class );
+- mockManager.add( transferListenerControl );
+-
+- TransferListener transferListener = (TransferListener) transferListenerControl.getMock();
++ TransferListener transferListener = mockManager.add( TransferListener.class );
+
+ wagon.addTransferListener( transferListener );
+
+@@ -378,26 +359,20 @@ public class DefaultDownloadManagerTest
+ {
+ try
+ {
+- wagonManager.getWagon( "file" );
+- wagonManagerControl.setReturnValue( wagon );
++ expect( wagonManager.getWagon( "file" ) ).andReturn( wagon );
+ }
+ catch ( UnsupportedProtocolException e )
+ {
+ fail( "This shouldn't happen!!" );
+ }
+
+- wagonManager.getAuthenticationInfo( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getAuthenticationInfo( anyString() ) ).andReturn( null );
+
+- wagonManager.getProxy( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getProxy( anyString() ) ).andReturn( null );
+
+ try
+ {
+- wagon.connect( new Repository(), new AuthenticationInfo(), new ProxyInfo() );
+- wagonControl.setMatcher( MockControl.ALWAYS_MATCHER );
++ wagon.connect( anyObject( Repository.class ), anyObject( AuthenticationInfo.class ), anyObject( ProxyInfo.class ) );
+ }
+ catch ( ConnectionException e )
+ {
+@@ -410,8 +385,7 @@ public class DefaultDownloadManagerTest
+
+ try
+ {
+- wagon.get( "file:///some/path", new File( "." ) );
+- wagonControl.setMatcher( MockControl.ALWAYS_MATCHER );
++ wagon.get( anyString(), anyObject( File.class ) );
+ }
+ catch ( TransferFailedException e )
+ {
+@@ -441,7 +415,7 @@ public class DefaultDownloadManagerTest
+ try
+ {
+ wagonManager.getWagon( "file" );
+- wagonManagerControl.setThrowable( error );
++ expectLastCall().andThrow( error );
+ }
+ catch ( UnsupportedProtocolException e )
+ {
+@@ -453,27 +427,21 @@ public class DefaultDownloadManagerTest
+ {
+ try
+ {
+- wagonManager.getWagon( "file" );
+- wagonManagerControl.setReturnValue( wagon );
++ expect( wagonManager.getWagon( "file" ) ).andReturn( wagon );
+ }
+ catch ( UnsupportedProtocolException e )
+ {
+ fail( "This shouldn't happen!!" );
+ }
+
+- wagonManager.getAuthenticationInfo( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getAuthenticationInfo( anyString() ) ).andReturn( null );
+
+- wagonManager.getProxy( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getProxy( anyString() ) ).andReturn( null );
+
+ try
+ {
+- wagon.connect( new Repository(), new AuthenticationInfo(), new ProxyInfo() );
+- wagonControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonControl.setThrowable( error );
++ wagon.connect( anyObject( Repository.class ), anyObject( AuthenticationInfo.class ), anyObject( ProxyInfo.class ) );
++ expectLastCall().andThrow( error );
+ }
+ catch ( ConnectionException e )
+ {
+@@ -489,26 +457,20 @@ public class DefaultDownloadManagerTest
+ {
+ try
+ {
+- wagonManager.getWagon( "file" );
+- wagonManagerControl.setReturnValue( wagon );
++ expect( wagonManager.getWagon( "file" ) ).andReturn( wagon );
+ }
+ catch ( UnsupportedProtocolException e )
+ {
+ fail( "This shouldn't happen!!" );
+ }
+
+- wagonManager.getAuthenticationInfo( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getAuthenticationInfo( anyString() ) ).andReturn( null );
+
+- wagonManager.getProxy( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getProxy( anyString() ) ).andReturn( null );
+
+ try
+ {
+- wagon.connect( new Repository(), new AuthenticationInfo(), new ProxyInfo() );
+- wagonControl.setMatcher( MockControl.ALWAYS_MATCHER );
++ wagon.connect( anyObject( Repository.class ), anyObject( AuthenticationInfo.class ), anyObject( ProxyInfo.class ) );
+ }
+ catch ( ConnectionException e )
+ {
+@@ -521,9 +483,8 @@ public class DefaultDownloadManagerTest
+
+ try
+ {
+- wagon.get( "file:///some/path", new File( "." ) );
+- wagonControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonControl.setThrowable( error );
++ wagon.get( anyString(), anyObject( File.class ) );
++ expectLastCall().andThrow( error );
+ }
+ catch ( TransferFailedException e )
+ {
+@@ -552,26 +513,20 @@ public class DefaultDownloadManagerTest
+ {
+ try
+ {
+- wagonManager.getWagon( "file" );
+- wagonManagerControl.setReturnValue( wagon );
++ expect( wagonManager.getWagon( "file" ) ).andReturn( wagon );
+ }
+ catch ( UnsupportedProtocolException e )
+ {
+ fail( "This shouldn't happen!!" );
+ }
+
+- wagonManager.getAuthenticationInfo( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getAuthenticationInfo( anyString() ) ).andReturn( null );
+
+- wagonManager.getProxy( "" );
+- wagonManagerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- wagonManagerControl.setReturnValue( null );
++ expect( wagonManager.getProxy( anyString() ) ).andReturn( null );
+
+ try
+ {
+- wagon.connect( new Repository(), new AuthenticationInfo(), new ProxyInfo() );
+- wagonControl.setMatcher( MockControl.ALWAYS_MATCHER );
++ wagon.connect( anyObject( Repository.class ), anyObject( AuthenticationInfo.class ), anyObject( ProxyInfo.class ) );
+ }
+ catch ( ConnectionException e )
+ {
+@@ -584,8 +539,7 @@ public class DefaultDownloadManagerTest
+
+ try
+ {
+- wagon.get( "file:///some/path", new File( "." ) );
+- wagonControl.setMatcher( MockControl.ALWAYS_MATCHER );
++ wagon.get( anyString(), anyObject( File.class ) );
+ }
+ catch ( TransferFailedException e )
+ {
+@@ -603,7 +557,7 @@ public class DefaultDownloadManagerTest
+ try
+ {
+ wagon.disconnect();
+- wagonControl.setThrowable( error );
++ expectLastCall().andThrow( error );
+ }
+ catch ( ConnectionException e )
+ {
+diff --git a/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java b/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java
+index 7a8609f..ba45e17 100644
+--- a/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java
++++ b/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java
+@@ -34,7 +34,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolver;
+ import org.apache.maven.shared.io.MockManager;
+ import org.apache.maven.shared.io.logging.DefaultMessageHolder;
+ import org.apache.maven.shared.io.logging.MessageHolder;
+-import org.easymock.MockControl;
++import static org.easymock.EasyMock.*;
+
+ public class ArtifactLocatorStrategyTest
+ extends TestCase
+@@ -42,34 +42,19 @@ public class ArtifactLocatorStrategyTest
+
+ private MockManager mockManager = new MockManager();
+
+- private MockControl factoryControl;
+-
+ private ArtifactFactory factory;
+
+- private MockControl resolverControl;
+-
+ private ArtifactResolver resolver;
+
+- private MockControl localRepositoryControl;
+-
+ private ArtifactRepository localRepository;
+
+ public void setUp()
+ {
+- factoryControl = MockControl.createControl( ArtifactFactory.class );
+- mockManager.add( factoryControl );
+-
+- factory = (ArtifactFactory) factoryControl.getMock();
++ factory = mockManager.add( ArtifactFactory.class );
+
+- resolverControl = MockControl.createControl( ArtifactResolver.class );
+- mockManager.add( resolverControl );
++ resolver = mockManager.add( ArtifactResolver.class );
+
+- resolver = (ArtifactResolver) resolverControl.getMock();
+-
+- localRepositoryControl = MockControl.createControl( ArtifactRepository.class );
+- mockManager.add( localRepositoryControl );
+-
+- localRepository = (ArtifactRepository) localRepositoryControl.getMock();
++ localRepository = mockManager.add( ArtifactRepository.class );
+ }
+
+ public void testShouldConstructWithoutDefaultArtifactType()
+@@ -128,17 +113,10 @@ public class ArtifactLocatorStrategyTest
+ File tempFile = File.createTempFile( "artifact-location.", ".temp" );
+ tempFile.deleteOnExit();
+
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
++ Artifact artifact = mockManager.add( Artifact.class );
++ expect( artifact.getFile() ).andReturn( tempFile ).times( 2 );
+
+- Artifact artifact = (Artifact) artifactControl.getMock();
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+-
+- factory.createArtifact( "group", "artifact", "version", null, "jar" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifact( "group", "artifact", "version", null, "jar" ) ).andReturn( artifact );
+
+ try
+ {
+@@ -177,17 +155,10 @@ public class ArtifactLocatorStrategyTest
+ File tempFile = File.createTempFile( "artifact-location.", ".temp" );
+ tempFile.deleteOnExit();
+
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
+-
+- Artifact artifact = (Artifact) artifactControl.getMock();
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
++ Artifact artifact = mockManager.add( Artifact.class );
++ expect( artifact.getFile() ).andReturn( tempFile ).times( 2 );
+
+- factory.createArtifact( "group", "artifact", "version", null, "zip" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifact( "group", "artifact", "version", null, "zip" ) ).andReturn( artifact );
+
+ try
+ {
+@@ -226,17 +197,10 @@ public class ArtifactLocatorStrategyTest
+ File tempFile = File.createTempFile( "artifact-location.", ".temp" );
+ tempFile.deleteOnExit();
+
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
++ Artifact artifact = mockManager.add( Artifact.class );
++ expect( artifact.getFile() ).andReturn( tempFile ).times( 2 );
+
+- Artifact artifact = (Artifact) artifactControl.getMock();
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+-
+- factory.createArtifact( "group", "artifact", "version", null, "zip" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifact( "group", "artifact", "version", null, "zip" ) ).andReturn( artifact );
+
+ try
+ {
+@@ -275,17 +239,10 @@ public class ArtifactLocatorStrategyTest
+ File tempFile = File.createTempFile( "artifact-location.", ".temp" );
+ tempFile.deleteOnExit();
+
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
+-
+- Artifact artifact = (Artifact) artifactControl.getMock();
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
++ Artifact artifact = mockManager.add( Artifact.class );
++ expect( artifact.getFile() ).andReturn( tempFile ).times( 2 );
+
+- factory.createArtifactWithClassifier( "group", "artifact", "version", "zip", "classifier" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifactWithClassifier( "group", "artifact", "version", "zip", "classifier" ) ).andReturn( artifact );
+
+ try
+ {
+@@ -324,17 +281,10 @@ public class ArtifactLocatorStrategyTest
+ File tempFile = File.createTempFile( "artifact-location.", ".temp" );
+ tempFile.deleteOnExit();
+
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
++ Artifact artifact = mockManager.add( Artifact.class );
++ expect( artifact.getFile() ).andReturn( tempFile ).times( 2 );
+
+- Artifact artifact = (Artifact) artifactControl.getMock();
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+-
+- factory.createArtifactWithClassifier( "group", "artifact", "version", "jar", "classifier" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifactWithClassifier( "group", "artifact", "version", "jar", "classifier" ) ).andReturn( artifact );
+
+ try
+ {
+@@ -373,17 +323,10 @@ public class ArtifactLocatorStrategyTest
+ File tempFile = File.createTempFile( "artifact-location.", ".temp" );
+ tempFile.deleteOnExit();
+
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
+-
+- Artifact artifact = (Artifact) artifactControl.getMock();
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
+- artifact.getFile();
+- artifactControl.setReturnValue( tempFile );
++ Artifact artifact = mockManager.add( Artifact.class );
++ expect( artifact.getFile() ).andReturn( tempFile ).times( 2 );
+
+- factory.createArtifactWithClassifier( "group", "artifact", "version", "zip", "classifier" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifactWithClassifier( "group", "artifact", "version", "zip", "classifier" ) ).andReturn( artifact );
+
+ try
+ {
+@@ -421,17 +364,11 @@ public class ArtifactLocatorStrategyTest
+ public void testShouldNotResolveSpecToArtifactWithNullFile()
+ throws IOException
+ {
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
++ Artifact artifact = mockManager.add( Artifact.class );
++ expect( artifact.getFile() ).andReturn( null );
++ expect( artifact.getId() ).andReturn( "<some-artifact-id>" );
+
+- Artifact artifact = (Artifact) artifactControl.getMock();
+- artifact.getFile();
+- artifactControl.setReturnValue( null );
+- artifact.getId();
+- artifactControl.setReturnValue( "<some-artifact-id>" );
+-
+- factory.createArtifact( "group", "artifact", "version", null, "jar" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifact( "group", "artifact", "version", null, "jar" ) ).andReturn( artifact );
+
+ try
+ {
+@@ -467,24 +404,19 @@ public class ArtifactLocatorStrategyTest
+ public void testShouldNotResolveWhenArtifactNotFoundExceptionThrown()
+ throws IOException
+ {
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
+-
+- Artifact artifact = (Artifact) artifactControl.getMock();
++ Artifact artifact = mockManager.add( Artifact.class );
+
+- artifact.getId();
+- artifactControl.setReturnValue( "<some-artifact-id>" );
++ expect( artifact.getId() ).andReturn( "<some-artifact-id>" );
+
+- factory.createArtifact( "group", "artifact", "version", null, "jar" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifact( "group", "artifact", "version", null, "jar" ) ).andReturn( artifact );
+
+ try
+ {
+ resolver.resolve( artifact, Collections.EMPTY_LIST, localRepository );
+- resolverControl.setThrowable( new ArtifactNotFoundException( "not found", "group", "artifact", "version",
+- "jar", Collections.EMPTY_LIST,
+- "http://nowhere.com", Collections.EMPTY_LIST,
+- new NullPointerException() ) );
++ expectLastCall().andThrow( new ArtifactNotFoundException( "not found", "group", "artifact", "version",
++ "jar", Collections.EMPTY_LIST,
++ "http://nowhere.com", Collections.EMPTY_LIST,
++ new NullPointerException() ) );
+ }
+ catch ( ArtifactResolutionException e )
+ {
+@@ -517,24 +449,19 @@ public class ArtifactLocatorStrategyTest
+ public void testShouldNotResolveWhenArtifactResolutionExceptionThrown()
+ throws IOException
+ {
+- MockControl artifactControl = MockControl.createControl( Artifact.class );
+- mockManager.add( artifactControl );
+-
+- Artifact artifact = (Artifact) artifactControl.getMock();
++ Artifact artifact = mockManager.add( Artifact.class );
+
+- artifact.getId();
+- artifactControl.setReturnValue( "<some-artifact-id>" );
++ expect( artifact.getId() ).andReturn( "<some-artifact-id>" );
+
+- factory.createArtifact( "group", "artifact", "version", null, "jar" );
+- factoryControl.setReturnValue( artifact );
++ expect( factory.createArtifact( "group", "artifact", "version", null, "jar" ) ).andReturn( artifact );
+
+ try
+ {
+ resolver.resolve( artifact, Collections.EMPTY_LIST, localRepository );
+- resolverControl.setThrowable( new ArtifactResolutionException( "resolution failed", "group", "artifact",
+- "version", "jar", Collections.EMPTY_LIST,
+- Collections.EMPTY_LIST,
+- new NullPointerException() ) );
++ expectLastCall().andThrow( new ArtifactResolutionException( "resolution failed", "group", "artifact",
++ "version", "jar", Collections.EMPTY_LIST,
++ Collections.EMPTY_LIST,
++ new NullPointerException() ) );
+ }
+ catch ( ArtifactResolutionException e )
+ {
+diff --git a/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java b/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java
+index 34040ee..86b247c 100644
+--- a/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java
++++ b/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java
+@@ -26,7 +26,6 @@ import java.util.List;
+ import org.apache.maven.shared.io.MockManager;
+ import org.apache.maven.shared.io.logging.DefaultMessageHolder;
+ import org.apache.maven.shared.io.logging.MessageHolder;
+-import org.easymock.MockControl;
+
+ import junit.framework.TestCase;
+
+@@ -63,17 +62,9 @@ public class LocatorTest
+ {
+ MockManager mgr = new MockManager();
+
+- MockControl originalStrategyControl = MockControl.createControl( LocatorStrategy.class );
++ LocatorStrategy originalStrategy = mgr.add( LocatorStrategy.class );
+
+- mgr.add( originalStrategyControl );
+-
+- LocatorStrategy originalStrategy = (LocatorStrategy) originalStrategyControl.getMock();
+-
+- MockControl replacementStrategyControl = MockControl.createControl( LocatorStrategy.class );
+-
+- mgr.add( replacementStrategyControl );
+-
+- LocatorStrategy replacementStrategy = (LocatorStrategy) replacementStrategyControl.getMock();
++ LocatorStrategy replacementStrategy = mgr.add( LocatorStrategy.class );
+
+ mgr.replayAll();
+
+@@ -94,11 +85,7 @@ public class LocatorTest
+ {
+ MockManager mgr = new MockManager();
+
+- MockControl originalStrategyControl = MockControl.createControl( LocatorStrategy.class );
+-
+- mgr.add( originalStrategyControl );
+-
+- LocatorStrategy originalStrategy = (LocatorStrategy) originalStrategyControl.getMock();
++ LocatorStrategy originalStrategy = mgr.add( LocatorStrategy.class );
+
+ mgr.replayAll();
+
+--
+1.8.3.1
+
diff --git a/maven-shared-io.spec b/maven-shared-io.spec
index 4056745..7285534 100644
--- a/maven-shared-io.spec
+++ b/maven-shared-io.spec
@@ -11,11 +11,12 @@ URL: http://maven.apache.org/shared/maven-shared-io
Source0: %{name}-%{version}.tar.xz
# ASL mandates that the licence file be included in redistributed source
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
+Patch1: 0001-Update-to-easymock-3.2.patch
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: maven-shared
-BuildRequires: easymock
+BuildRequires: easymock3
Obsoletes: maven-shared-io < %{epoch}:%{version}-%{release}
Provides: maven-shared-io = %{epoch}:%{version}-%{release}
@@ -33,6 +34,7 @@ API documentation for %{name}.
%prep
%setup -q
+%patch1 -p1
%pom_add_dep org.apache.maven:maven-compat
@@ -55,6 +57,10 @@ cp %{SOURCE1} LICENSE.txt
%doc LICENSE.txt
%changelog
+* Fri Aug 30 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.1-6
+- Migrate from easymock 1 to easymock 3
+- Resolves: rhbz#1002479
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 8 months
[maven-plugin-tools] Adapt to current guidelines (Resolves: #960526)
by Michal Srb
commit 4d666a134a8b6c73eeed0415e2a76123c054ade1
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Aug 30 07:24:31 2013 +0200
Adapt to current guidelines (Resolves: #960526)
maven-plugin-tools.spec | 331 ++++++++++-------------------------------------
1 files changed, 69 insertions(+), 262 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 3af6913..352a099 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,10 +1,9 @@
Name: maven-plugin-tools
Version: 3.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
-Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugin-tools/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{ver...
@@ -14,53 +13,37 @@ BuildArch: noarch
# See: rhbz#920042, http://jira.codehaus.org/browse/MPLUGIN-242
Patch0: %{name}-rhbz-920042.patch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
BuildRequires: maven-local
-BuildRequires: ant
-BuildRequires: bsh
-BuildRequires: jtidy
-BuildRequires: maven-artifact-manager
-BuildRequires: maven-doxia-sink-api
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-plugin-annotations
-BuildRequires: maven-plugin-descriptor
-BuildRequires: maven-plugin-registry
-BuildRequires: maven-plugin-tools-annotations
-BuildRequires: maven-plugin-tools-api
-BuildRequires: maven-plugin-tools-generators
-BuildRequires: maven-plugin-tools-java
-BuildRequires: maven-plugin-tools-model
-BuildRequires: maven-project
-BuildRequires: maven-shared-reporting-api
-BuildRequires: maven-shared-reporting-impl
-BuildRequires: objectweb-asm
-BuildRequires: plexus-ant-factory
-BuildRequires: plexus-archiver
-BuildRequires: plexus-bsh-factory
-BuildRequires: plexus-containers-component-annotations
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-utils
-BuildRequires: plexus-velocity
-BuildRequires: qdox
-BuildRequires: velocity
-# This is parent POM of the plexus-ant-factory. It is not pulled in
-# as a dependency of plexus-ant-factory, but we need it, because
-# maven-script-ant subpackage fails to build without it.
-BuildRequires: plexus-component-factories-pom
-# Test dependencies:
-%if 0
-BuildRequires: easymock
-BuildRequires: fest-assert
-BuildRequires: junit
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: plexus-compiler
-BuildRequires: xmlunit
-%endif
-
-Requires: java
-Requires: jpackage-utils
+BuildRequires: mvn(asm:asm)
+BuildRequires: mvn(asm:asm-commons)
+BuildRequires: mvn(bsh:bsh)
+BuildRequires: mvn(com.thoughtworks.qdox:qdox)
+BuildRequires: mvn(net.sf.jtidy:jtidy)
+BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.ant:ant-launcher)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-parent)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-plugin-descriptor)
+BuildRequires: mvn(org.apache.maven:maven-plugin-registry)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven:maven-repository-metadata)
+BuildRequires: mvn(org.apache.velocity:velocity)
+BuildRequires: mvn(org.codehaus.plexus:plexus-ant-factory)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-bsh-factory)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
%description
@@ -70,9 +53,6 @@ Plugins in a variety of languages.
%package -n maven-plugin-annotations
Summary: Maven Plugin Java 5 Annotations
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
Obsoletes: maven-plugin-annotations < 0:%{version}-%{release}
%description -n maven-plugin-annotations
@@ -81,26 +61,6 @@ This package contains Java 5 annotations to use in Mojos.
%package -n maven-plugin-plugin
Summary: Maven Plugin Plugin
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-artifact-manager
-Requires: maven-doxia-sink-api
-Requires: maven-doxia-sitetools
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-registry
-Requires: maven-plugin-tools-annotations
-Requires: maven-plugin-tools-api
-Requires: maven-plugin-tools-beanshell
-Requires: maven-plugin-tools-generators
-Requires: maven-plugin-tools-java
-Requires: maven-plugin-tools-model
-Requires: maven-project
-Requires: maven-shared-reporting-api
-Requires: maven-shared-reporting-impl
-Requires: plexus-utils
-Requires: plexus-velocity
-Requires: velocity
Obsoletes: maven2-plugin-plugin < 0:%{version}-%{release}
Provides: maven2-plugin-plugin = 0:%{version}-%{release}
@@ -113,19 +73,6 @@ artifact metadata and a generic help goal.
%package annotations
Summary: Maven Plugin Tool for Annotations
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-plugin-annotations
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-project
-Requires: objectweb-asm
-Requires: plexus-archiver
-Requires: plexus-containers-component-annotations
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: qdox
%description annotations
This package provides Java 5 annotation tools for use with Apache Maven.
@@ -133,15 +80,6 @@ This package provides Java 5 annotation tools for use with Apache Maven.
%package ant
Summary: Maven Plugin Tool for Ant
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-plugin-tools-model
-Requires: maven-project
-Requires: plexus-containers-component-annotations
-Requires: plexus-containers-container-default
-Requires: plexus-utils
Obsoletes: maven-shared-plugin-tools-ant < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-ant = 0:%{version}-%{release}
@@ -151,13 +89,6 @@ Descriptor extractor for plugins written in Ant.
%package api
Summary: Maven Plugin Tools APIs
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-project
-Requires: plexus-containers-container-default
-Requires: plexus-utils
Obsoletes: maven-shared-plugin-tools-api < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release}
@@ -168,12 +99,6 @@ and generate documentation for Maven Plugins.
%package beanshell
Summary: Maven Plugin Tool for Beanshell
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: bsh
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: plexus-containers-component-annotations
Obsoletes: maven-shared-plugin-tools-beanshell < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-beanshell = 0:%{version}-%{release}
@@ -183,19 +108,6 @@ Descriptor extractor for plugins written in Beanshell.
%package generators
Summary: Maven Plugin Tools Generators
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: jtidy
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-project
-Requires: maven-shared-reporting-api
-Requires: objectweb-asm
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: plexus-velocity
-Requires: velocity
%description generators
The Maven Plugin Tools Generators provides content generation
@@ -204,16 +116,6 @@ The Maven Plugin Tools Generators provides content generation
%package java
Summary: Maven Plugin Tool for Java
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-project
-Requires: plexus-containers-component-annotations
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: qdox
Obsoletes: maven-shared-plugin-tools-java < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-java = 0:%{version}-%{release}
@@ -225,9 +127,6 @@ Descriptor extractor for plugins written in Java.
%package javadoc
Summary: Maven Plugin Tools Javadoc
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven-plugin-tools-java
%description javadoc
The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when
@@ -239,11 +138,6 @@ Java API documentation for %{name} is contained in
%package model
Summary: Maven Plugin Metadata Model
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven-plugin-descriptor
-Requires: plexus-containers-container-default
-Requires: plexus-utils
Obsoletes: maven-shared-plugin-tools-model < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-model = 0:%{version}-%{release}
@@ -254,7 +148,6 @@ model.
%package -n maven-script
Summary: Maven Script Mojo Support
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: jpackage-utils
%description -n maven-script
Maven Script Mojo Support lets developer write Maven plugins/goals
@@ -263,16 +156,6 @@ with scripting languages instead of compiled Java.
%package -n maven-script-ant
Summary: Maven Ant Mojo Support
Requires: maven-script = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: ant
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-project
-Requires: plexus-ant-factory
-Requires: plexus-archiver
-Requires: plexus-containers-container-default
-Requires: plexus-component-factories-pom
%description -n maven-script-ant
This package provides %{summary}, which write Maven plugins with
@@ -281,10 +164,6 @@ Ant scripts.
%package -n maven-script-beanshell
Summary: Maven Beanshell Mojo Support
Requires: maven-script = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: plexus-bsh-factory
%description -n maven-script-beanshell
This package provides %{summary}, which write Maven plugins with
@@ -295,9 +174,7 @@ Beanshell scripts.
# consensus that current naming scheme should be kept, even if it doesn't
# conform to the guidelines. mizdebsk, September 2012
%package javadocs
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadocs
API documentation for %{name}.
@@ -318,120 +195,50 @@ ln -s maven-script/maven-script-{ant,beanshell} .
%mvn_config buildSettings/skipTests true
%build
-mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true
+%mvn_build -s -f
%install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-# pom artifacts
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-install -pm 644 maven-script/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-script.pom
-%add_maven_depmap -f maven-script JPP.%{name}-maven-script.pom
-mv %{buildroot}%{_mavendepmapfragdir}/%{name}-maven-script %{buildroot}%{_mavendepmapfragdir}/maven-script
-
-# jar or plugin artifacts
-for module in \
- maven-plugin-annotations \
- maven-plugin-plugin \
- maven-plugin-tools-annotations \
- maven-plugin-tools-ant \
- maven-plugin-tools-api \
- maven-plugin-tools-beanshell \
- maven-plugin-tools-generators \
- maven-plugin-tools-java \
- maven-plugin-tools-javadoc \
- maven-plugin-tools-model \
- maven-script-ant \
- maven-script-beanshell
-do
- install -p -m 644 ${module}/target/${module}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${module}.jar
- install -p -m 644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${module}.pom
- %add_maven_depmap -f ${module} JPP.%{name}-${module}.pom %{name}/${module}.jar
- mv %{buildroot}%{_mavendepmapfragdir}/%{name}-${module} %{buildroot}%{_mavendepmapfragdir}/${module}
-done
-
-# javadoc
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
-%doc LICENSE NOTICE
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files -n maven-plugin-annotations
-%{_javadir}/%{name}/maven-plugin-annotations.jar
-%{_mavenpomdir}/JPP.%{name}-maven-plugin-annotations.pom
-%{_mavendepmapfragdir}/maven-plugin-annotations
-
-%files -n maven-plugin-plugin
-%{_javadir}/%{name}/maven-plugin-plugin.jar
-%{_mavenpomdir}/JPP.%{name}-maven-plugin-plugin.pom
-%{_mavendepmapfragdir}/maven-plugin-plugin
-
-%files annotations
-%{_javadir}/%{name}/%{name}-annotations.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-annotations.pom
-%{_mavendepmapfragdir}/%{name}-annotations
-
-%files ant
-%{_javadir}/%{name}/%{name}-ant.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-ant.pom
-%{_mavendepmapfragdir}/%{name}-ant
-
-%files api
-%{_javadir}/%{name}/%{name}-api.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
-%{_mavendepmapfragdir}/%{name}-api
-
-%files beanshell
-%{_javadir}/%{name}/%{name}-beanshell.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-beanshell.pom
-%{_mavendepmapfragdir}/%{name}-beanshell
-
-%files generators
-%{_javadir}/%{name}/%{name}-generators.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-generators.pom
-%{_mavendepmapfragdir}/%{name}-generators
-
-%files java
-%{_javadir}/%{name}/%{name}-java.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-java.pom
-%{_mavendepmapfragdir}/%{name}-java
-
-%files javadoc
-%{_javadir}/%{name}/%{name}-javadoc.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-javadoc.pom
-%{_mavendepmapfragdir}/%{name}-javadoc
-
-%files model
-%{_javadir}/%{name}/%{name}-model.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-model.pom
-%{_mavendepmapfragdir}/%{name}-model
-
-%files -n maven-script
-%{_mavenpomdir}/JPP.%{name}-maven-script.pom
-%{_mavendepmapfragdir}/maven-script
-
-%files -n maven-script-ant
-%{_javadir}/%{name}/maven-script-ant.jar
-%{_mavenpomdir}/JPP.%{name}-maven-script-ant.pom
-%{_mavendepmapfragdir}/maven-script-ant
-
-%files -n maven-script-beanshell
-%{_javadir}/%{name}/maven-script-beanshell.jar
-%{_mavenpomdir}/JPP.%{name}-maven-script-beanshell.pom
-%{_mavendepmapfragdir}/maven-script-beanshell
-
-%files javadocs
+%mvn_install
+
+
+%files -f .mfiles-maven-plugin-tools
+%dir %{_javadir}/%{name}
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
+
+%files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations
+
+%files -n maven-plugin-plugin -f .mfiles-maven-plugin-plugin
+
+%files annotations -f .mfiles-maven-plugin-tools-annotations
+
+%files ant -f .mfiles-maven-plugin-tools-ant
+
+%files api -f .mfiles-maven-plugin-tools-api
+
+%files beanshell -f .mfiles-maven-plugin-tools-beanshell
+
+%files generators -f .mfiles-maven-plugin-tools-generators
+
+%files java -f .mfiles-maven-plugin-tools-java
+
+%files javadoc -f .mfiles-maven-plugin-tools-javadoc
+
+%files model -f .mfiles-maven-plugin-tools-model
+
+%files -n maven-script -f .mfiles-maven-script
+
+%files -n maven-script-ant -f .mfiles-maven-script-ant
+
+%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell
+
+%files javadocs -f .mfiles-javadoc
+ %doc LICENSE NOTICE
%changelog
+* Thu Aug 29 2013 Michal Srb <msrb(a)redhat.com> - 0:3.1-14
+- Adapt to current guidelines (Resolves: #960526)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:3.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 8 months
[gemini-blueprint/f20] (5 commits) ...migrate from easymock 1 to easymock 3. rhbz#1002475
by gil
Summary of changes:
077d8bd... migrate from easymock 1 to easymock 3. rhbz#1002475 (*)
b91193e... migrate from easymock 1 to easymock 3. rhbz#1002475, fix un (*)
d674b05... migrate from easymock 1 to easymock 3. rhbz#1002475 (*)
476cd10... migrate from easymock 1 to easymock 3. rhbz#1002475 (*)
ab01e02... migrate from easymock 1 to easymock 3. rhbz#1002475 (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 8 months
[gemini-blueprint] migrate from easymock 1 to easymock 3. rhbz#1002475
by gil
commit ab01e02fc7cd089736f4c6da2e7e384569066b4a
Author: gil <puntogil(a)libero.it>
Date: Thu Aug 29 15:45:32 2013 +0200
migrate from easymock 1 to easymock 3. rhbz#1002475
gemini-blueprint.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index 7cd0833..37f970b 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -165,7 +165,7 @@ rm -r core/src/test/java/org/eclipse/gemini/blueprint/blueprint/ReflectionTest.j
core/src/test/java/org/eclipse/gemini/blueprint/compendium/config/ConfigPropertiesHandlerTest.java \
core/src/test/java/org/eclipse/gemini/blueprint/compendium/config/ManagedPropertiesTest.java \
core/src/test/java/org/eclipse/gemini/blueprint/compendium/config/ManagedServiceFactoryTest.java \
-
+
%build
# some test fails for unavailable build deps*
10 years, 8 months
[gemini-blueprint] migrate from easymock 1 to easymock 3. rhbz#1002475
by gil
commit 476cd106ee27bac3635d4d61402162eead89d6dd
Author: gil <puntogil(a)libero.it>
Date: Thu Aug 29 15:39:40 2013 +0200
migrate from easymock 1 to easymock 3. rhbz#1002475
gemini-blueprint.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index e9110dd..7cd0833 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -129,7 +129,11 @@ rm -r mock/src/test/java/org/eclipse/gemini/blueprint/mock/MockServiceRegistrati
core/src/test/java/org/eclipse/gemini/blueprint/service/OsgiServiceReferenceUtilsTest.java \
core/src/test/java/org/eclipse/gemini/blueprint/service/importer/OsgiSingleServiceProxyFactoryBeanTest.java \
core/src/test/java/org/eclipse/gemini/blueprint/service/importer/OsgiServiceCollectionProxyFactoryBeanTest.java \
- core/src/test/java/org/eclipse/gemini/blueprint/service/OsgiServiceUtilsTest.java
+ core/src/test/java/org/eclipse/gemini/blueprint/service/OsgiServiceUtilsTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/service/exporter/support/internal/support/ServiceRegistrationWrapperTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/service/exporter/support/OsgiServiceFactoryBeanTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/service/exporter/BeanNameServicePropertiesResolverTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ConfigurationAdminManagerTest.java
# Fix CRLF
sed 's/\r//' -i changelog.txt license-apache.txt readme-building.txt readme.txt
10 years, 8 months
[gemini-blueprint] migrate from easymock 1 to easymock 3. rhbz#1002475
by gil
commit d674b059272c1927e0577143b226334719002753
Author: gil <puntogil(a)libero.it>
Date: Thu Aug 29 15:23:48 2013 +0200
migrate from easymock 1 to easymock 3. rhbz#1002475
gemini-blueprint.spec | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index 980a6dc..e9110dd 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -115,6 +115,21 @@ rm -r core/src/test/java/org/eclipse/gemini/blueprint/internal/util/BeanFactoryU
# migrate from easymock 1 to easymock 3
%pom_remove_dep easymock:
%pom_add_dep org.easymock:easymock:3.2:test
+rm -r mock/src/test/java/org/eclipse/gemini/blueprint/mock/MockServiceRegistrationTest.java \
+ extender/src/test/java/org/eclipse/gemini/blueprint/extender/internal/ContextLoaderListenerTest.java \
+ io/src/test/java/org/eclipse/gemini/blueprint/io/OsgiBundleResourceLoaderTest.java \
+ io/src/test/java/org/eclipse/gemini/blueprint/io/OsgiBundleResourceTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/config/internal/OsgiServiceLifecycleListenerAdapterTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/config/internal/OsgiServiceRegistrationListenerAdapterTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/config/BundleFactoryBeanParserTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/context/support/AbstractBundleXmlApplicationContextTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/context/support/AbstractRefreshableOsgiBundleApplicationContextTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/context/support/BundleContextAwareProcessorTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/util/BundleDelegatingClassLoaderTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/service/OsgiServiceReferenceUtilsTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/service/importer/OsgiSingleServiceProxyFactoryBeanTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/service/importer/OsgiServiceCollectionProxyFactoryBeanTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/service/OsgiServiceUtilsTest.java
# Fix CRLF
sed 's/\r//' -i changelog.txt license-apache.txt readme-building.txt readme.txt
10 years, 8 months