[Git][java-team/openjpa][master] 5 commits: Build with javacc5 instead of javacc

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / openjpa


Commits:
c2645a1d by Emmanuel Bourg at 2022-05-20T16:19:30+02:00
Build with javacc5 instead of javacc

- - - - -
e365a759 by Emmanuel Bourg at 2022-05-20T16:20:06+02:00
Switch to debhelper level 13

- - - - -
f22aeac6 by Emmanuel Bourg at 2022-05-20T16:27:15+02:00
Depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
0b2e4eaf by Emmanuel Bourg at 2022-05-20T16:27:28+02:00
Standards-Version updated to 4.6.1

- - - - -
d757d169 by Emmanuel Bourg at 2022-05-20T16:27:38+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/maven.rules
- + debian/patches/javacc-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+openjpa (2.4.2-7) unstable; urgency=medium
+
+  * Team upload.
+  * Build with javacc5 instead of javacc
+  * Depend on libservlet-api-java instead of libservlet3.1-java
+  * Switch to debhelper level 13
+  * Standards-Version updated to 4.6.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 May 2022 16:27:35 +0200
+
 openjpa (2.4.2-6) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -8,9 +8,9 @@ Build-Depends:
  ant-contrib,
  ant-optional,
  aspectj,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
- javacc,
+ javacc5,
  javahelper,
  junit4,
  libcommons-collections3-java,
@@ -36,11 +36,11 @@ Build-Depends:
  libpostgresql-jdbc-java,
  libregexp-java,
  libserp-java,
- libservlet3.1-java,
+ libservlet-api-java,
  libxbean-java,
  maven-debian-helper,
  xmlto
-Standards-Version: 4.2.1
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/openjpa.git
 Vcs-Browser: https://salsa.debian.org/java-team/openjpa
 Homepage: http://openjpa.apache.org


=====================================
debian/maven.rules
=====================================
@@ -26,4 +26,5 @@ s/org.jmock/jmock/ jmock* jar s/2\..*/2.x/ * *
 asm asm jar s/.*/3.x/ * *
 jmock jmock jar s/.*/2.x/ * *
 jmock jmock-junit3 jar s/.*/2.x/ * *
-javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/debian/ * *
+net.java.dev.javacc javacc * s/.*/5.x/ * *


=====================================
debian/patches/javacc-compatibility.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Use JavaCC 5 instead of the latest release
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/openjpa-kernel/pom.xml
++++ b/openjpa-kernel/pom.xml
+@@ -99,6 +99,13 @@
+                         </goals>
+                     </execution>
+                 </executions>
++                <dependencies>
++                    <dependency>
++                        <groupId>net.java.dev.javacc</groupId>
++                        <artifactId>javacc</artifactId>
++                        <version>5.x</version>
++                    </dependency>
++                </dependencies>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 exclude-was-uow.diff
 openjpa-xmlstore-no-tests.patch
+javacc-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/openjpa/-/compare/2cec8f8ecce90cc81be10a7851b3e987e9bc6930...d757d1696b951b3906ca6a7b0692f8547fc9677b

-- 
View it on GitLab: https://salsa.debian.org/java-team/openjpa/-/compare/2cec8f8ecce90cc81be10a7851b3e987e9bc6930...d757d1696b951b3906ca6a7b0692f8547fc9677b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220520/b7f42275/attachment.htm>