[glassfish-el] Initial commit
by David Xie
commit 74e1b45a038429e5ba9d728be62fe983d592f6e3
Author: David Xie <david.scriptfan(a)gmail.com>
Date: Tue Mar 5 12:53:11 2013 +0800
Initial commit
.gitignore | 1 +
generate_tarball.sh | 11 ++++++++
glassfish-el.spec | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 79 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..7b5e4cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/javax.el-2.2.5.tar.xz
diff --git a/generate_tarball.sh b/generate_tarball.sh
new file mode 100755
index 0000000..9b79a2f
--- /dev/null
+++ b/generate_tarball.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+baseurl="https://svn.java.net/svn/uel~svn/tags/"
+pkgname="javax.el"
+
+version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+echo $version
+
+svn export "${baseurl}/${pkgname}-${version}"
+tar cvJf ${pkgname}-${version}.tar.xz ${pkgname}-${version}/
+rm -rf ${pkgname}-${version}/
diff --git a/glassfish-el.spec b/glassfish-el.spec
new file mode 100644
index 0000000..e79b0a4
--- /dev/null
+++ b/glassfish-el.spec
@@ -0,0 +1,66 @@
+%global artifactId javax.el
+
+Name: glassfish-el
+Version: 2.2.5
+Release: 1%{?dist}
+Summary: J2EE Expression Language Implementation
+Group: Development/Libraries
+License: CDDL or GPLv2 with exceptions
+URL: http://uel.java.net
+# svn export https://svn.java.net/svn/uel~svn/tags/javax.el-2.2.5/ javax.el-2.2.5
+# tar cvJf javax.el-2.2.5.tar.xz javax.el-2.2.5/
+Source0: %{artifactId}-%{version}.tar.xz
+BuildArch: noarch
+
+BuildRequires: jvnet-parent
+BuildRequires: maven-local
+BuildRequires: maven
+BuildRequires: maven-source-plugin
+BuildRequires: mvn(javax.el:javax.el-api)
+Requires: mvn(javax.el:javax.el-api)
+
+%description
+This project provides an implementation of the Expression Language (EL).
+The main goals are:
+ * Improves current implementation: bug fixes and performance improvements
+ * Provides API for use by other tools, such as Netbeans
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
+%prep
+%setup -q -n %{artifactId}-%{version}
+
+%build
+mvn-rpmbuild \
+ install javadoc:javadoc
+
+%install
+# jars
+install -d -m 0755 %{buildroot}%{_javadir}
+install -m 644 target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml \
+ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
+rm -rf target/site/api*
+
+%files -f .mfiles
+
+%files javadoc
+%{_javadocdir}/%{name}
+
+%changelog
+* Fri Feb 1 2013 David Xie <david.scriptfan(a)gmail.com> - 2.2.5-1
+- Initial version of package
diff --git a/sources b/sources
index e69de29..deef9a5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b5a4675e6d8654717f4959557672f5ca javax.el-2.2.5.tar.xz
11 years, 2 months
[jetty] Update to Jetty 9 RC3
by Mikolaj Izdebski
commit 1f34334f5e9c4387737c74e078b6a29abe79183e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Mar 4 16:06:12 2013 +0100
Update to Jetty 9 RC3
.gitignore | 1 +
jetty.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f7604b..eaaf30c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ jetty-6.1.26-src.zip
/jetty-8.1.2.v20120308.tar.bz2
/jetty-8.1.4.v20120524.tar.bz2
/jetty-9.0.0.RC2.tar.gz
+/jetty-9.0.0.RC3.tar.gz
diff --git a/jetty.spec b/jetty.spec
index c8e3827..7b244ff 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver RC2
+%global addver RC3
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -52,7 +52,7 @@
Name: jetty
Version: 9.0.0
-Release: 0.2.%{addver}%{?dist}
+Release: 0.3.%{addver}%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -765,6 +765,9 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%doc NOTICE.txt LICENSE*
%changelog
+* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 9.0.0-0.3.RC3
+- Update to Jetty 9 RC3
+
* Thu Feb 28 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 9.0.0-0.2.RC2
- Upload sources for Jetty 9 RC2
diff --git a/sources b/sources
index 4a2e745..b18d230 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d2bfe112d0cf202cccafb99560323c8 jetty-9.0.0.RC2.tar.gz
+1a49da976cdb91c05e9dd79e59824a41 jetty-9.0.0.RC3.tar.gz
11 years, 2 months
[maven-compiler-plugin/update-to-version-3.x] Update to version 3.0
by Michal Srb
commit d7d25f27672bc02e14f85f86a226cb7b5d59b476
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 4 15:53:12 2013 +0100
Update to version 3.0
- use modified artifactIds for plexus-compiler
...-against-newer-version-of-plexus-compiler.patch | 43 ++++++++++++++++++++
maven-compiler-plugin.spec | 5 ++-
2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/0001-Build-against-newer-version-of-plexus-compiler.patch b/0001-Build-against-newer-version-of-plexus-compiler.patch
new file mode 100644
index 0000000..492c05d
--- /dev/null
+++ b/0001-Build-against-newer-version-of-plexus-compiler.patch
@@ -0,0 +1,43 @@
+From 9a4756bfc63ed777a1326bd40345a4209564d3d8 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Mon, 4 Mar 2013 14:19:19 +0100
+Subject: [PATCH] Build against newer version of plexus-compiler
+
+---
+ pom.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 58b2c49..dd77b84 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -138,7 +138,7 @@ under the License.
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler-api</artifactId>
++ <artifactId>plexus-compiler-api-temp</artifactId>
+ <version>${plexusCompilerVersion}</version>
+ <exclusions>
+ <exclusion>
+@@ -149,7 +149,7 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler-manager</artifactId>
++ <artifactId>plexus-compiler-manager-temp</artifactId>
+ <version>${plexusCompilerVersion}</version>
+ <exclusions>
+ <exclusion>
+@@ -160,7 +160,7 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler-javac</artifactId>
++ <artifactId>plexus-compiler-javac-temp</artifactId>
+ <version>${plexusCompilerVersion}</version>
+ <scope>runtime</scope>
+ <exclusions>
+--
+1.8.1.2
+
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index 10ff67e..e9f8c01 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -7,11 +7,12 @@ Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-compiler-plugin
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: 0001-Build-against-newer-version-of-plexus-compiler.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: xmvn >= 0.2.4
+BuildRequires: maven-local
BuildRequires: maven-plugin-plugin
BuildRequires: maven-shared-incremental
BuildRequires: maven-surefire-provider-junit
@@ -36,6 +37,8 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
+
%build
%mvn_build -f
11 years, 2 months
[plexus-compiler/update-to-version-2.x] Update to version 2.1
by Michal Srb
commit 201f45333b87b34426700f43643c8ec3d9b5b070
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 4 15:32:04 2013 +0100
Update to version 2.1
- preserve older JARs and POMs, so we will be able to update
maven-compiler-plugin
0001-change-artifactIds.patch | 184 +++++++++++++++++++++++++++++++++++++++++
plexus-compiler.spec | 34 +++++++-
2 files changed, 216 insertions(+), 2 deletions(-)
---
diff --git a/0001-change-artifactIds.patch b/0001-change-artifactIds.patch
new file mode 100644
index 0000000..b1838e4
--- /dev/null
+++ b/0001-change-artifactIds.patch
@@ -0,0 +1,184 @@
+From b86f70e56a7e9e23564f7c7794c7ed39e13bc4e2 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Mon, 4 Mar 2013 13:53:57 +0100
+Subject: [PATCH] change artifactIds
+
+---
+ plexus-compiler-api/pom.xml | 4 ++--
+ plexus-compiler-manager/pom.xml | 6 +++---
+ plexus-compilers/plexus-compiler-csharp/pom.xml | 4 ++--
+ plexus-compilers/plexus-compiler-eclipse/pom.xml | 4 ++--
+ plexus-compilers/plexus-compiler-javac/pom.xml | 4 ++--
+ plexus-compilers/plexus-compiler-jikes/pom.xml | 4 ++--
+ plexus-compilers/pom.xml | 6 +++---
+ pom.xml | 4 ++--
+ 8 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/plexus-compiler-api/pom.xml b/plexus-compiler-api/pom.xml
+index 3edcf43..dfce09a 100644
+--- a/plexus-compiler-api/pom.xml
++++ b/plexus-compiler-api/pom.xml
+@@ -4,11 +4,11 @@
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler</artifactId>
++ <artifactId>plexus-compiler-temp</artifactId>
+ <version>2.1</version>
+ </parent>
+
+- <artifactId>plexus-compiler-api</artifactId>
++ <artifactId>plexus-compiler-api-temp</artifactId>
+
+ <name>Plexus Compiler Api</name>
+ <description>Plexus Compilers component's API to manipulate compilers.</description>
+diff --git a/plexus-compiler-manager/pom.xml b/plexus-compiler-manager/pom.xml
+index 8e8e561..0247f23 100644
+--- a/plexus-compiler-manager/pom.xml
++++ b/plexus-compiler-manager/pom.xml
+@@ -4,18 +4,18 @@
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler</artifactId>
++ <artifactId>plexus-compiler-temp</artifactId>
+ <version>2.1</version>
+ </parent>
+
+- <artifactId>plexus-compiler-manager</artifactId>
++ <artifactId>plexus-compiler-manager-temp</artifactId>
+
+ <name>Plexus Compiler Manager</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler-api</artifactId>
++ <artifactId>plexus-compiler-api-temp</artifactId>
+ </dependency>
+ </dependencies>
+ </project>
+diff --git a/plexus-compilers/plexus-compiler-csharp/pom.xml b/plexus-compilers/plexus-compiler-csharp/pom.xml
+index a069836..aaeec22 100644
+--- a/plexus-compilers/plexus-compiler-csharp/pom.xml
++++ b/plexus-compilers/plexus-compiler-csharp/pom.xml
+@@ -4,11 +4,11 @@
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compilers</artifactId>
++ <artifactId>plexus-compilers-temp</artifactId>
+ <version>2.1</version>
+ </parent>
+
+- <artifactId>plexus-compiler-csharp</artifactId>
++ <artifactId>plexus-compiler-csharp-temp</artifactId>
+
+ <name>Plexus C# Compiler</name>
+ <description>C# Compiler support for Plexus Compiler component.</description>
+diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml
+index 5040ba7..d7812c5 100644
+--- a/plexus-compilers/plexus-compiler-eclipse/pom.xml
++++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml
+@@ -4,11 +4,11 @@
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compilers</artifactId>
++ <artifactId>plexus-compilers-temp</artifactId>
+ <version>2.1</version>
+ </parent>
+
+- <artifactId>plexus-compiler-eclipse</artifactId>
++ <artifactId>plexus-compiler-eclipse-temp</artifactId>
+
+ <name>Plexus Eclipse Compiler</name>
+ <description>Eclipse Compiler support for Plexus Compiler component.</description>
+diff --git a/plexus-compilers/plexus-compiler-javac/pom.xml b/plexus-compilers/plexus-compiler-javac/pom.xml
+index 24971bf..65493df 100644
+--- a/plexus-compilers/plexus-compiler-javac/pom.xml
++++ b/plexus-compilers/plexus-compiler-javac/pom.xml
+@@ -4,11 +4,11 @@
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compilers</artifactId>
++ <artifactId>plexus-compilers-temp</artifactId>
+ <version>2.1</version>
+ </parent>
+
+- <artifactId>plexus-compiler-javac</artifactId>
++ <artifactId>plexus-compiler-javac-temp</artifactId>
+
+ <name>Plexus Javac Component</name>
+ <description>Javac Compiler support for Plexus Compiler component.</description>
+diff --git a/plexus-compilers/plexus-compiler-jikes/pom.xml b/plexus-compilers/plexus-compiler-jikes/pom.xml
+index b81ec41..20efed5 100644
+--- a/plexus-compilers/plexus-compiler-jikes/pom.xml
++++ b/plexus-compilers/plexus-compiler-jikes/pom.xml
+@@ -4,11 +4,11 @@
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compilers</artifactId>
++ <artifactId>plexus-compilers-temp</artifactId>
+ <version>2.1</version>
+ </parent>
+
+- <artifactId>plexus-compiler-jikes</artifactId>
++ <artifactId>plexus-compiler-jikes-temp</artifactId>
+
+ <name>Plexus Jikes Compiler</name>
+ <description>Jikes Compiler support for Plexus Compiler component.</description>
+diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml
+index a20a7c7..886aab9 100644
+--- a/plexus-compilers/pom.xml
++++ b/plexus-compilers/pom.xml
+@@ -4,11 +4,11 @@
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler</artifactId>
++ <artifactId>plexus-compiler-temp</artifactId>
+ <version>2.1</version>
+ </parent>
+
+- <artifactId>plexus-compilers</artifactId>
++ <artifactId>plexus-compilers-temp</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Plexus Compilers</name>
+@@ -29,7 +29,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler-api</artifactId>
++ <artifactId>plexus-compiler-api-temp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+diff --git a/pom.xml b/pom.xml
+index 5dd60df..153aa5c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -9,7 +9,7 @@
+ <version>1.3.1</version>
+ </parent>
+
+- <artifactId>plexus-compiler</artifactId>
++ <artifactId>plexus-compiler-temp</artifactId>
+ <version>2.1</version>
+ <packaging>pom</packaging>
+
+@@ -38,7 +38,7 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-compiler-api</artifactId>
++ <artifactId>plexus-compiler-api-temp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+--
+1.8.1.2
+
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index 1f29f03..5eb8980 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -43,12 +43,14 @@ Group: Development/Java
URL: http://plexus.codehaus.org/
Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%...
+Patch0: 0001-change-artifactIds.patch
BuildArch: noarch
-BuildRequires: maven
+BuildRequires: maven-local
BuildRequires: jpackage-utils
BuildRequires: junit
BuildRequires: classworlds
+BuildRequires: plexus-compiler-extras
BuildRequires: eclipse-ecj
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
@@ -87,13 +89,16 @@ API documentation for %{name}.
%prep
%setup -q -n sonatype-plexus-compiler-%{dirhash}
+%patch0 -p1
+
%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
# don't build/install compiler-test module, it needs maven2 test harness
%pom_disable_module plexus-compiler-test
%build
-%mvn_package ":plexus-compiler{,s}" pom
+%mvn_package ":plexus-compiler-temp" pom
+%mvn_package ":plexus-compilers-temp" pom
%mvn_package ":*{csharp,eclipse,jikes}*" extras
# Tests are skipped because of unavailable plexus-compiler-test artifact
%mvn_build -f
@@ -101,7 +106,32 @@ API documentation for %{name}.
%install
%mvn_install
+# only temporary solution
+# we need to preserve older JARs and POMs for a while, because current maven-compiler-plugin
+# won't work with this newer version of plexus-compiler and we can't update maven-compiler-plugin
+# because it requires this newer version of plexus-compiler.
+# thus temporarly we need both versions of plexus-compiler
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
+cp /usr/share/java/plexus/compiler-api.jar %{buildroot}/usr/share/java/plexus/compiler-api.jar
+cp /usr/share/java/plexus/compiler-javac.jar %{buildroot}/usr/share/java/plexus/compiler-javac.jar
+cp /usr/share/java/plexus/compiler-manager.jar %{buildroot}/usr/share/java/plexus/compiler-manager.jar
+cp /usr/share/java/plexus/compiler-csharp.jar %{buildroot}/usr/share/java/plexus/compiler-csharp.jar
+cp /usr/share/java/plexus/compiler-eclipse.jar %{buildroot}/usr/share/java/plexus/compiler-eclipse.jar
+cp /usr/share/java/plexus/compiler-jikes.jar %{buildroot}/usr/share/java/plexus/compiler-jikes.jar
+cp /usr/share/maven-poms/JPP.plexus-compiler-api.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-api.pom
+cp /usr/share/maven-poms/JPP.plexus-compiler-javac.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-javac.pom
+cp /usr/share/maven-poms/JPP.plexus-compiler-manager.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-manager.pom
+cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compiler.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compiler.pom
+cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compilers.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compilers.pom
+cp /usr/share/maven-poms/JPP.plexus-compiler-csharp.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-csharp.pom
+cp /usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom
+cp /usr/share/maven-poms/JPP.plexus-compiler-jikes.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-jikes.pom
+cp /usr/share/maven-fragments/plexus-compiler.xml %{buildroot}/usr/share/maven-fragments/plexus-compiler-orig.xml
+
%files -f .mfiles
+%{_javadir}/plexus/*
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%files extras -f .mfiles-extras
%files pom -f .mfiles-pom
11 years, 2 months
[tomcat] Add depmaps for org.eclipse.jetty.orbit
by Krzysztof Daniel
commit 9b14c458881edfc091a735e5a6232d480c4d257e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Mar 4 13:34:10 2013 +0100
Add depmaps for org.eclipse.jetty.orbit
- Resolves: rhbz#917626
tomcat.spec | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 14867b9..0b2341c 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -462,16 +462,16 @@ done
# servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
%{__cp} -a tomcat-jsp-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
-%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api"
+%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp"
%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api"
+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el"
%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
# Generate a depmap fragment javax.servlet:servlet-api pointing to
# tomcat-servlet-3.0-api for backwards compatibility
# also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
-%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api"
+%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet"
# two special pom where jar files have different names
%{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
@@ -676,6 +676,10 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:7.0.37-2
+- Add depmaps for org.eclipse.jetty.orbit
+- Resolves: rhbz#917626
+
* Wed Feb 20 2013 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.37-1
- Updated to 7.0.37
11 years, 2 months
[javapackages-tools] Remove fragment file from %files
by Mikolaj Izdebski
commit 389cff6cc3d74d0b305279acf2906aa28d8e9e2e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Mar 4 14:38:23 2013 +0100
Remove fragment file from %files
javapackages-tools.spec | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 04820d6..a21e838 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -99,7 +99,6 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%{_sysconfdir}/rpm/macros.fjava
%files -n maven-local
-%{_mavendepmapfragdir}/%{name}
%{_sysconfdir}/rpm/macros.xmvn
%{_sysconfdir}/maven/*.xml
%{_bindir}/mvn-*
11 years, 2 months