[Bug 819552] New: logback: Please migrate from tomcat6 to tomcat7
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: logback: Please migrate from tomcat6 to tomcat7
https://bugzilla.redhat.com/show_bug.cgi?id=819552
Summary: logback: Please migrate from tomcat6 to tomcat7
Product: Fedora
Version: rawhide
Platform: All
OS/Version: Linux
Status: NEW
Severity: medium
Priority: medium
Component: logback
AssignedTo: mefoster(a)gmail.com
ReportedBy: mizdebsk(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: mefoster(a)gmail.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
We want to transition from tomcat6 to tomcat7 in Fedora. By depending on
tomcat6 logback it is successfully blocking the mentioned transition.
The following is the list of logback dependencies affecting the transition (the
list is not guarranteed to be complete):
Requires: servlet25
Requires: tomcat6
BuildRequires: servlet25
BuildRequires: tomcat6
Pleasee update logback to use tomcat7 instead of tomcat6. Thank you.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
11 years, 11 months
[logback] Split off access module into sub-package (bug 663198) Change BR/R from servlet25 to tomcat-servlet-3
by Orion Poplawski
commit 91fd527a42efa5fb07bdeeb9350948688e997776
Author: Orion Poplawski <orion(a)nwra.com>
Date: Fri Jul 13 15:42:31 2012 -0600
Split off access module into sub-package (bug 663198)
Change BR/R from servlet25 to tomcat-servlet-3.0-api (bug 819552)
Update build.xml to include jetty jars, drop setting CLASSPATH
logback-1.0.6-00-build.xml | 4 +++
logback.spec | 52 +++++++++++++++++++++++++++++++------------
2 files changed, 41 insertions(+), 15 deletions(-)
---
diff --git a/logback-1.0.6-00-build.xml b/logback-1.0.6-00-build.xml
index fd46c50..0a49bbf 100644
--- a/logback-1.0.6-00-build.xml
+++ b/logback-1.0.6-00-build.xml
@@ -77,6 +77,10 @@
<pathelement location="${core.build.dir}/**"/>
<fileset dir="${dist.dir}" includes="logback-core-${version}.jar"/>
<fileset dir="/usr/share/java" includes="tomcat/catalina.jar"/>
+ <fileset dir="/usr/share/java" includes="jetty/jetty.jar"/>
+ <fileset dir="/usr/share/java" includes="jetty/jetty-http.jar"/>
+ <fileset dir="/usr/share/java" includes="jetty/jetty-server.jar"/>
+ <fileset dir="/usr/share/java" includes="jetty/jetty-util.jar"/>
</path>
<path id="examples.classpath">
diff --git a/logback.spec b/logback.spec
index bf3e093..aa67ac3 100644
--- a/logback.spec
+++ b/logback.spec
@@ -1,16 +1,16 @@
Name: logback
Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Java logging library
Group: Development/Tools
License: LGPLv2 or EPL
URL: http://logback.qos.ch/
Source0: http://logback.qos.ch/dist/%{name}-%{version}.tar.gz
-Source1: %{name}-%{version}-00-build.xml
-Source2: %{name}-%{version}-core-osgi.bnd
-Source3: %{name}-%{version}-classic-osgi.bnd
-Source4: %{name}-%{version}-access-osgi.bnd
+Source1: %{name}-%{version}-00-build.xml
+Source2: %{name}-%{version}-core-osgi.bnd
+Source3: %{name}-%{version}-classic-osgi.bnd
+Source4: %{name}-%{version}-access-osgi.bnd
# Use Janino 2.6 API
Patch0: %{name}-%{version}-janino-2_6.patch
@@ -26,12 +26,12 @@ BuildRequires: jansi
# Using the version of jetty in the pom.xml file
BuildRequires: jetty >= 7.5.1
BuildRequires: slf4j
-BuildRequires: servlet25
+BuildRequires: tomcat-servlet-3.0-api
BuildRequires: tomcat-lib
BuildRequires: javamail
BuildRequires: apache-commons-cli
BuildRequires: antlr-tool
-BuildRequires: log4j
+BuildRequires: log4j
# Build tools -- build with ant for now because of circular dependencies
BuildRequires: ant
@@ -48,10 +48,7 @@ Requires: jpackage-utils
Requires: jansi
Requires: jms
Requires: janino
-Requires: jetty >= 7.5.1
Requires: slf4j
-Requires: tomcat-lib
-Requires: servlet25
%description
Logback is intended as a successor to the popular log4j project. At present
@@ -76,6 +73,19 @@ Requires: jpackage-utils
%description javadoc
API documentation for the Logback library
+%package access
+Summary: Logback-access module for Servlet integration
+Group: Development/Libraries
+Requires: %{name} = %{version}
+Requires: jetty >= 7.5.1
+Requires: tomcat-lib
+Requires: tomcat-servlet-3.0-api
+
+%description access
+The logback-access module integrates with Servlet containers, such as Tomcat
+and Jetty, to provide HTTP-access log functionality. Note that you could
+easily build your own module on top of logback-core.
+
%package examples
Summary: Sample code for %{name}
Group: Documentation
@@ -104,7 +114,6 @@ cp -p %{SOURCE4} osgi-access.bnd
sed -i 's#<artifactId>groovy-all</artifactId#<artifactId>groovy</artifactId#' $(find . -name "pom.xml")
%build
-export CLASSPATH=`build-classpath antlr groovy janino javamail commons-compiler commons-cli tomcat6-servlet-api objectweb-asm jms slf4j jetty tomcat/catalina`
ant dist javadoc
%install
@@ -126,9 +135,9 @@ done
install -m 644 dist/logback-examples-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/logback-examples.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/logback-examples.jar
install -m 644 logback-examples/pom.xml \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-logback-examples.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-logback-examples.pom
%add_maven_depmap JPP.%{name}-logback-examples.pom %{name}/logback-examples.jar -f examples
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/examples
@@ -136,9 +145,13 @@ cp -r logback-examples/pom.xml logback-examples/src $RPM_BUILD_ROOT%{_datadir}/%
%files
%doc LICENSE.txt README.txt docs/*
-%{_javadir}/%{name}
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/logback-classic.jar
+%{_javadir}/%{name}/logback-core.jar
%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/*.pom
+%{_mavenpomdir}/JPP.logback-logback-classic.pom
+%{_mavenpomdir}/JPP.logback-logback-core.pom
+%{_mavenpomdir}/JPP.logback-logback-parent.pom
%exclude %{_javadir}/%{name}/%{name}-examples.jar
%exclude %{_mavenpomdir}/JPP.%{name}-%{name}-examples.pom
@@ -146,6 +159,10 @@ cp -r logback-examples/pom.xml logback-examples/src $RPM_BUILD_ROOT%{_datadir}/%
%doc LICENSE.txt
%{_javadocdir}/%{name}
+%files access
+%{_javadir}/%{name}/logback-access.jar
+%{_mavenpomdir}/JPP.logback-logback-access.pom
+
%files examples
%doc LICENSE.txt
%{_datadir}/%{name}-%{version}
@@ -154,6 +171,11 @@ cp -r logback-examples/pom.xml logback-examples/src $RPM_BUILD_ROOT%{_datadir}/%
%{_mavenpomdir}/JPP.%{name}-%{name}-examples.pom
%changelog
+* Fri Jul 13 2012 Orion Poplawski <orion(a)nwra.com> - 1.0.6-2
+- Split off access module into sub-package (bug 663198)
+- Change BR/R from servlet25 to tomcat-servlet-3.0-api (bug 819552)
+- Update build.xml to include jetty jars, drop setting CLASSPATH
+
* Wed Jul 11 2012 gil cattaneo <puntogil(a)libero.it> - 1.0.6-1
- Update to 1.0.6
11 years, 11 months
[netty] Update to upstream version 3.5.2
by Mikolaj Izdebski
commit 20909d607f74163d8d797e78ff99079cf698459f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jul 12 10:11:59 2012 +0200
Update to upstream version 3.5.2
.gitignore | 2 ++
netty.spec | 57 ++++++++++++++++++++++++++++++---------------------------
sources | 2 +-
3 files changed, 33 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ee48c2..8097f60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/netty-3.2.3.Final-dist.tar.bz2
/netty-3.2.4.Final-dist.tar.bz2
+/netty-3.2.7.Final-dist.tar.bz2
+/netty-3.5.2.Final-dist.tar.bz2
diff --git a/netty.spec b/netty.spec
index 75d6ed4..d56b754 100644
--- a/netty.spec
+++ b/netty.spec
@@ -1,39 +1,38 @@
Name: netty
-Version: 3.2.4
-Release: 4%{?dist}
+Version: 3.5.2
+Release: 1%{?dist}
Summary: An asynchronous event-driven network application framework and tools for Java
Group: Development/Libraries
License: ASL 2.0
-URL: http://www.jboss.org/netty
-Source0: http://sourceforge.net/projects/jboss/files/%{name}-%{version}.Final-dist...
+URL: https://netty.io/
+Source0: https://github.com/downloads/%{name}/%{name}/%{name}-%{version}.Final-dis...
BuildArch: noarch
-# This pulls in all of the required java and maven stuff
BuildRequires: maven
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
-BuildRequires: maven-release-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-plugin-jxr
-BuildRequires: buildnumber-maven-plugin
BuildRequires: ant-contrib
-BuildRequires: subversion
-BuildRequires: protobuf-java
+
BuildRequires: felix-osgi-compendium
-BuildRequires: jboss-parent
+BuildRequires: felix-osgi-core
BuildRequires: jboss-logging
-BuildRequires: apiviz
-BuildRequires: graphviz
+BuildRequires: jboss-marshalling
+BuildRequires: protobuf-java
+BuildRequires: slf4j
+BuildRequires: sonatype-oss-parent
+BuildRequires: tomcat-servlet-3.0-api
Requires: java
+Requires: jpackage-utils
Requires: protobuf-java
%description
@@ -61,22 +60,22 @@ Requires: jpackage-utils
%prep
%setup -q -n %{name}-%{version}.Final
-
# just to be sure, but not used anyway
-rm -rf jar/
-
-# example doesn't build with our protobuf
-rm -rf src/main/java/org/jboss/netty/example/localtime
+rm -rf jar doc license
-%pom_remove_plugin :maven-eclipse-plugin
-%pom_remove_plugin :maven-jdocbook-plugin
+%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-jxr-plugin']]"
+%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-checkstyle-plugin']]"
+%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
+%pom_remove_dep javax.activation:activation
+%pom_remove_plugin :animal-sniffer-maven-plugin
%pom_xpath_remove "pom:execution[pom:id[text()='remove-examples']]"
-sed -i s/-spi// pom.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration"
+
+sed s/jboss-logging-spi/jboss-logging/ -i pom.xml
%build
-# skipping tests because we don't have all dependencies in Fedora
-mvn-rpmbuild -Dmaven.test.skip=true \
- install javadoc:aggregate
+# skipping tests because we don't have easymockclassextension
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
@@ -85,9 +84,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/%{name}-%{version}.Final.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
@@ -105,6 +103,11 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%{_javadocdir}/%{name}
%changelog
+* Thu Jul 12 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.5.2-1
+- Update to upstream version 3.5.2
+- Convert patches to POM macros
+- Enable jboss-logging
+
* Fri May 18 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.2.4-4
- Add enforcer-plugin to BR
diff --git a/sources b/sources
index ad80068..c3d8104 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e82ab04f165162c156344c469395df58 netty-3.2.4.Final-dist.tar.bz2
+9b4c5480a6119534c63a17d65514f8cc netty-3.5.2.Final-dist.tar.bz2
11 years, 11 months
[netty] Convert patches to POM macros
by Mikolaj Izdebski
commit 598b900ce3c1ee53d3cc36b40aca28efb92364e3
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jul 12 10:08:34 2012 +0200
Convert patches to POM macros
0001-Remove-optional-deps.patch | 160 --------------------
...ove-antun-execution-for-removing-examples.patch | 71 ---------
0005-Remove-eclipse-plugin.patch | 32 ----
netty.spec | 12 +-
4 files changed, 5 insertions(+), 270 deletions(-)
---
diff --git a/netty.spec b/netty.spec
index 7db82d4..75d6ed4 100644
--- a/netty.spec
+++ b/netty.spec
@@ -8,10 +8,6 @@ License: ASL 2.0
URL: http://www.jboss.org/netty
Source0: http://sourceforge.net/projects/jboss/files/%{name}-%{version}.Final-dist...
-Patch1: 0001-Remove-optional-deps.patch
-Patch4: 0004-Remove-antun-execution-for-removing-examples.patch
-Patch5: 0005-Remove-eclipse-plugin.patch
-
BuildArch: noarch
# This pulls in all of the required java and maven stuff
@@ -26,6 +22,7 @@ BuildRequires: maven-release-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-plugin-bundle
+BuildRequires: maven-plugin-jxr
BuildRequires: buildnumber-maven-plugin
BuildRequires: ant-contrib
BuildRequires: subversion
@@ -71,9 +68,10 @@ rm -rf jar/
# example doesn't build with our protobuf
rm -rf src/main/java/org/jboss/netty/example/localtime
-%patch1 -p1
-%patch4 -p1
-%patch5 -p1
+%pom_remove_plugin :maven-eclipse-plugin
+%pom_remove_plugin :maven-jdocbook-plugin
+%pom_xpath_remove "pom:execution[pom:id[text()='remove-examples']]"
+sed -i s/-spi// pom.xml
%build
# skipping tests because we don't have all dependencies in Fedora
11 years, 11 months
[netty] Generate richer javadoc
by Mikolaj Izdebski
commit f6dacd580c8c4684eb94b7754e3c729a2c3e3cf6
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jul 12 09:53:30 2012 +0200
Generate richer javadoc
0003-Fix-javadoc-plugin-configuration.patch | 49 ---------------------------
netty.spec | 6 ++--
2 files changed, 3 insertions(+), 52 deletions(-)
---
diff --git a/netty.spec b/netty.spec
index b3b7e2f..7db82d4 100644
--- a/netty.spec
+++ b/netty.spec
@@ -9,7 +9,6 @@ URL: http://www.jboss.org/netty
Source0: http://sourceforge.net/projects/jboss/files/%{name}-%{version}.Final-dist...
Patch1: 0001-Remove-optional-deps.patch
-Patch3: 0003-Fix-javadoc-plugin-configuration.patch
Patch4: 0004-Remove-antun-execution-for-removing-examples.patch
Patch5: 0005-Remove-eclipse-plugin.patch
@@ -34,6 +33,8 @@ BuildRequires: protobuf-java
BuildRequires: felix-osgi-compendium
BuildRequires: jboss-parent
BuildRequires: jboss-logging
+BuildRequires: apiviz
+BuildRequires: graphviz
Requires: java
Requires: protobuf-java
@@ -71,7 +72,6 @@ rm -rf jar/
rm -rf src/main/java/org/jboss/netty/example/localtime
%patch1 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -89,7 +89,7 @@ install -m 644 target/%{name}-%{version}.Final.jar \
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
11 years, 11 months
[netty] Enable jboss-logging
by Mikolaj Izdebski
commit b2005f7dd5ef6e5e4dc3122306661a9dacd6e679
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jul 12 00:45:38 2012 +0200
Enable jboss-logging
0001-Remove-optional-deps.patch | 15 +++++-----
0002-Replace-jboss-logger-with-jdk-logger.patch | 33 -----------------------
netty.spec | 21 +++++---------
3 files changed, 16 insertions(+), 53 deletions(-)
---
diff --git a/0001-Remove-optional-deps.patch b/0001-Remove-optional-deps.patch
index 86cd9f2..1536b10 100644
--- a/0001-Remove-optional-deps.patch
+++ b/0001-Remove-optional-deps.patch
@@ -11,17 +11,18 @@ diff --git a/pom.xml b/pom.xml
index a1597fe..77fb611 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -116,13 +116,6 @@
+@@ -116,13 +116,13 @@
<optional>true</optional>
</dependency>
<dependency>
-- <groupId>org.jboss.logging</groupId>
+ <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
-- <version>2.1.2.GA</version>
-- <scope>compile</scope>
-- <optional>true</optional>
-- </dependency>
-- <dependency>
++ <artifactId>jboss-logging</artifactId>
+ <version>2.1.2.GA</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
diff --git a/netty.spec b/netty.spec
index 77a6b6e..b3b7e2f 100644
--- a/netty.spec
+++ b/netty.spec
@@ -8,13 +8,12 @@ License: ASL 2.0
URL: http://www.jboss.org/netty
Source0: http://sourceforge.net/projects/jboss/files/%{name}-%{version}.Final-dist...
-Patch0: 0001-Remove-optional-deps.patch
-Patch1: 0002-Replace-jboss-logger-with-jdk-logger.patch
-Patch2: 0003-Fix-javadoc-plugin-configuration.patch
-Patch3: 0004-Remove-antun-execution-for-removing-examples.patch
-Patch4: 0005-Remove-eclipse-plugin.patch
+Patch1: 0001-Remove-optional-deps.patch
+Patch3: 0003-Fix-javadoc-plugin-configuration.patch
+Patch4: 0004-Remove-antun-execution-for-removing-examples.patch
+Patch5: 0005-Remove-eclipse-plugin.patch
-BuildArch: noarch
+BuildArch: noarch
# This pulls in all of the required java and maven stuff
BuildRequires: maven
@@ -34,6 +33,7 @@ BuildRequires: subversion
BuildRequires: protobuf-java
BuildRequires: felix-osgi-compendium
BuildRequires: jboss-parent
+BuildRequires: jboss-logging
Requires: java
Requires: protobuf-java
@@ -70,20 +70,15 @@ rm -rf jar/
# example doesn't build with our protobuf
rm -rf src/main/java/org/jboss/netty/example/localtime
-
-%patch0 -p1
%patch1 -p1
-
-# we don't have jboss logging facilites so we replace it with jdk logger
-rm src/main/java/org/jboss/netty/logging/JBossLogger*.java
-%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
# skipping tests because we don't have all dependencies in Fedora
mvn-rpmbuild -Dmaven.test.skip=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
11 years, 11 months