[apache-commons-lang] Add sources
by Stanislav Ochotnicky
commit 18422766d7fb23d5d1d1ffa62fddf13a8ed15184
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jan 18 14:09:23 2011 +0100
Add sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bb010d..86e0788 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-lang-2.5-src.tar.gz
+/commons-lang-2.6-src.tar.gz
diff --git a/sources b/sources
index 204448e..32fef78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e96700da2046aa31a2c39839cf7b6cc9 commons-lang-2.5-src.tar.gz
+37ee469f4caff6cfa28f9d0a0be2d4d2 commons-lang-2.6-src.tar.gz
13 years, 3 months
[apache-commons-lang] Update to 2.6
by Stanislav Ochotnicky
commit 5522c13e8623d1074625157d47a78dc022dd6d30
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jan 18 13:58:40 2011 +0100
Update to 2.6
- Versionless jars & javadocs
- Use maven 3 to build
0001-Make-source-version-1.3.patch | 35 ++++++++++++++++++++++++++++++
apache-commons-lang.spec | 42 ++++++++++++++++-------------------
2 files changed, 54 insertions(+), 23 deletions(-)
---
diff --git a/0001-Make-source-version-1.3.patch b/0001-Make-source-version-1.3.patch
new file mode 100644
index 0000000..2b6a7a2
--- /dev/null
+++ b/0001-Make-source-version-1.3.patch
@@ -0,0 +1,35 @@
+From 4bdae0c8e87e64322753890a10bbbe5971d46bb6 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Tue, 18 Jan 2011 13:43:08 +0100
+Subject: [PATCH] Make source version 1.3
+
+---
+ pom.xml | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 367d439..fa3db7b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -458,6 +458,18 @@
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
++ <plugin>
++ <artifactId>maven-javadoc-plugin</artifactId>
++ <configuration>
++ <source>1.3</source>
++ </configuration>
++ </plugin>
++ <plugin>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <source>1.3</source>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+
+--
+1.7.3.4
+
diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec
index 5ddebd5..78cd494 100644
--- a/apache-commons-lang.spec
+++ b/apache-commons-lang.spec
@@ -3,17 +3,19 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 2.5
-Release: 7%{?dist}
+Version: 2.6
+Release: 1%{?dist}
Summary: Provides a host of helper utilities for the java.lang API
License: ASL 2.0
Group: Development/Libraries
URL: http://commons.apache.org/%{base_name}
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
+Patch0: 0001-Make-source-version-1.3.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven-site-plugin
+BuildRequires: maven
BuildRequires: apache-commons-parent
Requires: java >= 1:1.6.0
@@ -21,7 +23,6 @@ Requires: jpackage-utils >= 0:1.6
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This should go away with F-17
Provides: jakarta-commons-lang = 0:%{version}-%{release}
@@ -51,28 +52,18 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:2.4
%prep
%setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
sed -i 's/\r//' *.txt
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-local install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
-popd # come back from javadir
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{buildroot}%{_javadir}%{name}.jar %{short_name}.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -88,12 +79,13 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -111,10 +103,14 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.6-1
+- Update to 2.6
+- Versionless jars & javadocs
+- Use maven 3 to build
+
* Wed Nov 10 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.5-7
- Use apache-commons-parent instead of maven-*
13 years, 3 months
[maven2] Print plugin collector debug output only when maven2.jpp.debug mode is on
by Stanislav Ochotnicky
commit bd3f09cf9c937ce6177093586dd08ffbd29581cc
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jan 18 11:11:29 2011 +0100
Print plugin collector debug output only when maven2.jpp.debug mode is on
maven2-2.2.1-jpp.patch | 144 +++++++++++++++++++++++++++++++-----------------
maven2.spec | 7 ++-
2 files changed, 99 insertions(+), 52 deletions(-)
---
diff --git a/maven2-2.2.1-jpp.patch b/maven2-2.2.1-jpp.patch
index 62db592..8b676f8 100644
--- a/maven2-2.2.1-jpp.patch
+++ b/maven2-2.2.1-jpp.patch
@@ -1,7 +1,30 @@
-diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
---- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav 2009-08-06 15:11:34.000000000 -0400
-+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java 2009-11-19 14:17:42.000000000 -0500
-@@ -58,6 +58,8 @@ import org.codehaus.plexus.util.FileUtil
+From 1633026ab5ef24701ce8617db283079a185d6205 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Tue, 18 Jan 2011 10:40:00 +0100
+Subject: [PATCH 2/7] Maven JPP mode patch
+
+---
+ .../artifact/manager/DefaultWagonManager.java | 31 ++++++++++++++++++++
+ .../metadata/DefaultRepositoryMetadataManager.java | 2 +-
+ .../artifact/resolver/DefaultArtifactResolver.java | 3 +-
+ maven-artifact/pom.xml | 5 +++
+ .../repository/layout/DefaultRepositoryLayout.java | 17 ++++++++++-
+ .../resolver/DefaultArtifactCollector.java | 9 ++++-
+ .../main/resources/META-INF/plexus/components.xml | 6 ++++
+ .../apache/maven/plugin/MavenPluginCollector.java | 18 +++++++++++
+ .../apache/maven/plugin/MavenPluginValidator.java | 6 ++-
+ .../java/org/apache/maven/plugin/PluginUtils.java | 8 ++++-
+ .../version/DefaultPluginVersionManager.java | 8 ++++-
+ .../project/validation/DefaultModelValidator.java | 10 +++++-
+ .../org/apache/maven/project/pom-4.0.0.xml | 22 ++++++++++++++
+ pom.xml | 5 +++
+ 14 files changed, 139 insertions(+), 11 deletions(-)
+
+diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+index 6318435..e4f8bb1 100644
+--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
++++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+@@ -58,6 +58,8 @@ import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -63,10 +86,11 @@ diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manage
getLogger().debug( "Trying repository " + repository.getId() );
getRemoteFile( getMirrorRepository( repository ), artifact.getFile(), remotePath, downloadMonitor,
policy.getChecksumPolicy(), false );
-diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
---- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav 2009-08-06 15:11:34.000000000 -0400
-+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java 2009-11-18 16:54:39.000000000 -0500
-@@ -85,7 +85,7 @@ public class DefaultRepositoryMetadataMa
+diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+index 22cb0ec..edc79a5 100644
+--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
++++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+@@ -85,7 +85,7 @@ public class DefaultRepositoryMetadataManager
boolean checkForUpdates =
!file.exists() || policy.checkOutOfDate( new Date( file.lastModified() ) );
@@ -75,9 +99,10 @@ diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/reposi
{
if ( wagonManager.isOnline() )
{
-diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
---- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav 2009-08-06 15:11:34.000000000 -0400
-+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+index d8c3629..19d702b 100644
+--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
++++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -206,7 +206,8 @@ public class DefaultArtifactResolver
try
{
@@ -88,9 +113,10 @@ diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolv
{
// the transformations discovered the artifact - so use it exclusively
wagonManager.getArtifact( artifact, artifact.getRepository() );
-diff -up ./maven-artifact/pom.xml.sav ./maven-artifact/pom.xml
---- ./maven-artifact/pom.xml.sav 2009-08-06 15:11:32.000000000 -0400
-+++ ./maven-artifact/pom.xml 2009-11-19 14:54:43.000000000 -0500
+diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
+index c77eabc..5b3b2e7 100644
+--- a/maven-artifact/pom.xml
++++ b/maven-artifact/pom.xml
@@ -39,5 +39,10 @@ under the License.
<artifactId>plexus-container-default</artifactId>
<scope>test</scope>
@@ -102,10 +128,11 @@ diff -up ./maven-artifact/pom.xml.sav ./maven-artifact/pom.xml
+ </dependency>
</dependencies>
</project>
-diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
---- ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav 2009-08-06 15:11:31.000000000 -0400
-+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java 2009-11-19 14:15:45.000000000 -0500
-@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifac
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
+index 4a8bc0f..d8cb4e7 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
+@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -143,9 +170,10 @@ diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/lay
}
}
-diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
---- ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav 2009-08-06 15:11:32.000000000 -0400
-+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
+index d10b795..c945ee5 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
@@ -341,7 +341,7 @@ public class DefaultArtifactCollector
// set the recommended version
// TODO: maybe its better to just pass the range through to retrieval and use a transformation?
@@ -169,9 +197,10 @@ diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/Defau
fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}
-diff -up ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav ./maven-artifact/src/main/resources/META-INF/plexus/components.xml
---- ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav 2009-08-06 15:11:32.000000000 -0400
-+++ ./maven-artifact/src/main/resources/META-INF/plexus/components.xml 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-artifact/src/main/resources/META-INF/plexus/components.xml b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
+index b27fc3c..346adf1 100644
+--- a/maven-artifact/src/main/resources/META-INF/plexus/components.xml
++++ b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
@@ -31,6 +31,12 @@ under the License.
<implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
</component>
@@ -185,23 +214,29 @@ diff -up ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav
<!--
|
| ArtifactHandlerManager
-diff -up ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java.sav ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav 2009-11-19 11:36:53.000000000 -0500
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java 2009-11-19 11:47:25.000000000 -0500
-@@ -60,6 +60,7 @@ public class MavenPluginCollector
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
+index 93d61fa..68232c6 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
+@@ -60,6 +60,10 @@ public class MavenPluginCollector
{
pluginsInProcess.add( key );
-+ System.err.println("*DEBUG*: Putting in plugin descriptor list " + key + " and goal prefix is " + pluginDescriptor.getGoalPrefix());
++ if ( System.getProperty("maven2.jpp.debug") != null )
++ {
++ System.err.println("*DEBUG*: Putting in plugin descriptor list " + key + " and goal prefix is " + pluginDescriptor.getGoalPrefix());
++ }
pluginDescriptors.put( key, pluginDescriptor );
// TODO: throw an (not runtime) exception if there is a prefix overlap - means doing so elsewhere
-@@ -75,6 +76,17 @@ public class MavenPluginCollector
+@@ -75,6 +79,20 @@ public class MavenPluginCollector
public PluginDescriptor getPluginDescriptor( Plugin plugin )
{
String key = PluginUtils.constructVersionedKey( plugin );
-+ System.err.println("*DEBUG*: Constructed plugin version key is " + key);
++ if ( System.getProperty("maven2.jpp.debug") != null )
++ {
++ System.err.println("*DEBUG*: Constructed plugin version key is " + key);
++ }
+
+ PluginDescriptor descriptor = (PluginDescriptor) pluginDescriptors.get( key );
+
@@ -215,9 +250,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector
return (PluginDescriptor) pluginDescriptors.get( key );
}
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav 2009-11-19 11:08:06.000000000 -0500
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java 2009-11-19 11:08:29.000000000 -0500
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
+index dc8e6e1..b8cd650 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
@@ -57,8 +57,10 @@ public class MavenPluginValidator
{
errors.add( "Plugin's descriptor contains the wrong artifact ID: " + pluginDescriptor.getArtifactId() );
@@ -231,9 +267,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator
{
errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() );
}
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav 2009-11-19 11:51:04.000000000 -0500
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java 2009-11-19 12:00:15.000000000 -0500
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
+index 0b1e9a5..21a4af7 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
@@ -72,7 +72,13 @@ class PluginUtils
String baseVersion = ArtifactUtils.toSnapshotVersion( version );
@@ -249,9 +286,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav
return key.toString();
}
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav 2009-08-06 15:11:28.000000000 -0400
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
+index 5a484bc..6dd6dbb 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
@@ -224,9 +224,15 @@ public class DefaultPluginVersionManager
}
@@ -269,9 +307,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPlugi
}
// if the plugin registry is inactive, then the rest of this goop is useless...
-diff -up ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
---- ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav 2009-08-06 15:11:37.000000000 -0400
-+++ ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
+index ede61f4..dba7bca 100644
+--- a/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
++++ b/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
@@ -43,7 +43,7 @@ import java.util.List;
public class DefaultModelValidator
implements ModelValidator
@@ -296,9 +335,10 @@ diff -up ./maven-project/src/main/java/org/apache/maven/project/validation/Defau
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
{
-diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
---- ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav 2009-08-06 15:11:38.000000000 -0400
-+++ ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml 2009-11-19 13:12:23.000000000 -0500
+diff --git a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+index 00e84c1..b0e4289 100644
+--- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
++++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
@@ -32,6 +32,15 @@ under the License.
<enabled>false</enabled>
</snapshots>
@@ -335,9 +375,10 @@ diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.x
</pluginRepositories>
<build>
-diff -up ./pom.xml.sav ./pom.xml
---- ./pom.xml.sav 2009-08-06 15:11:38.000000000 -0400
-+++ ./pom.xml 2009-11-19 14:54:29.000000000 -0500
+diff --git a/pom.xml b/pom.xml
+index e2fde29..3fe31f5 100644
+--- a/pom.xml
++++ b/pom.xml
@@ -481,6 +481,11 @@ under the License.
<artifactId>classworlds</artifactId>
<version>1.1</version>
@@ -350,3 +391,6 @@ diff -up ./pom.xml.sav ./pom.xml
</dependencies>
<!--start-->
</dependencyManagement>
+--
+1.7.3.4
+
diff --git a/maven2.spec b/maven2.spec
index d21f45f..eb3b679 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -236,7 +236,7 @@ build, reporting and documentation from a central piece of information.
%setup -q -n apache-maven-2.2.1
%patch0 -b .antbuild
-%patch1 -b .jpp
+%patch1 -p1 -b .jpp
%patch2 -b .update-tests
%if ! %{bootstrap}
@@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT
%doc
%changelog
+* Tue Jan 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-19
+- Print plugin collector debug output only when maven2.jpp.debug mode is on
+
* Wed Dec 22 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-18
- Add xml-commons-apis to lib directory
- fixes NoClassDefFoundError org/w3c/dom/ElementTraversal
13 years, 3 months
[netty] Initial commit
by Stanislav Ochotnicky
commit af5fe56c1095d2dbf0b35b4ec9cdae7177236739
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jan 18 11:02:23 2011 +0100
Initial commit
.gitignore | 1 +
...move-parent-and-fix-javadoc-plugin-config.patch | 61 +++++++
0002-Remove-optional-deps.patch | 172 ++++++++++++++++++++
0003-Replace-jboss-logger-with-jdk-logger.patch | 33 ++++
netty.spec | 136 ++++++++++++++++
sources | 1 +
6 files changed, 404 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..42c8d97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/netty-3.2.3.Final-dist.tar.bz2
diff --git a/0001-Remove-parent-and-fix-javadoc-plugin-config.patch b/0001-Remove-parent-and-fix-javadoc-plugin-config.patch
new file mode 100644
index 0000000..42fc2d6
--- /dev/null
+++ b/0001-Remove-parent-and-fix-javadoc-plugin-config.patch
@@ -0,0 +1,61 @@
+From 12b26381c9c47432d63f941b2bf4877874e78c12 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Thu, 13 Jan 2011 14:59:07 +0100
+Subject: [PATCH 1/3] Remove parent and fix javadoc plugin config
+
+---
+ pom.xml | 21 ---------------------
+ 1 files changed, 0 insertions(+), 21 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index fbece2d..806f05c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -17,11 +17,6 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+- <parent>
+- <groupId>org.jboss</groupId>
+- <artifactId>jboss-parent</artifactId>
+- <version>5</version>
+- </parent>
+
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+@@ -400,23 +395,9 @@
+ </execution>
+ </executions>
+ <configuration>
+- <doclet>org.jboss.apiviz.APIviz</doclet>
+- <docletArtifact>
+- <groupId>org.jboss.apiviz</groupId>
+- <artifactId>apiviz</artifactId>
+- <version>1.3.1.GA</version>
+- </docletArtifact>
+- <attach>false</attach>
+ <stylesheetfile>${basedir}/src/javadoc/stylesheet.css</stylesheetfile>
+- <javadocDirectory>${basedir}/src/javadoc</javadocDirectory>
+- <docfilessubdirs>true</docfilessubdirs>
+- <useStandardDocletOptions>true</useStandardDocletOptions>
+- <outputDirectory>${project.build.directory}/api</outputDirectory>
+- <reportOutputDirectory>${project.build.directory}/api</reportOutputDirectory>
+- <destDir>api</destDir>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+- <breakiterator>true</breakiterator>
+ <version>true</version>
+ <author>true</author>
+ <keywords>true</keywords>
+@@ -438,8 +419,6 @@
+ -group "Reusable I/O event interceptors" ${project.groupId}.handler*
+ -group "Miscellaneous" ${project.groupId}.logging*:${project.groupId}.util*
+
+- -sourceclasspath ${project.build.outputDirectory}
+- -nopackagediagram
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ <locale>en_US</locale>
+--
+1.7.3.4
+
diff --git a/0002-Remove-optional-deps.patch b/0002-Remove-optional-deps.patch
new file mode 100644
index 0000000..3567aa8
--- /dev/null
+++ b/0002-Remove-optional-deps.patch
@@ -0,0 +1,172 @@
+From 13a221991b69065fbd70fd9f6d29d62f03880ef1 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Thu, 13 Jan 2011 14:59:40 +0100
+Subject: [PATCH 2/3] Remove optional deps
+
+---
+ pom.xml | 135 ---------------------------------------------------------------
+ 1 files changed, 0 insertions(+), 135 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 806f05c..e61a552 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -111,13 +111,6 @@
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+- <groupId>org.jboss.logging</groupId>
+- <artifactId>jboss-logging-spi</artifactId>
+- <version>2.1.1.GA</version>
+- <scope>compile</scope>
+- <optional>true</optional>
+- </dependency>
+- <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+@@ -157,12 +150,6 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymockclassextension</artifactId>
+- <version>2.5.2</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.11</version>
+@@ -426,128 +413,6 @@
+ </configuration>
+ </plugin>
+ <plugin>
+- <artifactId>maven-jxr-plugin</artifactId>
+- <version>2.1</version>
+- <executions>
+- <execution>
+- <id>generate-xref</id>
+- <phase>package</phase>
+- <goals>
+- <goal>jxr</goal>
+- </goals>
+- </execution>
+- </executions>
+- <configuration>
+- <inputEncoding>UTF-8</inputEncoding>
+- <outputEncoding>UTF-8</outputEncoding>
+- <linkJavadoc>true</linkJavadoc>
+- <destDir>${project.build.directory}/xref</destDir>
+- <javadocDir>${project.build.directory}/api</javadocDir>
+- <stylesheet>${basedir}/src/xref/stylesheet.css</stylesheet>
+- <docTitle>${project.name} Source Xref (${project.version}, r${buildNumber})</docTitle>
+- <windowTitle>${project.name} Source Xref (${project.version}, r${buildNumber})</windowTitle>
+- </configuration>
+- </plugin>
+- <plugin>
+- <groupId>org.jboss.maven.plugins</groupId>
+- <artifactId>maven-jdocbook-plugin</artifactId>
+- <version>2.2.1</version>
+- <executions>
+- <execution>
+- <id>generate-docbook</id>
+- <phase>package</phase>
+- <goals>
+- <goal>resources</goal>
+- <goal>generate</goal>
+- </goals>
+- </execution>
+- </executions>
+- <dependencies>
+- <dependency>
+- <groupId>org.jboss</groupId>
+- <artifactId>jbossorg-docbook-xslt</artifactId>
+- <version>1.1.0</version>
+- <exclusions>
+- <exclusion>
+- <groupId>org.eclipse.wst.css</groupId>
+- <artifactId>core</artifactId>
+- </exclusion>
+- <exclusion>
+- <groupId>org.eclipse.wst.sse</groupId>
+- <artifactId>core</artifactId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+- <dependency>
+- <groupId>org.jboss</groupId>
+- <artifactId>jbossorg-jdocbook-style</artifactId>
+- <version>1.1.0</version>
+- <type>jdocbook-style</type>
+- <exclusions>
+- <exclusion>
+- <groupId>org.eclipse.wst.css</groupId>
+- <artifactId>core</artifactId>
+- </exclusion>
+- <exclusion>
+- <groupId>org.eclipse.wst.sse</groupId>
+- <artifactId>core</artifactId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+- <dependency>
+- <groupId>org.jboss</groupId>
+- <artifactId>jbossorg-fonts</artifactId>
+- <version>1.0.0</version>
+- <type>jdocbook-style</type>
+- </dependency>
+- </dependencies>
+- <configuration>
+- <sourceDocumentName>master.xml</sourceDocumentName>
+- <sourceDirectory>${basedir}/src/docbook</sourceDirectory>
+- <cssResource>
+- <directory>${basedir}/src/docbook</directory>
+- <includes>
+- <include>css/**/*</include>
+- </includes>
+- </cssResource>
+- <imageResource>
+- <directory>${basedir}/src/docbook</directory>
+- <includes>
+- <include>images/**/*</include>
+- </includes>
+- </imageResource>
+- <formats>
+- <format>
+- <formatName>html</formatName>
+- <stylesheetResource>file:///${basedir}/src/docbook/xslt/xhtml.xsl</stylesheetResource>
+- <finalName>index.html</finalName>
+- </format>
+- <format>
+- <formatName>html_single</formatName>
+- <stylesheetResource>file:///${basedir}/src/docbook/xslt/xhtml-single.xsl</stylesheetResource>
+- <finalName>index.html</finalName>
+- </format>
+- <format>
+- <formatName>eclipse</formatName>
+- <stylesheetResource>file:///${basedir}/src/docbook/xslt/eclipse.xsl</stylesheetResource>
+- <finalName>index.html</finalName>
+- </format>
+- <format>
+- <formatName>pdf</formatName>
+- <stylesheetResource>file:///${basedir}/src/docbook/xslt/pdf.xsl</stylesheetResource>
+- <finalName>netty.pdf</finalName>
+- </format>
+- </formats>
+- <options>
+- <xincludeSupported>true</xincludeSupported>
+- <xmlTransformerType>saxon</xmlTransformerType>
+- <docbookVersion>1.72.0</docbookVersion>
+- <localeSeparator>-</localeSeparator>
+- <autoDetectFonts>true</autoDetectFonts>
+- </options>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+--
+1.7.3.4
+
diff --git a/0003-Replace-jboss-logger-with-jdk-logger.patch b/0003-Replace-jboss-logger-with-jdk-logger.patch
new file mode 100644
index 0000000..8922699
--- /dev/null
+++ b/0003-Replace-jboss-logger-with-jdk-logger.patch
@@ -0,0 +1,33 @@
+From 06b89af693f824af86a3103505bb7f93128c22a2 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Thu, 13 Jan 2011 15:02:01 +0100
+Subject: [PATCH 3/3] Replace jboss logger with jdk logger
+
+---
+ .../microcontainer/NettyLoggerConfigurator.java | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java b/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
+index 2ccc731..eca8a6a 100644
+--- a/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
++++ b/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
+@@ -16,7 +16,7 @@
+ package org.jboss.netty.container.microcontainer;
+
+ import org.jboss.netty.logging.InternalLoggerFactory;
+-import org.jboss.netty.logging.JBossLoggerFactory;
++import org.jboss.netty.logging.JdkLoggerFactory;
+
+ /**
+ * A bean that configures the default {@link InternalLoggerFactory}.
+@@ -27,6 +27,6 @@ import org.jboss.netty.logging.JBossLoggerFactory;
+ */
+ public class NettyLoggerConfigurator {
+ public NettyLoggerConfigurator() {
+- InternalLoggerFactory.setDefaultFactory(new JBossLoggerFactory());
++ InternalLoggerFactory.setDefaultFactory(new JdkLoggerFactory());
+ }
+ }
+--
+1.7.3.4
+
diff --git a/netty.spec b/netty.spec
new file mode 100644
index 0000000..aa675b7
--- /dev/null
+++ b/netty.spec
@@ -0,0 +1,136 @@
+
+Name: netty
+Version: 3.2.3
+Release: 2%{?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...
+
+Patch0: 0001-Remove-parent-and-fix-javadoc-plugin-config.patch
+Patch1: 0002-Remove-optional-deps.patch
+Patch2: 0003-Replace-jboss-logger-with-jdk-logger.patch
+
+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-eclipse-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-release-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-plugin-bundle
+BuildRequires: buildnumber-maven-plugin
+BuildRequires: ant-contrib
+BuildRequires: subversion
+BuildRequires: protobuf-java
+BuildRequires: felix-osgi-compendium
+
+
+Requires: java
+Requires: protobuf-java
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+
+%description
+
+
+Netty is a NIO client server framework which enables quick and easy
+development of network applications such as protocol servers and
+clients. It greatly simplifies and streamlines network programming
+such as TCP and UDP socket server.
+
+'Quick and easy' doesn't mean that a resulting application will suffer
+from a maintainability or a performance issue. Netty has been designed
+carefully with the experiences earned from the implementation of a lot
+of protocols such as FTP, SMTP, HTTP, and various binary and
+text-based legacy protocols. As a result, Netty has succeeded to find
+a way to achieve ease of development, performance, stability, and
+flexibility without a compromise.
+
+
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{name}-%{version}.Final
+
+# just to be sure, but not used anyway
+rm -rf jar/
+
+
+%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
+
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+# skipping tests because we don't have all dependencies in Fedora
+mvn-local \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven.test.skip=true \
+ install javadoc:javadoc
+
+
+%install
+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/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
+
+%add_to_maven_depmap org.jboss.netty netty %{version} JPP %{name}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt
+%{_javadir}/*.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt
+%{_javadocdir}/%{name}
+
+
+
+%changelog
+* Mon Jan 17 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.2.3-2
+- Use maven 3 to build
+- Drop ant-contrib depmap (no longer needed)
+
+* Thu Jan 13 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.2.3-1
+- Initial version of the package
+
diff --git a/sources b/sources
index e69de29..01fcf79 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+000441ea4a805fc9f3abe3aa1e93c85f netty-3.2.3.Final-dist.tar.bz2
13 years, 3 months