[pkg-java] r12863 - in trunk/uimaj/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Aug 5 14:50:46 UTC 2010
Author: drazzib
Date: 2010-08-05 14:50:39 +0000 (Thu, 05 Aug 2010)
New Revision: 12863
Added:
trunk/uimaj/debian/maven.ignoreRules
Removed:
trunk/uimaj/debian/TODO
trunk/uimaj/debian/libuima-adapter-soap-java.poms
trunk/uimaj/debian/libuima-adapter-vinci-java.poms
trunk/uimaj/debian/libuima-cpe-java.poms
trunk/uimaj/debian/libuima-document-annotation-java.poms
trunk/uimaj/debian/libuima-tools-java.poms
trunk/uimaj/debian/libuima-vinci-java.poms
trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff
trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff
trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff
trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff
trunk/uimaj/debian/uima-examples.poms
Modified:
trunk/uimaj/debian/changelog
trunk/uimaj/debian/control
trunk/uimaj/debian/libuima-core-java.poms
trunk/uimaj/debian/maven.cleanIgnoreRules
trunk/uimaj/debian/patches/series
trunk/uimaj/debian/rules
Log:
* d/control: Fix Homepage URL as UIMA project as been promoted to
Top Level project by ASF.
* d/control: Bump Standards-Version to 3.9.1: no changes needed.
* d/rules: Use mh_clean (do B-D on maven-debian-helper >= 1.1).
* d/rules, d/*.poms: reorganisation of POMs patching. All POMs files
are now declared in d/libuima-core-java.poms (so that patch/unpatch
all together) but installed in each packages manually.
Closes: #591143.
* Drop all patches regarding disabled Maven plugins and handle that in
d/maven.ignoreRules and d/maven.cleanIgnoreRules.
Deleted: trunk/uimaj/debian/TODO
===================================================================
--- trunk/uimaj/debian/TODO 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/TODO 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,3 +0,0 @@
-- Update manpages
-- Install essentials descriptors inside uima-examples
- others inside uima-docs
Modified: trunk/uimaj/debian/changelog
===================================================================
--- trunk/uimaj/debian/changelog 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/changelog 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,3 +1,18 @@
+uimaj (2.3.0-2) unstable; urgency=low
+
+ * d/control: Fix Homepage URL as UIMA project as been promoted to
+ Top Level project by ASF.
+ * d/control: Bump Standards-Version to 3.9.1: no changes needed.
+ * d/rules: Use mh_clean (do B-D on maven-debian-helper >= 1.1).
+ * d/rules, d/*.poms: reorganisation of POMs patching. All POMs files
+ are now declared in d/libuima-core-java.poms (so that patch/unpatch
+ all together) but installed in each packages manually.
+ Closes: #591143.
+ * Drop all patches regarding disabled Maven plugins and handle that in
+ d/maven.ignoreRules and d/maven.cleanIgnoreRules.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 05 Aug 2010 16:32:47 +0200
+
uimaj (2.3.0-1) unstable; urgency=low
* New upstream release.
Modified: trunk/uimaj/debian/control
===================================================================
--- trunk/uimaj/debian/control 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/control 2010-08-05 14:50:39 UTC (rev 12863)
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Fabien Poulard <fabien.poulard at univ-nantes.fr>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, maven-repo-helper (>= 1.0.6),
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.1), maven-repo-helper (>= 1.0.6),
libmaven2-core-java (>> 2.2.1-1), maven2 (>> 2.2.1-2)
Build-Depends-Indep: junit, ant, ant-contrib, libaxis-java, libcommons-io-java, liblog4j1.2-java,
libgeronimo-activation-1.1-spec-java, default-jdk-doc, libmaven-javadoc-plugin-java, libmaven-site-plugin-java,
libxml-commons-resolver1.1-java, libxerces2-java, libjaxp1.3-java,
docbook-xml, docbook-xsl, xsltproc, libsaxon-java, fop
-Standards-Version: 3.8.4
-Homepage: http://incubator.apache.org/uima/
+Standards-Version: 3.9.1
+Homepage: http://uima.apache.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/uimaj/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/uimaj/
Deleted: trunk/uimaj/debian/libuima-adapter-soap-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-adapter-soap-java.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/libuima-adapter-soap-java.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1 +0,0 @@
-uimaj-adapter-soap/pom.xml
Deleted: trunk/uimaj/debian/libuima-adapter-vinci-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-adapter-vinci-java.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/libuima-adapter-vinci-java.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1 +0,0 @@
-uimaj-adapter-vinci/pom.xml
Modified: trunk/uimaj/debian/libuima-core-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-core-java.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/libuima-core-java.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,4 +1,22 @@
-uimaj/pom.xml
+uimaj/pom.xml --no-parent
+
uimaj-core/pom.xml
uimaj-test-util/pom.xml
uimaj-component-test-util/pom.xml
+
+uimaj-adapter-soap/pom.xml --package libuima-adapter-soap-java
+
+uimaj-adapter-vinci/pom.xml --package libuima-adapter-vinci-java
+
+uimaj-cpe/pom.xml --package libuima-cpe-java
+
+uimaj-document-annotation/pom.xml --package libuima-document-annotation-java
+
+uimaj-tools/pom.xml --package libuima-tools-java
+uimaj-bootstrap/pom.xml --package libuima-tools-java
+PearPackagingMavenPlugin/pom.xml --package libuima-tools-java
+
+jVinci/pom.xml --package libuima-vinci-java
+
+uimaj-examples/pom.xml --package uima-examples
+
Deleted: trunk/uimaj/debian/libuima-cpe-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-cpe-java.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/libuima-cpe-java.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1 +0,0 @@
-uimaj-cpe/pom.xml
Deleted: trunk/uimaj/debian/libuima-document-annotation-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-document-annotation-java.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/libuima-document-annotation-java.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1 +0,0 @@
-uimaj-document-annotation/pom.xml
Deleted: trunk/uimaj/debian/libuima-tools-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-tools-java.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/libuima-tools-java.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,3 +0,0 @@
-uimaj-tools/pom.xml
-uimaj-bootstrap/pom.xml
-PearPackagingMavenPlugin/pom.xml
Deleted: trunk/uimaj/debian/libuima-vinci-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-vinci-java.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/libuima-vinci-java.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1 +0,0 @@
-jVinci/pom.xml
Modified: trunk/uimaj/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/uimaj/debian/maven.cleanIgnoreRules 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/maven.cleanIgnoreRules 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,2 +1,3 @@
-org.apache.maven.plugins maven-eclipse-plugin * *
-org.apache.felix maven-bundle-plugin * *
+org.codehaus.mojo buildnumber-maven-plugin maven-plugin *
+org.apache.maven.plugins maven-antrun-plugin maven-plugin *
+
Added: trunk/uimaj/debian/maven.ignoreRules
===================================================================
--- trunk/uimaj/debian/maven.ignoreRules (rev 0)
+++ trunk/uimaj/debian/maven.ignoreRules 2010-08-05 14:50:39 UTC (rev 12863)
@@ -0,0 +1,6 @@
+org.apache.maven.plugins maven-eclipse-plugin maven-plugin *
+org.apache.felix maven-bundle-plugin maven-plugin *
+org.codehaus.mojo buildnumber-maven-plugin maven-plugin *
+org.apache.maven.plugins maven-antrun-plugin maven-plugin *
+org.apache.rat apache-rat-plugin maven-plugin *
+
Deleted: trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff
===================================================================
--- trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,124 +0,0 @@
-Description: Remove maven-antrun-plugin as it is failing
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-03-21
-Forwarded: not-needed
-
---- a/uimaj/pom.xml
-+++ b/uimaj/pom.xml
-@@ -289,7 +289,8 @@
- We copy to the src directory so that it is there for the source jar
- builds (for Maven repo). We also copy to the target/classes/META-INF
- directory so it gets picked up by the binary jar as well.-->
--
-+
-+<!--
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
-@@ -299,21 +300,16 @@
- <phase>process-resources</phase>
- <configuration>
- <tasks>
-- <!-- skip if no src/main/java dir -->
- <condition property="sourceForLicenseNoticeDisclaimer"
-- value="skip"> <!-- value must be a non-existant file name
-- blank doesn't work (copies everything)-->
-- <!--not> <available file="src/main/java"/> </not-->
-+ value="skip">
- <not>
- <equals arg1="jar" arg2="${project.packaging}"></equals>
- </not>
- </condition>
-
-- <!-- only sets property if not set by previous above statement -->
- <property name="sourceForLicenseNoticeDisclaimer"
- value="LICENSE NOTICE DISCLAIMER LICENSE.txt NOTICE.txt DISCLAIMER.txt"/>
-
-- <!-- use LIC/NOT/DIS file from project if available -->
- <condition property="dirSourceForLicenseNoticeDisclaimer"
- value=".">
- <or>
-@@ -322,7 +318,6 @@
- </or>
- </condition>
-
-- <!-- use LIC/NOT/DIS file from project's parent if available & above not available -->
- <condition property="dirSourceForLicenseNoticeDisclaimer"
- value="${project.parent.relativePath}/src/main/readme">
- <or>
-@@ -331,7 +326,6 @@
- </or>
- </condition>
-
-- <!-- use LIC/NOT/DIS file from uimaj-distr project if above not available -->
- <condition property="dirSourceForLicenseNoticeDisclaimer"
- value="../uimaj-distr/src/main/readme">
- <or>
-@@ -341,12 +335,6 @@
- </condition>
-
-
-- <!-- support POMs nested one deep -->
-- <!--available property="dirSourceForLicenseNoticeDisclaimer"
-- file="../uimaj-distr/src/main/readme"
-- value="../uimaj-distr/src/main/readme"/-->
--
-- <!-- only sets property if not set by previous statements -->
- <property name="dirSourceForLicenseNoticeDisclaimer"
- value="../../uimaj-distr/src/main/readme"/>
-
-@@ -364,8 +352,6 @@
- <goal>run</goal>
- </goals>
- </execution>
-- <!-- after compilation has been done and the files have been copied to the
-- target directory, delete them from the source directory. -->
- <execution>
- <id>DeleteLicenseNoticeDisclaimer</id>
- <phase>package</phase>
-@@ -373,7 +359,7 @@
- <tasks>
- <typedef resource="net/sf/antcontrib/antlib.xml">
- <classpath refid="maven.dependency.classpath"/>
-- </typedef> <!-- set up ant-contrib extensions -->
-+ </typedef>
-
- <delete deleteOnExit="true" quiet="true" failOnError="false">
- <fileset dir="src/main/resources/META-INF"
-@@ -384,10 +370,6 @@
- <attribute name="dir"/>
- <attribute name="dirId"/>
- <sequential>
-- <!-- defaultexcludes set to no to retain dirs which were checked into svn
-- they have .svn files
-- If these are deleted by this script, svn can't find the svn metadata
-- -->
- <fileset id="@{dirId}" dir="@{dir}" defaultexcludes="no"/>
- <if>
- <and>
-@@ -410,7 +392,6 @@
- <goal>run</goal>
- </goals>
- </execution>
-- <!-- also delete on clean. -->
- <execution>
- <id>CleanLicenseNoticeDisclaimer</id>
- <phase>clean</phase>
-@@ -418,7 +399,7 @@
- <tasks>
- <typedef resource="net/sf/antcontrib/antlib.xml">
- <classpath refid="maven.dependency.classpath"/>
-- </typedef> <!-- set up ant-contrib extensions -->
-+ </typedef>
-
- <delete deleteOnExit="true" quiet="true" failOnError="false">
- <fileset dir="src/main/resources/META-INF"
-@@ -452,6 +433,8 @@
- </execution>
- </executions>
- </plugin>
-+-->
-+
-
- <!-- something to get the timestamp -->
- <!-- this plugin sets the output string into the variable buildNumber -->
Deleted: trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff
===================================================================
--- trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,23 +0,0 @@
-Description: Remove maven-buildnumber-plugin as its not yet in Debian
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-03-21
-Forwarded: not-needed
-
---- a/uimaj/pom.xml
-+++ b/uimaj/pom.xml
-@@ -455,6 +455,7 @@
-
- <!-- something to get the timestamp -->
- <!-- this plugin sets the output string into the variable buildNumber -->
-+<!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
-@@ -473,6 +474,7 @@
- </items>
- </configuration>
- </plugin>
-+-->
- </plugins>
- </build>
-
Deleted: trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff
===================================================================
--- trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,275 +0,0 @@
-Description: Remove maven-bundle-plugin (based on felix)
- as its not yet in Debian
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-03-21
-Forwarded: not-needed
---- a/uimaj-ep-configurator/pom.xml
-+++ b/uimaj-ep-configurator/pom.xml
-@@ -207,16 +207,15 @@
-
- <plugins>
-
-+<!--
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
-- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.taeconfigurator,
-@@ -233,34 +232,6 @@
- <Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-
-- <!-- handle split packages in Eclipse.
-- We do this by using Require-Bundle, and excluding from the Import-Package those
-- split packages covered by those bundles - this is required by OSGi.
--
-- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
-- org.eclipse.jface.text and org.eclipse.text.
-- Packages:
-- org.eclipse.jface.text
-- org.eclipse.jface.text.link
-- org.eclipse.jface.text.source
-- org.eclipse.jface.text.templates
-- org.eclipse.ui.texteditor is split between
-- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
-- Packages:
-- org.eclipse.ui.texteditor
-- There are 5 packages in org.eclipse.ui.* that are split between
-- org.eclipse.ui.ide and org.eclipse.ui.workbench.
-- The Notes say not to require org.eclipse.ui.workbench, but instead just require
-- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
-- Packages:
-- org.eclipse.ui
-- org.eclipse.ui.actions
-- org.eclipse.ui.dialogs
-- org.eclipse.ui.model
-- org.eclipse.ui.part
-- org.eclipse.core.runtime has combined apis (that were split in later
-- point releases of 3.x)
-- -->
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
-@@ -288,38 +259,13 @@
- </Import-Package>
-
-
-- <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
-- it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
-- are not visible - this is a static final constant that gets compiled into a number
--
-- Also, we stick a minimum version of 3.1.0 to insure we have that at least
--
-- First import specifies bundle, since package exists in more than 1 bundle
-- -->
-- <!--Import-Package>org.eclipse.jface.text.source;bundle-symbolic-name=org.eclipse.jface.text,
-- org.eclipse.jface.text;bundle-symbolic-name=org.eclipse.jface.text,
-- *,
-- org.eclipse.core.commands.common,
-- org.eclipse.core.runtime.jobs,
-- org.eclipse.core.runtime.content,
-- org.eclipse.swt,
-- org.eclipse.jface.window,
-- org.apache.uima.jcas.jcasgenp,
-- org.eclipse.jdt.launching,
-- org.eclipse.jdt.ui
-- </Import-Package-->
--
-- <!--Import-Package>
-- *,
-- org.eclipse.jdt.launching,
-- org.apache.uima.jcas.jcasgenp</Import-Package-->
--
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- <Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
- </instructions>
- </configuration>
- </plugin>
-+-->
- </plugins>
- </build>
- </project>
---- a/uimaj-ep-cas-editor/pom.xml
-+++ b/uimaj-ep-cas-editor/pom.xml
-@@ -153,10 +153,10 @@
- </resources>
-
- <plugins>
-+<!--
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-- <!-- version 1.4.0 to support _nouses instruction -->
- <version>2.0.0</version>
- <extensions>true</extensions>
- <configuration>
-@@ -197,6 +197,7 @@
- </instructions>
- </configuration>
- </plugin>
-+-->
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
---- a/uimaj-ep-debug/pom.xml
-+++ b/uimaj-ep-debug/pom.xml
-@@ -96,17 +96,15 @@
- <plugins>
-
-
--
-+<!--
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
-- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.ep_debug
-@@ -123,7 +121,7 @@
- </instructions>
- </configuration>
- </plugin>
--
-+-->
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
---- a/uimaj-ep-pear-packager/pom.xml
-+++ b/uimaj-ep-pear-packager/pom.xml
-@@ -114,17 +114,16 @@
-
- <finalName>org.apache.uima.pear_${uimaj-release-eclipse-version}</finalName>
-
-+<!--
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
-- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.pear,
-@@ -135,34 +134,6 @@
- org.apache.uima.pear.nature
- </Export-Package>
-
-- <!-- handle split packages in Eclipse.
-- We do this by using Require-Bundle, and excluding from the Import-Package those
-- split packages covered by those bundles - this is required by OSGi.
--
-- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
-- org.eclipse.jface.text and org.eclipse.text.
-- Packages:
-- org.eclipse.jface.text
-- org.eclipse.jface.text.link
-- org.eclipse.jface.text.source
-- org.eclipse.jface.text.templates
-- org.eclipse.ui.texteditor is split between
-- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
-- Packages:
-- org.eclipse.ui.texteditor
-- There are 5 packages in org.eclipse.ui.* that are split between
-- org.eclipse.ui.ide and org.eclipse.ui.workbench.
-- The Notes say not to require org.eclipse.ui.workbench, but instead just require
-- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
-- Packages:
-- org.eclipse.ui
-- org.eclipse.ui.actions
-- org.eclipse.ui.dialogs
-- org.eclipse.ui.model
-- org.eclipse.ui.part
-- org.eclipse.core.runtime has combined apis (that were split in later
-- point releases of 3.x)
-- -->
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
-@@ -201,6 +172,7 @@
- </instructions>
- </configuration>
- </plugin>
-+-->
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
---- a/uimaj-ep-runtime/pom.xml
-+++ b/uimaj-ep-runtime/pom.xml
-@@ -105,21 +105,16 @@
- <finalName>org.apache.uima.runtime_${uimaj-release-eclipse-version}</finalName>
-
- <plugins>
-+<!--
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
-- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
-- <!-- export contents because we don't want the actual
-- java code included (although we could... as an
-- alternative to the jars - but might have a
-- versioning / control issue -->
- <_exportcontents>
- org.apache.uima,
- org.apache.uima.adapter.vinci,
-@@ -206,19 +201,10 @@
- org.apache.vinci.transport.vns.service
- </_exportcontents>
-
-- <!-- excluded packages:
-- org.apache.uima.adapter.soap,
-- org.apache.uima.adapter.soap.axis11,
-- -->
- <Import-Package>org.apache.log4j;resolution:=optional,*
- </Import-Package>
-- <!-- causes the other Jars from the maven
-- dependencies, at the proper version, to be
-- included in this, and also sets up the bundle
-- classpath to include them -->
- <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
-
-- <!-- These just get made into the corresponding manifest entries -->
- <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
-@@ -226,6 +212,7 @@
- </instructions>
- </configuration>
- </plugin>
-+-->
- </plugins>
- </build>
- </project>
Deleted: trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff
===================================================================
--- trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,65 +0,0 @@
-Description: Remove maven-rat-plugin as its not yet in Debian
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-03-21
-Forwarded: not-needed
---- a/uimaj-distr/pom.xml
-+++ b/uimaj-distr/pom.xml
-@@ -168,6 +168,7 @@
-
- <!-- Release Audit Tool checks -->
- <!-- run Release Audit Tool (RAT) on src and bin distrs -->
-+<!--
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
-@@ -176,16 +177,16 @@
- <id>rat-check-src</id>
- <configuration>
- <excludes>
-- <exclude>uima-docbooks/README.USER.txt</exclude> <!-- readme -->
-- <exclude>uima-docbooks/src/olink/**</exclude> <!-- generated cross ref database for Apache FOP -->
-- <exclude>uimaj-core/src/test/resources/**</exclude> <!-- test data -->
-- <exclude>uimaj-ep-cas-editor/src/test/resources/ManualTests/**</exclude> <!-- test data -->
-- <exclude>uimaj-examples/src/main/data/**</exclude> <!-- sample data -->
-- <exclude>uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</exclude> <!-- readme -->
-- <exclude>uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude> <!-- sample data -->
-- <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/migration/*.txt</exclude> <!-- system data file -->
-- <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt</exclude> <!-- about file -->
-- <exclude>uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear</exclude> <!-- test binary file -->
-+ <exclude>uima-docbooks/README.USER.txt</exclude>
-+ <exclude>uima-docbooks/src/olink/**</exclude>
-+ <exclude>uimaj-core/src/test/resources/**</exclude>
-+ <exclude>uimaj-ep-cas-editor/src/test/resources/ManualTests/**</exclude>
-+ <exclude>uimaj-examples/src/main/data/**</exclude>
-+ <exclude>uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</exclude>
-+ <exclude>uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude>
-+ <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/migration/*.txt</exclude>
-+ <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt</exclude>
-+ <exclude>uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear</exclude>
- </excludes>
- </configuration>
- </execution>
-@@ -193,16 +194,16 @@
- <id>rat-check-bin</id>
- <configuration>
- <excludes>
-- <exclude>docs/api/**</exclude> <!-- javadocs-->
-- <exclude>docs/html/images/*.svg</exclude> <!-- generated .svg image files -->
-- <exclude>examples/data/**</exclude> <!-- sample data -->
-- <exclude>examples/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude> <!--sample param file -->
-+ <exclude>docs/api/**</exclude>
-+ <exclude>docs/html/images/*.svg</exclude>
-+ <exclude>examples/data/**</exclude>
-+ <exclude>examples/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
--
-+-->
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
Modified: trunk/uimaj/debian/patches/series
===================================================================
--- trunk/uimaj/debian/patches/series 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/patches/series 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1,8 +1,4 @@
modules.diff
script.diff
-maven_bundle_plugin_disable.diff
-maven_rat_plugin_disable.diff
-maven_buildnumber_plugin_disable.diff
-maven_antrun_plugin_disable.diff
disable_ecore.diff
docbook_tool.diff
Modified: trunk/uimaj/debian/rules
===================================================================
--- trunk/uimaj/debian/rules 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/rules 2010-08-05 14:50:39 UTC (rev 12863)
@@ -3,11 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/maven.mk
-# Debug Build
-#export DH_VERBOSE = 1
-#JAVA_OPTS += -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#DEB_MAVEN_ARGS += -e -X
-
VERSION := $(DEB_UPSTREAM_VERSION)-incubating
# Use uimaj/pom.xml for build
@@ -21,35 +16,18 @@
DEB_MAVEN_DOC_TARGET = javadoc:aggregate
# Disable auto-install because we use multiple packages
DEB_MAVEN_INSTALL_TARGET =
-# Args for our custom mh_patchpoms calls
-MY_PATCHPOM_ARGS := --debian-build --keep-pom-version --maven-repo=$(DEB_MAVEN_REPO) $(DEB_PATCHPOMS_ARGS)
# Manpages generation
DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
XP=xsltproc -''-nonet
-UIMA_MANPAGES := annotationViewer.1 documentAnalyzer.1 cpeGui.1 jcasgen.1 runCPE.1 runAE.1 runPearInstaller.1 runPearInstaller.1 runPearMerger.1 runPearPackager.1 validateDescriptor.1
+UIMA_MANPAGES := annotationViewer.1 documentAnalyzer.1 cpeGui.1 jcasgen.1 runAE.1 runPearInstaller.1 runPearInstaller.1 runPearMerger.1 runPearPackager.1 validateDescriptor.1
get-orig-source:
uscan --force-download --rename
-post-patches::
- # libuima-core-java is patched by maven.mk
- mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-vinci-java
- mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-adapter-soap-java
- mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-adapter-vinci-java
- mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-cpe-java
- mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-document-annotation-java
- mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-tools-java
-
clean::
-rm debian/uimaj-doc-stamp
- mh_unpatchpoms -plibuima-vinci-java
- mh_unpatchpoms -plibuima-adapter-soap-java
- mh_unpatchpoms -plibuima-adapter-vinci-java
- mh_unpatchpoms -plibuima-cpe-java
- mh_unpatchpoms -plibuima-document-annotation-java
- mh_unpatchpoms -plibuima-tools-java
- -rm -rf debian/tmp
+ mh_clean
-rm $(UIMA_MANPAGES)
build/uima-doc:: debian/uimaj-doc-stamp
@@ -59,39 +37,44 @@
touch debian/uimaj-doc-stamp
binary-install/libuima-vinci-java::
- mh_installpoms -plibuima-vinci-java -e$(VERSION)
+ mh_installpom -plibuima-vinci-java -e$(VERSION) jVinci/pom.xml
mh_installjar -plibuima-vinci-java -e$(VERSION) -l jVinci/pom.xml jVinci/target/jVinci.jar
binary-install/libuima-adapter-soap-java::
- mh_installpoms -plibuima-adapter-soap-java -e$(VERSION)
+ mh_installpom -plibuima-adapter-soap-java -e$(VERSION) uimaj-adapter-soap/pom.xml
mh_installjar -plibuima-adapter-soap-java -e$(VERSION) -l uimaj-adapter-soap/pom.xml uimaj-adapter-soap/target/uima-adapter-soap.jar
binary-install/libuima-adapter-vinci-java::
- mh_installpoms -plibuima-adapter-vinci-java -e$(VERSION)
+ mh_installpom -plibuima-adapter-vinci-java -e$(VERSION) uimaj-adapter-vinci/pom.xml
mh_installjar -plibuima-adapter-vinci-java -e$(VERSION) -l uimaj-adapter-vinci/pom.xml uimaj-adapter-vinci/target/uima-adapter-vinci.jar
binary-install/libuima-core-java::
- mh_installpoms -plibuima-core-java -e$(VERSION)
+ mh_installpom -plibuima-core-java -e$(VERSION) uimaj/pom.xml
+ mh_installpom -plibuima-core-java -e$(VERSION) uimaj-core/pom.xml
+ mh_installpom -plibuima-core-java -e$(VERSION) uimaj-test-util/pom.xml
+ mh_installpom -plibuima-core-java -e$(VERSION) uimaj-component-test-util/pom.xml
mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-core/pom.xml uimaj-core/target/uima-core.jar
mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-test-util/pom.xml uimaj-test-util/target/uimaj-test-util-$(VERSION).jar
mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-component-test-util/pom.xml uimaj-component-test-util/target/uimaj-component-test-util-$(VERSION).jar
binary-install/libuima-cpe-java::
- mh_installpoms -plibuima-cpe-java -e$(VERSION)
+ mh_installpom -plibuima-cpe-java -e$(VERSION) uimaj-cpe/pom.xml
mh_installjar -plibuima-cpe-java -e$(VERSION) -l uimaj-cpe/pom.xml uimaj-cpe/target/uima-cpe.jar
binary-install/libuima-document-annotation-java::
- mh_installpoms -plibuima-document-annotation-java -e$(VERSION)
+ mh_installpom -plibuima-document-annotation-java -e$(VERSION) uimaj-document-annotation/pom.xml
mh_installjar -plibuima-document-annotation-java -e$(VERSION) -l uimaj-document-annotation/pom.xml uimaj-document-annotation/target/uima-document-annotation.jar
binary-install/libuima-tools-java::
- mh_installpoms -plibuima-tools-java -e$(VERSION)
+ mh_installpom -plibuima-tools-java -e$(VERSION) uimaj-tools/pom.xml
+ mh_installpom -plibuima-tools-java -e$(VERSION) uimaj-bootstrap/pom.xml
+ mh_installpom -plibuima-tools-java -e$(VERSION) PearPackagingMavenPlugin/pom.xml
mh_installjar -plibuima-tools-java -e$(VERSION) -l uimaj-tools/pom.xml uimaj-tools/target/uima-tools.jar
mh_installjar -plibuima-tools-java -e$(VERSION) -l uimaj-bootstrap/pom.xml uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
mh_installjar -plibuima-tools-java -e$(VERSION) -l PearPackagingMavenPlugin/pom.xml PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
binary-install/uima-examples::
- mh_installpoms -puima-examples -e$(VERSION)
+ mh_installpom -puima-examples -e$(VERSION) uimaj-examples/pom.xml
mh_installjar -puima-examples -e$(VERSION) -l uimaj-examples/pom.xml uimaj-examples/target/uima-examples.jar
binary-install/uima-utils::
Deleted: trunk/uimaj/debian/uima-examples.poms
===================================================================
--- trunk/uimaj/debian/uima-examples.poms 2010-08-04 17:18:15 UTC (rev 12862)
+++ trunk/uimaj/debian/uima-examples.poms 2010-08-05 14:50:39 UTC (rev 12863)
@@ -1 +0,0 @@
-uimaj-examples/pom.xml
More information about the pkg-java-commits
mailing list