You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/05/15 10:53:47 UTC
svn commit: r1679513 - in /felix/trunk/bundleplugin/src:
main/java/org/apache/felix/bundleplugin/
test/java/org/apache/felix/bundleplugin/
test/java/org/apache/maven/shared/osgi/
Author: cziegeler
Date: Fri May 15 08:53:36 2015
New Revision: 1679513
URL: http://svn.apache.org/r1679513
Log:
Minor code cleanup - remove unused setter
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
felix/trunk/bundleplugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1679513&r1=1679512&r2=1679513&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Fri May 15 08:53:36 2015
@@ -194,7 +194,7 @@ public class BundlePlugin extends Abstra
/**
* Use locally patched version for now.
*/
- private Maven2OsgiConverter m_maven2OsgiConverter = new DefaultMaven2OsgiConverter();
+ private final Maven2OsgiConverter m_maven2OsgiConverter = new DefaultMaven2OsgiConverter();
/**
* The archive configuration to use.
@@ -228,12 +228,6 @@ public class BundlePlugin extends Abstra
}
- protected void setMaven2OsgiConverter( Maven2OsgiConverter maven2OsgiConverter )
- {
- m_maven2OsgiConverter = maven2OsgiConverter;
- }
-
-
protected MavenProject getProject()
{
return project;
Modified: felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java?rev=1679513&r1=1679512&r2=1679513&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java (original)
+++ felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java Fri May 15 08:53:36 2015
@@ -9,9 +9,9 @@ package org.apache.felix.bundleplugin;
* to you 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
@@ -27,12 +27,11 @@ import java.util.Map;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
/**
* Test for {@link BundleAllPlugin}
- *
+ *
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
public class BundleAllPluginTest extends AbstractBundlePluginTest
@@ -41,6 +40,7 @@ public class BundleAllPluginTest extends
private BundleAllPlugin plugin;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -56,7 +56,6 @@ public class BundleAllPluginTest extends
plugin.setBuildDirectory( buildDirectory.getPath() );
File outputDirectory = new File( buildDirectory, "test-classes" );
plugin.setOutputDirectory( outputDirectory );
- plugin.setMaven2OsgiConverter( new DefaultMaven2OsgiConverter() );
}
Modified: felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java?rev=1679513&r1=1679512&r2=1679513&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java (original)
+++ felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java Fri May 15 08:53:36 2015
@@ -34,7 +34,6 @@ import java.util.jar.Manifest;
import org.apache.maven.model.Organization;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
import org.osgi.framework.Constants;
import aQute.bnd.osgi.Analyzer;
@@ -44,7 +43,7 @@ import aQute.bnd.osgi.Jar;
/**
* Test for {@link BundlePlugin}.
- *
+ *
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
public class BundlePluginTest extends AbstractBundlePluginTest
@@ -53,11 +52,11 @@ public class BundlePluginTest extends Ab
private BundlePlugin plugin;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
plugin = new BundlePlugin();
- plugin.setMaven2OsgiConverter( new DefaultMaven2OsgiConverter() );
plugin.setBuildDirectory( "." );
plugin.setOutputDirectory( new File( getBasedir(), "target" + File.separatorChar + "scratch" ) );
}
Modified: felix/trunk/bundleplugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java?rev=1679513&r1=1679512&r2=1679513&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java (original)
+++ felix/trunk/bundleplugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java Fri May 15 08:53:36 2015
@@ -26,7 +26,7 @@ import org.codehaus.plexus.PlexusTestCas
/**
* Test for {@link DefaultMaven2OsgiConverter}
- *
+ *
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @version $Id$
*/
@@ -117,6 +117,9 @@ public class Maven2OsgiConverterTest
osgiVersion = maven2Osgi.getVersion( "2.1-SNAPSHOT" );
assertEquals( "2.1.0.SNAPSHOT", osgiVersion );
+ osgiVersion = maven2Osgi.getVersion( "0.1-SNAPSHOT" );
+ assertEquals( "0.1.0.SNAPSHOT", osgiVersion );
+
osgiVersion = maven2Osgi.getVersion( "2-SNAPSHOT" );
assertEquals( "2.0.0.SNAPSHOT", osgiVersion );
@@ -149,10 +152,10 @@ public class Maven2OsgiConverterTest
osgiVersion = maven2Osgi.getVersion( "1.4.1-20070217.082013-7" );
assertEquals( "1.4.1.20070217_082013-7", osgiVersion );
-
+
osgiVersion = maven2Osgi.getVersion( "0.0.0.4aug2000r7-dev" );
assertEquals( "0.0.0.4aug2000r7-dev", osgiVersion );
-
+
osgiVersion = maven2Osgi.getVersion( "4aug2000r7-dev" );
assertEquals( "0.0.0.4aug2000r7-dev", osgiVersion );
}