[Bug 846160] New: [patch] Generate OSGI manifest with maven-plugin-bundle
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=846160
Bug ID: 846160
QA Contact: extras-qa(a)fedoraproject.org
Severity: unspecified
Version: 17
Priority: unspecified
CC: dbhole(a)redhat.com, fnasser(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
sochotni(a)redhat.com
Assignee: fnasser(a)redhat.com
Summary: [patch] Generate OSGI manifest with
maven-plugin-bundle
Regression: ---
Story Points: ---
Classification: Fedora
OS: Unspecified
Reporter: gerard(a)ryan.lt
Type: Bug
Documentation: ---
Hardware: Unspecified
Mount Type: ---
Status: NEW
Component: plexus-classworlds
Product: Fedora
Created attachment 602607
--> https://bugzilla.redhat.com/attachment.cgi?id=602607&action=edit
generate OSGI info
Description of problem:
OSGI info will be needed to build eclipse-m2e.
Description of patch:
Generate OSGI manifest using pom macros to add maven-plugin-bundle info to
pom.xml
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 8 months
[plexus-classworlds] Export only proper OSGI packages
by Stanislav Ochotnicky
commit 1eedb2111d0e5a3d3d80061c830e89be5ae2e544
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 7 11:06:28 2012 +0200
Export only proper OSGI packages
- Do not generate "uses" OSGI clauses
plexus-classworlds.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec
index 0246aa3..088d6de 100644
--- a/plexus-classworlds.spec
+++ b/plexus-classworlds.spec
@@ -34,7 +34,7 @@
Name: %{parent}-%{subname}
Version: 2.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Plexus Classworlds Classloader Framework
License: ASL 2.0 and Plexus
Group: Development/Libraries
@@ -101,7 +101,8 @@ sed -i 's:<groupId>ant</groupId>:<groupId>org.apache.ant</groupId>:' pom.xml
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>*</Export-Package>
+ <_nouses>true</_nouses>
+ <Export-Package>org.codehaus.classworlds.*;org.codehaus.plexus.classworlds.*</Export-Package>
</instructions>
</configuration>
</plugin>"
@@ -133,6 +134,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Aug 7 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.4-7
+- Export only proper OSGI packages
+- Do not generate "uses" OSGI clauses
+
* Mon Aug 06 2012 Gerard Ryan <galileo(a)fedoraproject.org> - 2.4-6
- Generate OSGI info using maven-plugin-bundle
11 years, 8 months
[plexus-component-api] Move jar to original name format to improve compatibility
by Stanislav Ochotnicky
commit 218c01ed49af6c9534a7b0601cde6df023f99ae8
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 7 10:53:18 2012 +0200
Move jar to original name format to improve compatibility
plexus-component-api.spec | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/plexus-component-api.spec b/plexus-component-api.spec
index 6c18dc4..96061c2 100644
--- a/plexus-component-api.spec
+++ b/plexus-component-api.spec
@@ -2,7 +2,7 @@
Name: plexus-component-api
Version: 1.0
-Release: 0.9.alpha15%{?dist}
+Release: 0.10.alpha15%{?dist}
Summary: Plexus Component API
Group: Development/Libraries
@@ -59,15 +59,14 @@ mvn-rpmbuild -e package javadoc:javadoc
# jars
install -d -m 0755 %{buildroot}%{_javadir}/plexus
install -m 644 target/%{name}-%{project_version}.jar \
- %{buildroot}%{_javadir}/plexus/component-api.jar
-
+ %{buildroot}%{_javadir}/plexus/%{name}.jar
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
+ %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
-%add_maven_depmap JPP.%{name}.pom plexus/component-api.jar
+%add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
@@ -87,6 +86,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/plexus/%{name}
%changelog
+* Tue Aug 7 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0-0.10.alpha15
+- Move jar to original name format to improve compatibility
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.9.alpha15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 8 months
[maven-archetype] Export only proper OSGI packages
by Stanislav Ochotnicky
commit ca76c79054ae8d4356cb75148ed05d8c7789568e
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 7 10:52:15 2012 +0200
Export only proper OSGI packages
- Do not generate "uses" OSGI clauses
maven-archetype.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/maven-archetype.spec b/maven-archetype.spec
index f8dd6bf..c5eb7b2 100644
--- a/maven-archetype.spec
+++ b/maven-archetype.spec
@@ -1,6 +1,6 @@
Name: maven-archetype
Version: 2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven project templating toolkit
Group: Development/Libraries
@@ -162,7 +162,8 @@ pushd archetype-models/archetype-catalog
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>*</Export-Package>
+ <_nouses>true</_nouses>
+ <Export-Package>org.apache.maven.archetype.catalog.*</Export-Package>
</instructions>
</configuration>
</plugin>"
@@ -268,6 +269,10 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%{_javadir}/%{name}/plugin.jar
%changelog
+* Tue Aug 7 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.1-6
+- Export only proper OSGI packages
+- Do not generate "uses" OSGI clauses
+
* Mon Aug 06 2012 Gerard Ryan <galileo(a)fedoraproject.org> - 2.1-5
- Fix jetty namespace
- Add OSGI info to catalog.jar
11 years, 8 months
[maven-archetype] Fix jetty namespace; Add OSGI info to catalog.jar
by Stanislav Ochotnicky
commit 910663a6dd1848079e455a48100482da5dca9a19
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Mon Aug 6 02:32:21 2012 +0100
Fix jetty namespace; Add OSGI info to catalog.jar
Jetty has changed namespace from org.mortbay.jetty to org.eclipse.jetty,
which caused this package to fail. All references to jetty are updated.
OSGI information for catalog.jar is needed for m2e (Maven integration
for Eclipse).
maven-archetype-fix-jetty-namespace.patch | 204 +++++++++++++++++++++++++++++
maven-archetype.spec | 31 ++++-
2 files changed, 232 insertions(+), 3 deletions(-)
---
diff --git a/maven-archetype-fix-jetty-namespace.patch b/maven-archetype-fix-jetty-namespace.patch
new file mode 100644
index 0000000..da4db8b
--- /dev/null
+++ b/maven-archetype-fix-jetty-namespace.patch
@@ -0,0 +1,204 @@
+--- pom.xml.orig 2012-08-06 00:54:09.491115851 +0100
++++ pom.xml 2012-08-06 00:54:25.129820980 +0100
+@@ -331,7 +331,7 @@
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.6</version>
+ </plugin>
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java 2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java 2012-08-06 00:57:25.316423574 +0100
+@@ -22,8 +22,8 @@
+ import org.apache.maven.archetype.catalog.ArchetypeCatalog;
+ import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
+ import org.codehaus.plexus.PlexusTestCase;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ import java.io.File;
+ import java.io.FileWriter;
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java 2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java 2012-08-06 00:56:58.834922877 +0100
+@@ -35,8 +35,8 @@
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ import java.io.File;
+ import java.io.FileWriter;
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java 2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java 2012-08-06 00:56:18.124690463 +0100
+@@ -36,8 +36,8 @@
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ import java.io.File;
+ import java.io.FileOutputStream;
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java 2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java 2012-08-06 00:55:48.423250480 +0100
+@@ -36,8 +36,8 @@
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ import java.io.File;
+ import java.io.FileOutputStream;
+diff -Naur archetype-samples.orig/webapp/pom.xml archetype-samples/webapp/pom.xml
+--- archetype-samples.orig/webapp/pom.xml 2012-08-06 01:01:25.372897736 +0100
++++ archetype-samples/webapp/pom.xml 2012-08-06 01:19:19.295657306 +0100
+@@ -22,11 +22,11 @@
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <connectors>
+- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
++ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>15000</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+diff -Naur archetype-testing.orig/archetype-proxy/pom.xml archetype-testing/archetype-proxy/pom.xml
+--- archetype-testing.orig/archetype-proxy/pom.xml 2012-08-06 00:57:48.450987379 +0100
++++ archetype-testing/archetype-proxy/pom.xml 2012-08-06 01:21:14.575484775 +0100
+@@ -47,7 +47,7 @@
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.11</version>
+ <scope>compile</scope>
+@@ -68,11 +68,11 @@
+ </proxy>
+ </proxies>
+ -->
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <connectors>
+- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
++ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>18881</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+@@ -84,4 +84,4 @@
+ </plugin>
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
+diff -Naur archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
+--- archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java 2012-08-06 00:57:48.451987360 +0100
++++ archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java 2012-08-06 01:07:52.133608424 +0100
+@@ -36,7 +36,7 @@
+ import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+-import org.mortbay.util.IO;
++import org.eclipse.jetty.util.IO;
+
+ /**
+ * Stolen code from Mortbay
+diff -Naur archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
+--- archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java 2012-08-06 00:57:48.451987360 +0100
++++ archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java 2012-08-06 01:07:08.369433256 +0100
+@@ -32,8 +32,8 @@
+ import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+-import org.mortbay.util.IO;
+-import org.mortbay.util.StringUtil;
++import org.eclipse.jetty.util.IO;
++import org.eclipse.jetty.util.StringUtil;
+
+ /**
+ *
+@@ -258,4 +258,4 @@
+ return "Repository Servlet";
+ }
+
+-}
+\ No newline at end of file
++}
+diff -Naur archetype-testing.orig/archetype-repository/pom.xml archetype-testing/archetype-repository/pom.xml
+--- archetype-testing.orig/archetype-repository/pom.xml 2012-08-06 00:57:48.452987341 +0100
++++ archetype-testing/archetype-repository/pom.xml 2012-08-06 01:22:04.447544897 +0100
+@@ -47,7 +47,7 @@
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.11</version>
+ <scope>compile</scope>
+@@ -68,11 +68,11 @@
+ </proxy>
+ </proxies>
+ -->
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <connectors>
+- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
++ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>18882</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+@@ -90,4 +90,4 @@
+ </plugin>
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
+diff -Naur archetype-testing.orig/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
+--- archetype-testing.orig/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java 2012-08-06 00:57:48.453987322 +0100
++++ archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java 2012-08-06 01:08:39.759710801 +0100
+@@ -26,8 +26,8 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+
+-import org.mortbay.util.IO;
+-import org.mortbay.util.StringUtil;
++import org.eclipse.jetty.util.IO;
++import org.eclipse.jetty.util.StringUtil;
+
+ /**
+ *
+@@ -83,4 +83,4 @@
+ IO.close( is );
+ }
+ }
+-}
+\ No newline at end of file
++}
diff --git a/maven-archetype.spec b/maven-archetype.spec
index ea7b0ee..f8dd6bf 100644
--- a/maven-archetype.spec
+++ b/maven-archetype.spec
@@ -1,6 +1,6 @@
Name: maven-archetype
Version: 2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Maven project templating toolkit
Group: Development/Libraries
@@ -14,6 +14,7 @@ Source1: %{name}.depmap
Patch0: 0001-Use-component-metadata-instead-of-maven-plugin.patch
Patch1: 0002-Use-generics.patch
Patch2: 0003-Add-Maven-3-compatibility.patch
+Patch3: %{name}-fix-jetty-namespace.patch
BuildArch: noarch
@@ -22,11 +23,12 @@ BuildRequires: jpackage-utils
BuildRequires: maven > 3.0.3-13
BuildRequires: maven-war-plugin
BuildRequires: maven-dependency-plugin
+BuildRequires: maven-plugin-bundle
BuildRequires: jchardet
BuildRequires: plexus-containers-component-metadata
-Requires: jpackage-utils
-Requires: maven
+Requires: jpackage-utils
+Requires: maven
%description
Archetype is a Maven project templating toolkit. An archetype is
@@ -147,6 +149,25 @@ Requires: %{name}-registry = %{version}-%{release}
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3
+
+# Add OSGI info to catalog module
+pushd archetype-models/archetype-catalog
+ %pom_xpath_remove "pom:project/pom:packaging"
+ %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+ %pom_xpath_inject "pom:build/pom:plugins" "
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>"
+popd
+
%build
# we don't have cargo so skip tests for now
@@ -247,6 +268,10 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%{_javadir}/%{name}/plugin.jar
%changelog
+* Mon Aug 06 2012 Gerard Ryan <galileo(a)fedoraproject.org> - 2.1-5
+- Fix jetty namespace
+- Add OSGI info to catalog.jar
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 8 months
[plexus-classworlds] Generate OSGI info using maven-plugin-bundle
by Stanislav Ochotnicky
commit 3f1f7ca4cf4c14b08c9dada4cf82d2c37c0e75ac
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Tue Aug 7 01:46:36 2012 +0100
Generate OSGI info using maven-plugin-bundle
plexus-classworlds.spec | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec
index 4e4019b..0246aa3 100644
--- a/plexus-classworlds.spec
+++ b/plexus-classworlds.spec
@@ -34,7 +34,7 @@
Name: %{parent}-%{subname}
Version: 2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plexus Classworlds Classloader Framework
License: ASL 2.0 and Plexus
Group: Development/Libraries
@@ -62,6 +62,7 @@ BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-dependency-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-plugin-bundle
BuildRequires: plexus-utils
%description
@@ -91,6 +92,20 @@ done
# fix ant groupId
sed -i 's:<groupId>ant</groupId>:<groupId>org.apache.ant</groupId>:' pom.xml
+# Generate OSGI info
+%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+%pom_xpath_inject "pom:build/pom:plugins" "
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>"
+
%build
mvn-rpmbuild -e install javadoc:javadoc
@@ -118,6 +133,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Aug 06 2012 Gerard Ryan <galileo(a)fedoraproject.org> - 2.4-6
+- Generate OSGI info using maven-plugin-bundle
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 8 months
[jetty] Fix patch for disabling OSGi
by Mikolaj Izdebski
commit 8c493e82e9f8e4d2de28baaeae296058a63d5199
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 08:33:00 2012 +0200
Fix patch for disabling OSGi
This fixes FTBFS.
jetty.spec | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index a55f437..a9d6187 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -608,6 +608,14 @@ find . -name "*.class" -exec rm {} \;
%pom_xpath_remove "pom:execution[pom:id[text()='copy-spdy']]" jetty-distribution
%if 0%{?rhel} > 0
+# Disable OSGi
+%pom_disable_module jetty-osgi
+%pom_xpath_remove "pom:profile[pom:id[text()='osgi']]"
+
+# Disable NoSQL
+%pom_disable_module jetty-nosql
+%endif
+
# Use Glassfish JSP
%pom_remove_dep :org.eclipse.jdt.core jetty-jsp
%pom_xpath_inject "pom:project/pom:dependencies" "
@@ -617,14 +625,6 @@ find . -name "*.class" -exec rm {} \;
<version>any</version>
</dependency>" jetty-jsp
-# Disable OSGi
-%pom_disable_module jetty-osgi
-%pom_xpath_remove "pom:profile[pom:id[text()='osgi']]"
-
-# Disable NoSQL
-%pom_disable_module jetty-nosql
-%endif
-
cp %{SOURCE1} djetty
# this needs jetty6 things, so just remove it
@@ -1051,6 +1051,7 @@ groupdel %username &>/dev/null || :
%changelog
* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.5-2
- Put runtime data in /run instead of /tmp
+- Fix patch for disabling OSGi
* Wed Jul 18 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.5-1
- Update to upstream version 8.1.5
11 years, 8 months
[jetty] Put runtime data in /run instead of /tmp
by Mikolaj Izdebski
commit 7dde3307f261ad9ca3eb76b16b5d132f3cb9b020
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 07:24:38 2012 +0200
Put runtime data in /run instead of /tmp
jetty.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 444d62a..a55f437 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -818,6 +818,10 @@ ln -s %{appdir} %{buildroot}%{homedir}/webapps
rm %{buildroot}%{homedir}/*.txt %{buildroot}%{homedir}/*.html
+# Here jetty is going to put its runtime data.
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=845993
+ln -sf %{rundir} %{buildroot}%{homedir}/work
+
# following seem like config directories
for cdir in overlays;do
mv %{buildroot}%{homedir}/$cdir %{buildroot}/%{confdir}/$cdir
@@ -1045,6 +1049,9 @@ groupdel %username &>/dev/null || :
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.5-2
+- Put runtime data in /run instead of /tmp
+
* Wed Jul 18 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.5-1
- Update to upstream version 8.1.5
- Fix rpmlint warnings
11 years, 8 months
[jetty/f17] Fix patch for disabling OSGi
by Mikolaj Izdebski
commit 6c05f9a6c84755caf91775edf128484f09063719
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 07:58:13 2012 +0200
Fix patch for disabling OSGi
This fixes FTBFS.
0007-disable-jetty-osgi.patch | 73 -----------------------------------------
jetty.spec | 13 ++++++-
2 files changed, 11 insertions(+), 75 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index d564939..fe1f52b 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -62,7 +62,6 @@ Patch3: 0003-Change-servelt-groupId-to-javax.servlet.patch
Patch4: 0004-Modify-dependencies.patch
Patch5: 0005-Remove-pmd-plugin.patch
Patch6: 0006-Remove-unpack-config-deps-from-distribution.patch
-Patch7: 0007-disable-jetty-osgi.patch
BuildRequires: geronimo-annotation
BuildRequires: geronimo-jaspic-spec
@@ -583,9 +582,18 @@ find . -name "*.class" -exec rm {} \;
%patch5 -p1 -b .sav
%patch6 -p1 -b .sav
%if 0%{?rhel} > 0
-%patch7 -p1 -b .sav
+%pom_disable_module jetty-osgi
+%pom_xpath_remove "pom:profile[pom:id[text()='osgi']]"
%endif
+%pom_remove_dep :org.eclipse.jdt.core jetty-jsp
+%pom_xpath_inject "pom:project/pom:dependencies" "
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>2.2.3</version>
+ </dependency>" jetty-jsp
+
cp %{SOURCE1} djetty
# this needs jetty6 things, so just remove it
@@ -1007,6 +1015,7 @@ groupdel %username &>/dev/null || :
%changelog
* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-10
- Put runtime data in /run instead of /tmp
+- Fix patch for disabling OSGi
* Wed Jun 13 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-9
- Fix jetty being accidentaly enabled after update by default
11 years, 8 months
[jetty/f17] Put runtime data in /run instead of /tmp
by Mikolaj Izdebski
commit 12474aecec001b4aec535e2e1693b37447731d5b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 07:25:59 2012 +0200
Put runtime data in /run instead of /tmp
jetty.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index bcfaa0c..d564939 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -774,6 +774,10 @@ ln -s %{appdir} %{buildroot}%{homedir}/webapps
rm %{buildroot}%{homedir}/*.txt %{buildroot}%{homedir}/*.html
+# Here jetty is going to put its runtime data.
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=845993
+ln -sf %{rundir} %{buildroot}%{homedir}/work
+
# following seem like config directories
for cdir in overlays;do
mv %{buildroot}%{homedir}/$cdir %{buildroot}/%{confdir}/$cdir
@@ -1001,6 +1005,9 @@ groupdel %username &>/dev/null || :
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-10
+- Put runtime data in /run instead of /tmp
+
* Wed Jun 13 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-9
- Fix jetty being accidentaly enabled after update by default
- Resolves: #831280
11 years, 8 months