[openjpa] 03/03: wip
Miguel Landaeta
nomadium-guest at alioth.debian.org
Sun Oct 6 23:44:36 UTC 2013
This is an automated email from the git hooks/post-receive script.
nomadium-guest pushed a commit to branch master
in repository openjpa.
commit 29bb58a51dbce00e93caf0de51f80ca992c28332
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Sun Sep 1 18:09:12 2013 -0300
wip
---
debian/control | 8 +-
debian/libopenjpa-java.poms | 38 +++++-----
debian/maven.ignoreRules | 12 ++-
debian/maven.properties | 2 +
debian/maven.rules | 5 +-
debian/patches/hsql-upstream-fix-2390-2391.diff | 79 +++++++++++++++++++
debian/patches/series | 16 +++-
debian/patches/stuff.diff | 45 +++++++++++
debian/patches/uow.diff | 47 ++++++++++++
debian/patches/uow2.diff | 87 +++++++++++++++++++++
debian/patches/uow3.diff | 92 +++++++++++++++++++++++
debian/patches/version1.diff | 80 ++++++++++++++++++++
debian/patches/version2.diff | 53 +++++++++++++
debian/patches/version3.diff | 78 +++++++++++++++++++
debian/patches/version4.diff | 41 ++++++++++
debian/patches/version5.diff | 54 +++++++++++++
debian/patches/version6.diff | 35 +++++++++
debian/patches/version7.diff | 35 +++++++++
debian/patches/version8.diff | 35 +++++++++
debian/patches/version9.diff | 35 +++++++++
debian/patches/weird.diff | 43 +++++++++++
21 files changed, 897 insertions(+), 23 deletions(-)
diff --git a/debian/control b/debian/control
index f3d4e5a..7a8c84b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,13 @@ Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant, javacc,
libgeronimo-jpa-2.0-spec-java, xmlto,
libmaven-antrun-plugin-java,
libjavacc-maven-plugin-java,
- libmaven-dependency-plugin-java
+ libmaven-dependency-plugin-java,
+ libgeronimo-jms-1.1-spec-java,
+ libmaven-enforcer-plugin-java,
+ libderby-java,
+ libmaven-javadoc-plugin-java,
+ libhttpunit-java,
+ libcommons-jci-rhino-java
Standards-Version: 3.9.3
Homepage: http://openjpa.apache.org/
Vcs-Git: git://git.debian.org/git/pkg-java/openjpa.git
diff --git a/debian/libopenjpa-java.poms b/debian/libopenjpa-java.poms
index 97c577a..c20ed18 100644
--- a/debian/libopenjpa-java.poms
+++ b/debian/libopenjpa-java.poms
@@ -25,29 +25,29 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-#pom.xml --ignore --no-parent
+pom.xml --no-parent
openjpa-lib/pom.xml --has-package-version --java-lib --no-parent
openjpa-kernel/pom.xml --has-package-version --java-lib --no-parent
openjpa-jdbc/pom.xml --has-package-version --java-lib --no-parent
openjpa-persistence/pom.xml --has-package-version --java-lib --no-parent
openjpa-persistence-jdbc/pom.xml --has-package-version --java-lib --no-parent
-#openjpa-persistence-locking/pom.xml --ignore
+openjpa-persistence-locking/pom.xml --ignore
openjpa-xmlstore/pom.xml --has-package-version --java-lib --no-parent
openjpa-slice/pom.xml --has-package-version --java-lib --no-parent
-#openjpa-jest/pom.xml --ignore
-#openjpa/pom.xml --ignore
-#openjpa-project/pom.xml --ignore
-#openjpa-examples/pom.xml --ignore
-#openjpa-examples/simple/pom.xml --ignore
-#openjpa-examples/image-gallery/pom.xml --ignore
-#openjpa-examples/openbooks/pom.xml --ignore
-#openjpa-integration/pom.xml --ignore
-#openjpa-integration/daytrader/pom.xml --ignore
-#openjpa-integration/examples/pom.xml --ignore
-#openjpa-integration/slf4j/pom.xml --ignore
-#openjpa-integration/tck/pom.xml --ignore
-#openjpa-integration/validation/pom.xml --ignore
-#openjpa-integration/jmx/pom.xml --ignore
-#openjpa-all/pom.xml --ignore
-#openjpa-tools/pom.xml --ignore
-#openjpa-tools/openjpa-maven-plugin/pom.xml --ignore
+openjpa-jest/pom.xml --has-package-version --java-lib --no-parent
+openjpa/pom.xml --has-package-version --java-lib --no-parent --ignore
+openjpa-project/pom.xml --ignore
+openjpa-examples/pom.xml --ignore
+openjpa-examples/simple/pom.xml --ignore
+openjpa-examples/image-gallery/pom.xml --ignore
+openjpa-examples/openbooks/pom.xml --ignore
+openjpa-integration/pom.xml --ignore
+openjpa-integration/daytrader/pom.xml --ignore
+openjpa-integration/examples/pom.xml --ignore
+openjpa-integration/slf4j/pom.xml --ignore
+openjpa-integration/tck/pom.xml --ignore
+openjpa-integration/validation/pom.xml --ignore
+openjpa-integration/jmx/pom.xml --ignore
+openjpa-all/pom.xml --ignore
+openjpa-tools/pom.xml --ignore
+openjpa-tools/openjpa-maven-plugin/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 8b13789..8c6543f 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1 +1,11 @@
-
+com.ibm.websphere websphere_uow_api * * * *
+javax.xml.bind * * * * *
+com.sun.xml.bind * * * * *
+simple-jndi simple-jndi * * * *
+org.apache.openjpa openjpa-maven-plugin * * * *
+org.apache.openjpa openjpa-persistence-jdbc * * * *
+org.codehaus.mojo ianal-maven-plugin * * * *
+org.codehaus.mojo buildnumber-maven-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.rat apache-rat-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index d2f1b82..f11c643 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1 +1,3 @@
maven.test.skip=true
+maven.compiler.source=1.5
+maven.compiler.target=1.6
diff --git a/debian/maven.rules b/debian/maven.rules
index cdc6926..11944bd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,7 +2,8 @@
commons-beanutils commons-beanutils jar s/.*/debian/ * *
commons-collections commons-collections jar s/3\..*/3.x/ * *
commons-dbcp commons-dbcp jar s/.*/debian/ * *
-junit junit jar s/3\..*/3.x/ * *
+#junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/.*/3.x/ * *
net.sourceforge.serp serp jar s/.*/debian/ * *
org.apache.maven apache-maven pom s/.*/3.0.4/ * *
org.apache.maven maven-aether-provider jar s/.*/3.0.4/ * *
@@ -24,3 +25,5 @@ s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
s/org.apache.felix/org.osgi/ org.osgi.core * * * *
s/org.jmock/jmock/ jmock* jar s/2\..*/2.x/ * *
+asm asm jar s/.*/3.x/ * *
+postgresql postgresql jar s/.*/9.2.jdbc3/ * *
diff --git a/debian/patches/hsql-upstream-fix-2390-2391.diff b/debian/patches/hsql-upstream-fix-2390-2391.diff
new file mode 100644
index 0000000..b423664
--- /dev/null
+++ b/debian/patches/hsql-upstream-fix-2390-2391.diff
@@ -0,0 +1,79 @@
+--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
++++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
+@@ -18,6 +18,7 @@
+ */
+ package org.apache.openjpa.jdbc.sql;
+
++import java.lang.reflect.Field;
+ import java.math.BigDecimal;
+ import java.sql.Connection;
+ import java.sql.DatabaseMetaData;
+@@ -27,7 +28,6 @@
+ import java.util.Arrays;
+
+ import org.apache.commons.lang.StringUtils;
+-import org.hsqldb.Trace;
+ import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+ import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
+ import org.apache.openjpa.jdbc.schema.Column;
+@@ -50,6 +50,8 @@
+ public boolean cacheTables = false;
+
+ private int dbMajorVersion;
++ private int dbMinorVersion;
++ private int violation_of_unique_index_or_constraint;
+
+ private SQLBuffer _oneBuffer = new SQLBuffer(this).append("1");
+
+@@ -114,6 +116,28 @@
+ // but doesn't support it for columns references ("schema.table.column")
+ useSchemaName = false;
+ }
++ if (dbMajorVersion > 1 && dbMinorVersion > 0) {
++ nextSequenceQuery += " LIMIT 1";
++ }
++ String packageName;
++ String fieldName;
++ if (dbMajorVersion > 1) {
++ // default value for "X_23505"
++ violation_of_unique_index_or_constraint = 104;
++ packageName = "org.hsqldb.error.ErrorCode";
++ fieldName = "X_23505";
++ } else {
++ // default value for "VIOLATION_OF_UNIQUE_INDEX"
++ violation_of_unique_index_or_constraint = 9;
++ packageName = "org.hsqldb.Trace";
++ fieldName = "VIOLATION_OF_UNIQUE_INDEX";
++ }
++ try {
++ Class<?> cls = Class.forName(packageName);
++ Field fld = cls.getField(fieldName);
++ violation_of_unique_index_or_constraint = fld.getInt(null);
++ } catch (Exception e) {
++ }
+ }
+
+ /**
+@@ -126,11 +150,13 @@
+
+ if (isJDBC3) {
+ dbMajorVersion = metaData.getDatabaseMajorVersion();
++ dbMinorVersion = metaData.getDatabaseMinorVersion();
+ } else {
+ // String is like "2.0.0"
+ String productVersion = metaData.getDatabaseProductVersion();
+ String[] version = productVersion.split("\\.") ;
+ dbMajorVersion = Integer.parseInt(version[0]) ;
++ dbMinorVersion = Integer.parseInt(version[1]);
+ }
+ }
+
+@@ -375,7 +401,7 @@
+ Object failed) {
+ OpenJPAException ke = super.newStoreException(msg, causes, failed);
+ if (ke instanceof ReferentialIntegrityException
+- && causes[0].getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_INDEX) {
++ && causes[0].getErrorCode() == -violation_of_unique_index_or_constraint) {
+ ((ReferentialIntegrityException) ke).setIntegrityViolation
+ (ReferentialIntegrityException.IV_UNIQUE);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 012eb0f..75a9d3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,16 @@
#java7-compat.diff
-pom.diff
+#pom.diff
+version1.diff
+version2.diff
+version3.diff
+version4.diff
+version5.diff
+version6.diff
+uow.diff
+uow2.diff
+uow3.diff
+hsql-upstream-fix-2390-2391.diff
+weird.diff
+version7.diff
+version8.diff
+version9.diff
diff --git a/debian/patches/stuff.diff b/debian/patches/stuff.diff
new file mode 100644
index 0000000..4923a90
--- /dev/null
+++ b/debian/patches/stuff.diff
@@ -0,0 +1,45 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release to fix security hold (Closes: #716937)
+ * Fix FTBFS with HSQL (Closes: #706176)
+ * Switch built from Ant to Maven to match upstream and publish pom
+Author: Stephen Nelson <stephen at eccostudio.com>
+Bug-Debian: http://bugs.debian.org/706176
+Bug-Debian: http://bugs.debian.org/716937
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/pom.xml
++++ openjpa-2.2.2/pom.xml
+@@ -23,11 +23,13 @@
+ <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.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
++ -->
+
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
diff --git a/debian/patches/uow.diff b/debian/patches/uow.diff
new file mode 100644
index 0000000..0569d29
--- /dev/null
+++ b/debian/patches/uow.diff
@@ -0,0 +1,47 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-kernel/pom.xml
++++ openjpa-2.2.2/openjpa-kernel/pom.xml
+@@ -165,6 +165,19 @@
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <executions>
++ <execution>
++ <configuration>
++ <excludes>
++ <exclude>**/ee/WASRegistryManagedRuntime.java</exclude>
++ </excludes>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
+ </plugins>
+ </build>
+
diff --git a/debian/patches/uow2.diff b/debian/patches/uow2.diff
new file mode 100644
index 0000000..5cb9595
--- /dev/null
+++ b/debian/patches/uow2.diff
@@ -0,0 +1,87 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
++++ openjpa-2.2.2/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
+@@ -16,59 +16,3 @@
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-package org.apache.openjpa.ee;
+-
+-import com.ibm.wsspi.uow.UOWAction;
+-import com.ibm.wsspi.uow.UOWActionException;
+-import com.ibm.wsspi.uow.UOWException;
+-import com.ibm.wsspi.uow.UOWManager;
+-import com.ibm.wsspi.uow.UOWManagerFactory;
+-
+-/**
+- * WASRegistryManagedRuntime provides WebSphere specific extensions to
+- * {@link RegistryManagedRuntime}. Currently these extensions consist of using
+- * the WebSphere UOWManager interface to submit non transactional work.
+- */
+-public class WASRegistryManagedRuntime extends RegistryManagedRuntime {
+- /**
+- * <P>
+- * RegistryManagedRuntime cannot suspend transactions, but WebSphere
+- * provides an interface to submit work outside of the current tran.
+- * </P>
+- */
+- public void doNonTransactionalWork(Runnable runnable)
+- throws RuntimeException, UnsupportedOperationException {
+- try {
+- UOWManagerFactory.getUOWManager().runUnderUOW(
+- UOWManager.UOW_TYPE_LOCAL_TRANSACTION, false,
+- new DelegatingUOWAction(runnable));
+- }
+- catch(UOWActionException e ) {
+- RuntimeException re = new RuntimeException(e.getMessage());
+- re.initCause(e);
+- throw re;
+- }
+- catch(UOWException e ) {
+- RuntimeException re = new RuntimeException(e.getMessage());
+- re.initCause(e);
+- throw re;
+- }
+- }
+-
+-
+- /**
+- * Delegate for the WebSphere proprietary UOWAction interface. Enables a
+- * {@link Runnable} to be passed in to the WebSphere UOWManager.
+- */
+- class DelegatingUOWAction implements UOWAction {
+- Runnable _del;
+-
+- public DelegatingUOWAction(Runnable delegate) {
+- _del = delegate;
+- }
+-
+- public void run() throws Exception {
+- _del.run();
+- }
+- }
+-}
diff --git a/debian/patches/uow3.diff b/debian/patches/uow3.diff
new file mode 100644
index 0000000..08a5604
--- /dev/null
+++ b/debian/patches/uow3.diff
@@ -0,0 +1,92 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
++++ openjpa-2.2.2/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
+@@ -16,3 +16,64 @@
+ * specific language governing permissions and limitations
+ * under the License.
+ */
++package org.apache.openjpa.ee;
++
++/*
++import com.ibm.wsspi.uow.UOWAction;
++import com.ibm.wsspi.uow.UOWActionException;
++import com.ibm.wsspi.uow.UOWException;
++import com.ibm.wsspi.uow.UOWManager;
++import com.ibm.wsspi.uow.UOWManagerFactory;
++*/
++
++/**
++ * WASRegistryManagedRuntime provides WebSphere specific extensions to
++ * {@link RegistryManagedRuntime}. Currently these extensions consist of using
++ * the WebSphere UOWManager interface to submit non transactional work.
++ */
++public class WASRegistryManagedRuntime extends RegistryManagedRuntime {
++ /**
++ * <P>
++ * RegistryManagedRuntime cannot suspend transactions, but WebSphere
++ * provides an interface to submit work outside of the current tran.
++ * </P>
++ */
++ public void doNonTransactionalWork(Runnable runnable)
++ throws RuntimeException, UnsupportedOperationException {
++ /*
++ try {
++ UOWManagerFactory.getUOWManager().runUnderUOW(
++ UOWManager.UOW_TYPE_LOCAL_TRANSACTION, false,
++ new DelegatingUOWAction(runnable));
++ }
++ catch(UOWActionException e ) {
++ RuntimeException re = new RuntimeException(e.getMessage());
++ re.initCause(e);
++ throw re;
++ }
++ catch(UOWException e ) {
++ RuntimeException re = new RuntimeException(e.getMessage());
++ re.initCause(e);
++ throw re;
++ }
++ */
++ }
++
++
++ /**
++ * Delegate for the WebSphere proprietary UOWAction interface. Enables a
++ * {@link Runnable} to be passed in to the WebSphere UOWManager.
++ */
++ //class DelegatingUOWAction implements UOWAction {
++ class DelegatingUOWAction {
++ Runnable _del;
++
++ public DelegatingUOWAction(Runnable delegate) {
++ _del = delegate;
++ }
++
++ public void run() throws Exception {
++ _del.run();
++ }
++ }
++}
diff --git a/debian/patches/version1.diff b/debian/patches/version1.diff
new file mode 100644
index 0000000..45b11de
--- /dev/null
+++ b/debian/patches/version1.diff
@@ -0,0 +1,80 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-lib/pom.xml
++++ openjpa-2.2.2/openjpa-lib/pom.xml
+@@ -41,43 +41,52 @@
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <scope>test</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
++ <version>1.2.x</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
++ <version>3.x</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ </dependencies>
+
diff --git a/debian/patches/version2.diff b/debian/patches/version2.diff
new file mode 100644
index 0000000..bdce415
--- /dev/null
+++ b/debian/patches/version2.diff
@@ -0,0 +1,53 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-kernel/pom.xml
++++ openjpa-2.2.2/openjpa-kernel/pom.xml
+@@ -45,14 +45,17 @@
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.websphere</groupId>
+@@ -64,6 +67,7 @@
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <!-- for osgi ManagedRuntime implementation, -->
+ <!-- we pull in OSGi core at the same level as Apache Aries -->
diff --git a/debian/patches/version3.diff b/debian/patches/version3.diff
new file mode 100644
index 0000000..c2a3ab7
--- /dev/null
+++ b/debian/patches/version3.diff
@@ -0,0 +1,78 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-jdbc/pom.xml
++++ openjpa-2.2.2/openjpa-jdbc/pom.xml
+@@ -47,42 +47,50 @@
+ <artifactId>jaxb-api</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>provided</scope>
++ <version>9.2.jdbc3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
++ <version>2.x</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit3</artifactId>
+ <scope>test</scope>
++ <version>2.x</version>
+ </dependency>
+ </dependencies>
+ </project>
diff --git a/debian/patches/version4.diff b/debian/patches/version4.diff
new file mode 100644
index 0000000..faeb72e
--- /dev/null
+++ b/debian/patches/version4.diff
@@ -0,0 +1,41 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-persistence/pom.xml
++++ openjpa-2.2.2/openjpa-persistence/pom.xml
+@@ -45,11 +45,13 @@
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <scope>provided</scope>
++ <version>debian</version>
+ </dependency>
+ <!-- for osgi bundle activator code, use same level as Apache Aries -->
+ <dependency>
diff --git a/debian/patches/version5.diff b/debian/patches/version5.diff
new file mode 100644
index 0000000..15a7fcc
--- /dev/null
+++ b/debian/patches/version5.diff
@@ -0,0 +1,54 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-persistence-jdbc/pom.xml
++++ openjpa-2.2.2/openjpa-persistence-jdbc/pom.xml
+@@ -826,22 +826,26 @@
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>test</scope>
++ <version>3.x</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <scope>test</scope>
++ <version>debian</version>
+ </dependency>
+ <!-- Required for org.apache.openjpa.persistence.xmlmapping tests -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>test</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>simple-jndi</groupId>
diff --git a/debian/patches/version6.diff b/debian/patches/version6.diff
new file mode 100644
index 0000000..c033051
--- /dev/null
+++ b/debian/patches/version6.diff
@@ -0,0 +1,35 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-slice/pom.xml
++++ openjpa-2.2.2/openjpa-slice/pom.xml
+@@ -51,6 +51,7 @@
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <scope>test</scope>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
diff --git a/debian/patches/version7.diff b/debian/patches/version7.diff
new file mode 100644
index 0000000..1b6c5cb
--- /dev/null
+++ b/debian/patches/version7.diff
@@ -0,0 +1,35 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa/pom.xml
++++ openjpa-2.2.2/openjpa/pom.xml
+@@ -103,6 +103,7 @@
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
++ <version>2.3.5</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
diff --git a/debian/patches/version8.diff b/debian/patches/version8.diff
new file mode 100644
index 0000000..94b39bd
--- /dev/null
+++ b/debian/patches/version8.diff
@@ -0,0 +1,35 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa/pom.xml
++++ openjpa-2.2.2/openjpa/pom.xml
+@@ -58,6 +58,7 @@
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
++ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
diff --git a/debian/patches/version9.diff b/debian/patches/version9.diff
new file mode 100644
index 0000000..b7a2b84
--- /dev/null
+++ b/debian/patches/version9.diff
@@ -0,0 +1,35 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-jest/pom.xml
++++ openjpa-2.2.2/openjpa-jest/pom.xml
+@@ -45,6 +45,7 @@
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
diff --git a/debian/patches/weird.diff b/debian/patches/weird.diff
new file mode 100644
index 0000000..abe310e
--- /dev/null
+++ b/debian/patches/weird.diff
@@ -0,0 +1,43 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+ * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/openjpa-xmlstore/pom.xml
++++ openjpa-2.2.2/openjpa-xmlstore/pom.xml
+@@ -60,6 +60,7 @@
+ <build>
+ <plugins>
+ <!-- Extract the common test support files from o-p-j-tests.jar -->
++ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+@@ -85,6 +86,7 @@
+ </execution>
+ </executions>
+ </plugin>
++ -->
+
+ <!-- new way of using openjpa-maven-plugin to enhance classes -->
+ <plugin>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjpa.git
More information about the pkg-java-commits
mailing list