[uimaj] 04/04: Added jcasgen-maven-plugin to libuima-tools-java
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 20 22:13:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository uimaj.
commit 27d333d4ee4136aaab05ab2b426b85f41b2e4c64
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Mar 20 23:12:24 2014 +0100
Added jcasgen-maven-plugin to libuima-tools-java
---
debian/changelog | 1 +
debian/control | 1 +
debian/libuima-core-java.poms | 1 +
debian/maven.ignoreRules | 1 +
debian/patches/disable-integration-tests.diff | 44 ++++++++++++++++++++++++++
debian/patches/maven-plugin-configuration.diff | 32 +++++++++++++++++++
debian/patches/maven2-compatibility.diff | 25 +++++++++++++++
debian/patches/series | 3 ++
8 files changed, 108 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 454983e..86c9902 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ uimaj (2.4.1-1) UNRELEASED; urgency=low
* New upstream release
- Refreshed the patches
- Removed java7-compat.diff (fixed upstream)
+ - Added the new module jcasgen-maven-plugin to libuima-tools-java
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Standards-Version updated 3.9.5 (no changes)
diff --git a/debian/control b/debian/control
index bc6df92..c015bd5 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends-Indep: ant,
libmaven-javadoc-plugin-java,
libmaven-plugin-tools-java (>= 2.8),
libmaven-site-plugin-java,
+ libplexus-build-api-java (>= 0.0.7),
libsaxon-java,
libxerces2-java,
libxml-commons-resolver1.1-java,
diff --git a/debian/libuima-core-java.poms b/debian/libuima-core-java.poms
index 2f72480..65d1549 100644
--- a/debian/libuima-core-java.poms
+++ b/debian/libuima-core-java.poms
@@ -45,6 +45,7 @@ uimaj-tools/pom.xml --has-package-version --package=libuima-tools-java --java-li
uimaj-bootstrap/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
PearPackagingMavenPlugin/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
+jcasgen-maven-plugin/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=jcasgen-maven-plugin/target/jcasgen-maven-plugin-*.jar
jVinci/pom.xml --has-package-version --package=libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar
uimaj-examples/pom.xml --has-package-version --package=uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 08f7508..28456aa 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -15,5 +15,6 @@
# junit junit jar s/3\\..*/3.x/
org.apache.maven.plugins maven-eclipse-plugin maven-plugin * * *
+org.apache.maven.plugins maven-invoker-plugin * * * *
org.apache.rat apache-rat-plugin maven-plugin * * *
org.apache.geronimo.specs geronimo-activation_1.0.2_spec * * * *
diff --git a/debian/patches/disable-integration-tests.diff b/debian/patches/disable-integration-tests.diff
new file mode 100644
index 0000000..ea7fa34
--- /dev/null
+++ b/debian/patches/disable-integration-tests.diff
@@ -0,0 +1,44 @@
+Description: Disables the integration tests for jcasgen-maven-plugin, they fail
+ to run probably due to an incompatible version of Maven and/or maven-invoker-plugin
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jcasgen-maven-plugin/pom.xml
++++ b/jcasgen-maven-plugin/pom.xml
+@@ -90,37 +90,6 @@
+
+ <plugins>
+ <plugin>
+- <artifactId>maven-invoker-plugin</artifactId>
+- <version>1.7</version>
+- <configuration>
+- <projectsDirectory>src/it</projectsDirectory>
+- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+- <pomIncludes>
+- <pomInclude>*/pom.xml</pomInclude>
+- </pomIncludes>
+- <settingsFile>src/it/settings.xml</settingsFile>
+- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+- <postBuildHookScript>verify.bsh</postBuildHookScript>
+- <goals>
+- <goal>clean</goal>
+- <goal>package</goal>
+- <goal>integration-test</goal>
+- </goals>
+- <!-- change this next line by toggling the "!" character to include / exclude the long-running m2e test
+- It is normally excluded -->
+- <invokerTest>classpath,multimodule,simple,!m2e</invokerTest>
+- </configuration>
+- <executions>
+- <execution>
+- <id>integration-test</id>
+- <goals>
+- <goal>install</goal>
+- <goal>run</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
diff --git a/debian/patches/maven-plugin-configuration.diff b/debian/patches/maven-plugin-configuration.diff
new file mode 100644
index 0000000..99141c5
--- /dev/null
+++ b/debian/patches/maven-plugin-configuration.diff
@@ -0,0 +1,32 @@
+Description: Add the missing maven-plugin-plugin configuration
+ from org.apache.uima:parent-pom which is ignored during the build
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/uimaj-parent/pom.xml
++++ b/uimaj-parent/pom.xml
+@@ -142,5 +142,25 @@
+ </properties>
+
+ <build>
++ <pluginManagement>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-plugin-plugin</artifactId>
++ <configuration>
++ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
++ </configuration>
++ <executions>
++ <execution>
++ <id>default-descriptor</id>
++ <phase>process-classes</phase>
++ <goals>
++ <goal>descriptor</goal>
++ </goals>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </pluginManagement>
+ </build>
+ </project>
diff --git a/debian/patches/maven2-compatibility.diff b/debian/patches/maven2-compatibility.diff
new file mode 100644
index 0000000..897f747
--- /dev/null
+++ b/debian/patches/maven2-compatibility.diff
@@ -0,0 +1,25 @@
+Description: Adjustments to allow Maven 2 to build jcasgen-maven-plugin
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jcasgen-maven-plugin/pom.xml
++++ b/jcasgen-maven-plugin/pom.xml
+@@ -25,7 +25,7 @@
+ <name>Apache UIMA Maven: ${project.artifactId}</name>
+ <description>A Maven Plugin for using JCasGen to generate Java classes from XML type system descriptions</description>
+ <prerequisites>
+- <maven>3.0</maven>
++ <maven>2.2.1</maven>
+ </prerequisites>
+ <parent>
+ <groupId>org.apache.uima</groupId>
+--- a/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
++++ b/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
+@@ -274,7 +274,7 @@
+
+ // map each resource from its target location to its source location
+ Map<File, File> targetToSource = new HashMap<File, File>();
+- for (Resource resource : this.project.getResources()) {
++ for (Resource resource : (List<Resource>) this.project.getResources()) {
+ File resourceDir = new File(resource.getDirectory());
+ if (resourceDir.exists()) {
+
diff --git a/debian/patches/series b/debian/patches/series
index 80119be..145e2f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,6 @@ disable_ecore.diff
#docbook_tool.diff
build-helper-version.diff
disable_internal_javadoc.diff
+maven2-compatibility.diff
+maven-plugin-configuration.diff
+disable-integration-tests.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git
More information about the pkg-java-commits
mailing list