diff --git a/.devtoolset-4-cbi-plugins.metadata b/.devtoolset-4-cbi-plugins.metadata new file mode 100644 index 0000000..b6bb49f --- /dev/null +++ b/.devtoolset-4-cbi-plugins.metadata @@ -0,0 +1 @@ +a07d4ce0bb0767ae85e48de564b5e645fea4304d SOURCES/cbi-plugins-1.1.2.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aaca8b5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/cbi-plugins-1.1.2.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/maven-3.0.patch b/SOURCES/maven-3.0.patch new file mode 100644 index 0000000..ab3d72c --- /dev/null +++ b/SOURCES/maven-3.0.patch @@ -0,0 +1,169 @@ +From 744bd4ee3737dabbcbe7d6019d4dedf352dff003 Mon Sep 17 00:00:00 2001 +From: Alexander Kurtakov +Date: Tue, 2 Dec 2014 16:32:52 +0200 +Subject: Use maven-plugin-tools' java 5 annotations in eclipse-cbi-plugin. + +Change-Id: Ibcf458c10556a7615aff0701124e60f5cde48417 +--- + eclipse-cbi-plugin/pom.xml | 6 ++++++ + .../cbi/mojo/AbstractPluginScannerMojo.java | 7 +++--- + .../eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java | 25 ++++++---------------- + .../org/eclipse/cbi/mojo/PluginVersionsMojo.java | 8 +++---- + .../org/eclipse/cbi/mojo/TestPropertiesMojo.java | 8 +++---- + 5 files changed, 25 insertions(+), 29 deletions(-) + +diff --git a/eclipse-cbi-plugin/pom.xml b/eclipse-cbi-plugin/pom.xml +index cb2fe2e..a2f9428 100644 +--- a/eclipse-cbi-plugin/pom.xml ++++ b/eclipse-cbi-plugin/pom.xml +@@ -43,5 +43,11 @@ + decentxml + 1.4 + ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-annotations ++ 3.3 ++ provided ++ + + +diff --git a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java +index b7b1a01..7bb08f4 100644 +--- a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java ++++ b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java +@@ -21,6 +21,8 @@ import java.util.Properties; + + import org.apache.maven.plugin.AbstractMojo; + import org.apache.maven.plugin.MojoExecutionException; ++import org.apache.maven.plugins.annotations.Component; ++import org.apache.maven.plugins.annotations.Parameter; + import org.eclipse.tycho.core.osgitools.BundleReader; + import org.eclipse.tycho.core.osgitools.OsgiManifest; + import org.eclipse.tycho.core.osgitools.OsgiManifestParserException; +@@ -31,12 +33,11 @@ abstract class AbstractPluginScannerMojo + { + /** + * igorf: as of 2012-01-05, generated repository location is hardcoded to target/repository in tycho +- * +- * @parameter default-value="${project.build.directory}/repository" + **/ ++ @Parameter(defaultValue="${project.build.directory}/repository") + protected File repository; + +- /** @component */ ++ @Component + protected BundleReader bundleReader; + + @Override +diff --git a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java +index 694c026..9fec597 100644 +--- a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java ++++ b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java +@@ -24,6 +24,10 @@ import javax.xml.parsers.DocumentBuilderFactory; + + import org.apache.maven.plugin.AbstractMojo; + import org.apache.maven.plugin.MojoExecutionException; ++import org.apache.maven.plugins.annotations.Component; ++import org.apache.maven.plugins.annotations.LifecyclePhase; ++import org.apache.maven.plugins.annotations.Mojo; ++import org.apache.maven.plugins.annotations.Parameter; + import org.apache.maven.project.MavenProject; + import org.eclipse.tycho.ArtifactKey; + import org.eclipse.tycho.core.BundleProject; +@@ -37,31 +41,16 @@ import org.w3c.dom.Document; + import org.w3c.dom.Node; + import org.w3c.dom.NodeList; + +-/** +- * @goal generate-api-build-xml +- * @phase generate-sources +- */ ++@Mojo( name = "generate-api-build-xml", defaultPhase = LifecyclePhase.GENERATE_SOURCES) + public class GenerateAPIBuildXMLMojo extends AbstractMojo { + + private static final String API_BUILD_XML_FILE = ".apibuild.xml"; + private static final String API_NATURE = "org.eclipse.pde.api.tools.apiAnalysisNature"; + +- /** +- * @parameter default-value="${project}" +- * @required +- * @readonly +- */ ++ @Parameter(defaultValue="${project}", required=true, readonly=true) + protected MavenProject project; + +- /** +- * @parameter property="buildQualifier" +- * @readonly +- */ +- private String qualifier; +- +- /** +- * @component role="org.eclipse.tycho.core.TychoProject" +- */ ++ @Component(role=TychoProject.class) + private Map projectTypes; + + @Override +diff --git a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/PluginVersionsMojo.java b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/PluginVersionsMojo.java +index ef368a8..e3e2a0e 100644 +--- a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/PluginVersionsMojo.java ++++ b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/PluginVersionsMojo.java +@@ -14,15 +14,15 @@ import java.io.File; + import java.util.Map; + import java.util.Properties; + ++import org.apache.maven.plugins.annotations.Mojo; ++import org.apache.maven.plugins.annotations.Parameter; + import org.eclipse.tycho.core.osgitools.OsgiManifest; + +-/** +- * @goal plugin-versions +- */ ++@Mojo(name="plugin-versions") + public class PluginVersionsMojo + extends AbstractPluginScannerMojo + { +- /** @parameter default-value="${project.build.directory}/plugin-versions.properties" */ ++ @Parameter(defaultValue="${project.build.directory}/plugin-versions.properties") + protected File destination; + + @Override +diff --git a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/TestPropertiesMojo.java b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/TestPropertiesMojo.java +index 12a46ec..5e6cc68 100644 +--- a/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/TestPropertiesMojo.java ++++ b/eclipse-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/TestPropertiesMojo.java +@@ -24,6 +24,8 @@ import java.util.Set; + import java.util.jar.JarFile; + import java.util.zip.ZipEntry; + ++import org.apache.maven.plugins.annotations.Mojo; ++import org.apache.maven.plugins.annotations.Parameter; + import org.eclipse.osgi.util.ManifestElement; + import org.eclipse.tycho.ArtifactKey; + import org.eclipse.tycho.DefaultArtifactKey; +@@ -37,9 +39,7 @@ import de.pdark.decentxml.Element; + import de.pdark.decentxml.XMLIOSource; + import de.pdark.decentxml.XMLParser; + +-/** +- * @goal test-properties +- */ ++@Mojo(name="test-properties") + public class TestPropertiesMojo + extends AbstractPluginScannerMojo + { +@@ -73,7 +73,7 @@ public class TestPropertiesMojo + + private static XMLParser parser = new XMLParser(); + +- /** @parameter default-value="${project.build.directory}/test.properties" */ ++ @Parameter(defaultValue="${project.build.directory}/test.properties") + protected File destination; + + @Override +-- +cgit v0.11.2-3-g2eb4 + + diff --git a/SPECS/cbi-plugins.spec b/SPECS/cbi-plugins.spec new file mode 100644 index 0000000..8ba55d4 --- /dev/null +++ b/SPECS/cbi-plugins.spec @@ -0,0 +1,106 @@ +%{?scl:%scl_package cbi-plugins} +%{!?scl:%global pkg_name %{name}} +%{?java_common_find_provides_and_requires} + +Name: %{?scl_prefix}cbi-plugins +Version: 1.1.2 +Release: 3.1%{?dist} +Summary: A set of helpers for Eclipse CBI + +Group: Development/Libraries +License: EPL +URL: http://git.eclipse.org/c/cbi/org.eclipse.cbi.maven.plugins.git/ +Source0: http://git.eclipse.org/c/cbi/org.eclipse.cbi.maven.plugins.git/snapshot/%{pkg_name}-%{version}.tar.bz2 +Patch0: maven-3.0.patch +BuildArch: noarch + +BuildRequires: %{?scl_prefix}tycho +BuildRequires: %{?scl_prefix}tycho-extras +BuildRequires: %{?scl_prefix_java_common}maven-local +Requires: %{?scl_prefix}tycho +Requires: %{?scl_prefix}tycho-extras + +%description +A set of helpers for Eclipse CBI. + +%package javadoc +Group: Documentation +Summary: Javadoc for %{pkg_name} + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%setup -n %{pkg_name}-%{version} -q +%patch0 -p1 -R +%pom_disable_module eclipse-macsigner-plugin +%pom_disable_module eclipse-winsigner-plugin +%pom_remove_plugin :maven-enforcer-plugin +%{?scl:EOF} + + +%build +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_build +%{?scl:EOF} + + +%install +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_install +%{?scl:EOF} + + +%files -f .mfiles + +%files javadoc -f .mfiles-javadoc + +%changelog +* Mon Jun 29 2015 Mat Booth - 1.1.2-3.1 +- Import latest from Fedora + +* Mon Jun 22 2015 Mat Booth - 1.1.2-3 +- Drop unnecessary requires + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri May 22 2015 Alexander Kurtakov 1.1.2-1 +- Update to upstream 1.1.2 release. + +* Mon Jul 28 2014 Roland Grunberg - 1.1.1-2 +- Update to 1.1.1 Release. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Michael Simacek - 1.0.5-3 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Nov 13 2013 Alexander Kurtakov 1.0.5-2 +- Disable win/mac signers. + +* Wed Nov 13 2013 Alexander Kurtakov 1.0.5-1 +- Update to latest upstream. + +* Mon Sep 30 2013 Krzysztof Daniel 1.0.4-1 +- Update to latest upstream. + +* Sat Aug 03 2013 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon May 27 2013 Krzysztof Daniel 1.0.3-1 +- Update to latest upstream. + +* Thu Mar 14 2013 Krzysztof Daniel 1.0.1-0.4.git734d40 +- Update to latest upstream. + +* Thu Feb 21 2013 Krzysztof Daniel 1.0.1-0.3.git120561 +- Delete empty line from sources. + +* Thu Feb 21 2013 Krzysztof Daniel 1.0.1-0.2.git120561 +- Review remarks fixed. + +* Thu Feb 21 2013 Krzysztof Daniel 1.0.1-0.1.git120561 +- Initial contribution.