[java-sig-commits] [maven-doxia] Update to 1.1.4
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Dec 23 13:55:16 UTC 2010
commit 6c7638049c932b328c46529fd877732f0b9302d4
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu Dec 23 14:43:29 2010 +0100
Update to 1.1.4
- Cleanup/rename patches a bit
...tch => 0001-Use-plexus-component-metadata.patch | 20 +++---
...a-core-remove-plexus-component-annotation.patch | 6 +-
...a-remove-clirr.patch => 0003-remove-clirr.patch | 14 ++--
0004-Comment-out-assert.patch | 53 ++++++++++++++
0005-Fix-itext-dependency.patch | 75 ++++++++++++++++++++
0006-Fix-modello-dependency.patch | 63 ++++++++++++++++
maven-doxia-assert.patch | 36 ---------
maven-doxia-itext2.patch | 58 ---------------
maven-doxia-modello-1.0.patch | 46 ------------
maven-doxia.spec | 37 ++++++----
10 files changed, 232 insertions(+), 176 deletions(-)
---
diff --git a/maven-doxia-Use-plexus-component-metadata.patch b/0001-Use-plexus-component-metadata.patch
similarity index 93%
rename from maven-doxia-Use-plexus-component-metadata.patch
rename to 0001-Use-plexus-component-metadata.patch
index caf3b52..a1da8fe 100644
--- a/maven-doxia-Use-plexus-component-metadata.patch
+++ b/0001-Use-plexus-component-metadata.patch
@@ -1,7 +1,7 @@
-From 38468ab042faad8a454c3510a558e50357cd5458 Mon Sep 17 00:00:00 2001
+From 282ccc75cda78178ce1a46c95b5bc42f02ecd32f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Tue, 7 Sep 2010 14:47:48 +0200
-Subject: [PATCH 1/3] Use plexus-component-metadata
+Date: Fri, 17 Dec 2010 14:08:04 +0100
+Subject: [PATCH 1/6] Use plexus-component-metadata
---
doxia-modules/doxia-module-apt/pom.xml | 8 ++++----
@@ -11,7 +11,7 @@ Subject: [PATCH 1/3] Use plexus-component-metadata
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
-index e2c3a20..4b1d7fd 100644
+index 010c559..fe60818 100644
--- a/doxia-modules/doxia-module-apt/pom.xml
+++ b/doxia-modules/doxia-module-apt/pom.xml
@@ -49,21 +49,21 @@ under the License.
@@ -42,7 +42,7 @@ index e2c3a20..4b1d7fd 100644
\ No newline at end of file
+</project>
diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml
-index cd54c74..920658b 100644
+index 64f671a..3395e86 100644
--- a/doxia-modules/doxia-module-docbook-simple/pom.xml
+++ b/doxia-modules/doxia-module-docbook-simple/pom.xml
@@ -45,17 +45,17 @@ under the License.
@@ -67,7 +67,7 @@ index cd54c74..920658b 100644
</execution>
</executions>
diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
-index b14bb65..d4048b3 100644
+index 2afafe8..7a5420a 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
@@ -77,17 +77,17 @@ under the License.
@@ -92,11 +92,11 @@ index b14bb65..d4048b3 100644
</execution>
</executions>
diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
-index fbf6a14..af4fbc9 100644
+index f393ef8..83a6ec6 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
-@@ -58,17 +58,17 @@ under the License.
- <plugins>
+@@ -68,17 +68,17 @@ under the License.
+ </plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
@@ -117,5 +117,5 @@ index fbf6a14..af4fbc9 100644
</execution>
</executions>
--
-1.7.2.2
+1.7.3.3
diff --git a/maven-doxia-core-remove-plexus-component-annotation.patch b/0002-doxia-core-remove-plexus-component-annotation.patch
similarity index 86%
rename from maven-doxia-core-remove-plexus-component-annotation.patch
rename to 0002-doxia-core-remove-plexus-component-annotation.patch
index 7afdde7..0c05248 100644
--- a/maven-doxia-core-remove-plexus-component-annotation.patch
+++ b/0002-doxia-core-remove-plexus-component-annotation.patch
@@ -1,7 +1,7 @@
-From 1d542d1218f63c07c4972cbed4ec52c61ca9f659 Mon Sep 17 00:00:00 2001
+From 0cfa19a33cb162271576e31feb115f39e4909eb1 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 7 Sep 2010 17:03:29 +0200
-Subject: [PATCH 2/3] doxia-core remove plexus component annotation
+Subject: [PATCH 2/6] doxia-core remove plexus component annotation
Abstract class can't be plexus component
---
@@ -21,5 +21,5 @@ index 11419c1..4543a0c 100644
public abstract class AbstractParser
implements Parser
--
-1.7.2.3
+1.7.3.3
diff --git a/maven-doxia-remove-clirr.patch b/0003-remove-clirr.patch
similarity index 91%
rename from maven-doxia-remove-clirr.patch
rename to 0003-remove-clirr.patch
index 9632f42..d69d2bc 100644
--- a/maven-doxia-remove-clirr.patch
+++ b/0003-remove-clirr.patch
@@ -1,7 +1,7 @@
-From 3e274e90a9b179454bbad6d94cd22d08f73887dd Mon Sep 17 00:00:00 2001
+From ab09a2ad8999781e4b9173972d9a85261376e258 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 7 Sep 2010 17:22:48 +0200
-Subject: [PATCH 3/3] remove clirr
+Subject: [PATCH 3/6] remove clirr
---
doxia-maven-plugin/pom.xml | 13 -------------
@@ -9,7 +9,7 @@ Subject: [PATCH 3/3] remove clirr
2 files changed, 0 insertions(+), 37 deletions(-)
diff --git a/doxia-maven-plugin/pom.xml b/doxia-maven-plugin/pom.xml
-index 9239463..26e6017 100644
+index 9eca795..96ca69f 100644
--- a/doxia-maven-plugin/pom.xml
+++ b/doxia-maven-plugin/pom.xml
@@ -159,19 +159,6 @@ under the License.
@@ -33,7 +33,7 @@ index 9239463..26e6017 100644
<artifactId>maven-plugin-plugin</artifactId>
<executions>
diff --git a/pom.xml b/pom.xml
-index 748e087..7c2ac8b 100644
+index 5f9dee3..4d0e574 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,14 +285,6 @@ under the License.
@@ -51,7 +51,7 @@ index 748e087..7c2ac8b 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.2</version>
-@@ -331,18 +323,6 @@ under the License.
+@@ -337,18 +329,6 @@ under the License.
</execution>
</executions>
</plugin>
@@ -70,7 +70,7 @@ index 748e087..7c2ac8b 100644
</plugins>
</build>
-@@ -412,10 +392,6 @@ under the License.
+@@ -418,10 +398,6 @@ under the License.
<configLocation>http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/src/main/resources/config/doxia_checkstyle.xml</configLocation>
</configuration>
</plugin>
@@ -82,5 +82,5 @@ index 748e087..7c2ac8b 100644
</reporting>
</profile>
--
-1.7.2.2
+1.7.3.3
diff --git a/0004-Comment-out-assert.patch b/0004-Comment-out-assert.patch
new file mode 100644
index 0000000..21924ea
--- /dev/null
+++ b/0004-Comment-out-assert.patch
@@ -0,0 +1,53 @@
+From 57c35f6e6999d86bdde2dd25842e12f0c8772e80 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Fri, 17 Dec 2010 14:09:58 +0100
+Subject: [PATCH 4/6] Comment out assert
+
+---
+ .../confluence/parser/table/TableBlockParser.java | 2 +-
+ .../twiki/parser/GenericListBlockParser.java | 2 +-
+ .../module/twiki/parser/TableBlockParser.java | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
+index 5079195..631cca7 100644
+--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
++++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
+@@ -138,7 +138,7 @@ public class TableBlockParser
+
+ while ( ( l = source.getNextLine() ) != null && accept( l, source ) );
+
+- assert rows.size() >= 1;
++ // assert rows.size() >= 1;
+
+ return new TableBlock( rows );
+ }
+diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
+index eb4a716..8809439 100644
+--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
++++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
+@@ -97,7 +97,7 @@ public class GenericListBlockParser
+ {
+ final int numberOfSpaces = 3;
+ final int textGroup = 3;
+- assert m.group( 1 ).length() % numberOfSpaces == 0;
++ // assert m.group( 1 ).length() % numberOfSpaces == 0;
+ final int level = m.group( 1 ).length() / numberOfSpaces;
+ treeListBuilder.feedEntry( TYPES[i], level, m.group( textGroup ).trim() );
+ break;
+diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
+index a83e755..d6afe15 100644
+--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
++++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
+@@ -93,7 +93,7 @@ public class TableBlockParser
+ }
+ while ( ( l = source.getNextLine() ) != null && accept( l ) );
+
+- assert rows.size() >= 1;
++ // assert rows.size() >= 1;
+
+ return new TableBlock( (Block[]) rows.toArray( new Block[] {} ) );
+ }
+--
+1.7.3.3
+
diff --git a/0005-Fix-itext-dependency.patch b/0005-Fix-itext-dependency.patch
new file mode 100644
index 0000000..ee1cf80
--- /dev/null
+++ b/0005-Fix-itext-dependency.patch
@@ -0,0 +1,75 @@
+From 6758dce3b179b1c19b3ebfbab166f11cd1f1e655 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Fri, 17 Dec 2010 14:11:12 +0100
+Subject: [PATCH 5/6] Fix itext dependency
+
+---
+ .../apache/maven/doxia/module/itext/ITextFont.java | 6 +++---
+ .../apache/maven/doxia/module/itext/ITextSink.java | 6 +++---
+ .../apache/maven/doxia/module/itext/ITextUtil.java | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+index 329b407..2f2621a 100644
+--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
++++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+@@ -262,7 +262,7 @@ public class ITextFont
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getBlue() );
++ return String.valueOf( font.getColor().getBlue() );
+ }
+
+ /**
+@@ -274,7 +274,7 @@ public class ITextFont
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getGreen() );
++ return String.valueOf( font.getColor().getGreen() );
+ }
+
+ /**
+@@ -286,7 +286,7 @@ public class ITextFont
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getRed() );
++ return String.valueOf( font.getColor().getRed() );
+ }
+
+ /**
+diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+index 1824dbb..4cdcf22 100644
+--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
++++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+@@ -1239,9 +1239,9 @@ public class ITextSink
+ try
+ {
+ Image image = Image.getInstance( new URL( urlName ) );
+- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
+- width = image.plainWidth();
+- height = image.plainHeight();
++ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
++ width = image.getPlainWidth();
++ height = image.getPlainHeight();
+ }
+ catch ( BadElementException e )
+ {
+diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+index 4363413..75a106f 100644
+--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
++++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+@@ -77,7 +77,7 @@ public class ITextUtil
+ if ( currentField.getType().equals( Rectangle.class ) )
+ {
+ Rectangle fPageSize = (Rectangle) currentField.get( null );
+- if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) )
++ if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) )
+ {
+ return currentField.getName();
+ }
+--
+1.7.3.3
+
diff --git a/0006-Fix-modello-dependency.patch b/0006-Fix-modello-dependency.patch
new file mode 100644
index 0000000..ee216f0
--- /dev/null
+++ b/0006-Fix-modello-dependency.patch
@@ -0,0 +1,63 @@
+From 2aea4dedd068509f0a0fced9649a7841d57d8db9 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Fri, 17 Dec 2010 14:11:50 +0100
+Subject: [PATCH 6/6] Fix modello dependency
+
+---
+ doxia-book/pom.xml | 4 +---
+ doxia-core/pom.xml | 2 --
+ doxia-modules/doxia-module-fml/pom.xml | 2 --
+ 3 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/doxia-book/pom.xml b/doxia-book/pom.xml
+index 4e9ea7a..ff6f79d 100644
+--- a/doxia-book/pom.xml
++++ b/doxia-book/pom.xml
+@@ -100,9 +100,7 @@ under the License.
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <configuration>
+- <models>
+ <model>src/main/modello/book.mdo</model>
+- </models>
+ <version>1.0.0</version>
+ </configuration>
+ <executions>
+@@ -148,4 +146,4 @@ under the License.
+ </reporting>
+ </profile>
+ </profiles>
+-</project>
+\ No newline at end of file
++</project>
+diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
+index 9a5f5c3..1d828a1 100644
+--- a/doxia-core/pom.xml
++++ b/doxia-core/pom.xml
+@@ -107,9 +107,7 @@ under the License.
+ </executions>
+ <configuration>
+ <version>1.0.1</version>
+- <models>
+ <model>src/main/mdo/document.mdo</model>
+- </models>
+ </configuration>
+ </plugin>
+ </plugins>
+diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
+index 7a5420a..a918162 100644
+--- a/doxia-modules/doxia-module-fml/pom.xml
++++ b/doxia-modules/doxia-module-fml/pom.xml
+@@ -67,9 +67,7 @@ under the License.
+ <goal>java</goal>
+ </goals>
+ <configuration>
+- <models>
+ <model>src/main/mdo/fml.mdo</model>
+- </models>
+ <version>1.0.0</version>
+ </configuration>
+ </execution>
+--
+1.7.3.3
+
diff --git a/maven-doxia.spec b/maven-doxia.spec
index 113a85c..7a7b882 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -29,35 +29,35 @@
#
Name: maven-doxia
-Version: 1.1.3
-Release: 2%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
Group: Development/Libraries
URL: http://maven.apache.org/doxia/
-# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.3 maven-doxia-1.1.3
-# tar czf maven-doxia-1.1.3.tar.gz maven-doxia-1.1.3/
+# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.4 maven-doxia-1.1.4
+# tar czf maven-doxia-1.1.4.tar.gz maven-doxia-1.1.4/
Source0: %{name}-%{version}.tar.gz
# Point it at the correct plexus-container-default
Source1: %{name}-depmap.xml
-# Build against iText 2.x
-# http://jira.codehaus.org/browse/DOXIA-53
-Patch0: %{name}-itext2.patch
-Patch1: %{name}-remove-clirr.patch
# TODO: push upstream
-Patch2: %{name}-Use-plexus-component-metadata.patch
-
-Patch3: %{name}-assert.patch
-
+Patch0: 0001-Use-plexus-component-metadata.patch
# TODO: push upstream
# abstract class should not be annotated as component because maven
# will pick it up and try to instantiate
-Patch5: %{name}-core-remove-plexus-component-annotation.patch
+Patch1: 0002-doxia-core-remove-plexus-component-annotation.patch
+
+Patch2: 0003-remove-clirr.patch
+Patch3: 0004-Comment-out-assert.patch
+# Build against iText 2.x
+# http://jira.codehaus.org/browse/DOXIA-53
+Patch4: 0005-Fix-itext-dependency.patch
+
BuildArch: noarch
@@ -101,11 +101,13 @@ BuildRequires: fop
BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-containers-component-javadoc
BuildRequires: plexus-containers-container-default
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-project
Requires: classworlds
Requires: apache-commons-collections
Requires: apache-commons-logging
-Requires: jakarta-commons-validator
+Requires: apache-commons-validator
Requires: junit
Requires: oro
Requires: plexus-container-default
@@ -114,6 +116,8 @@ Requires: plexus-utils >= 1.5.7
Requires: plexus-velocity
Requires: velocity
Requires: fop
+Requires: httpcomponents-client
+Requires: httpcomponents-project
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -140,7 +144,7 @@ API documentation for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch5 -p1
+%patch4 -p1
#rm -fr doxia-maven-plugin
@@ -223,7 +227,8 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
-* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.1.3-2
+* Thu Dec 23 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.1.4-1
+- Update to 1.1.4
- Migrate from tomca5 to tomca6
- Versionless jars and javadocs
- Remove old skip-plugin patch
More information about the java-sig-commits
mailing list