[Git][java-team/gradle-jflex-plugin][master] 8 commits: Add missing de.jflex:cup_runtime dependency to pom.xml.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / gradle-jflex-plugin


Commits:
bec51d11 by Markus Koschany at 2018-10-01T12:42:53Z
Add missing de.jflex:cup_runtime dependency to pom.xml.

- - - - -
365dd000 by Markus Koschany at 2018-10-01T12:46:04Z
Switch to compat level 11.

- - - - -
da6fd084 by Markus Koschany at 2018-10-01T12:46:25Z
Declare compliance with Debian Policy 4.2.1.

- - - - -
9985abc3 by Markus Koschany at 2018-10-01T12:46:38Z
Tighten B-D on jflex.

- - - - -
ca23d2d6 by Markus Koschany at 2018-10-01T12:51:12Z
Add jflex-cup_runtime.patch. Build-Depend on cup_runtime artifact and use

source/target level 1.7.

- - - - -
55a4d47d by Markus Koschany at 2018-10-02T10:52:39Z
Use https for Format field.

- - - - -
6a4a4ab5 by Markus Koschany at 2018-10-02T10:53:56Z
Update changelog

- - - - -
b9ec13ab by Markus Koschany at 2018-10-02T10:54:29Z
Update patch header

- - - - -


8 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/patches/jflex-cup_runtime.patch
- debian/patches/series
- debian/pom.xml
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+gradle-jflex-plugin (0.0.2-4) unstable; urgency=medium
+
+  * Add missing de.jflex:cup_runtime dependency to pom.xml.
+  * Switch to compat level 11.
+  * Declare compliance with Debian Policy 4.2.1.
+  * Tighten B-D on jflex.
+  * Add jflex-cup_runtime.patch. Build-Depend on cup_runtime artifact and use
+    source/target level 1.7.
+  * Use https for Format field.
+
+ -- Markus Koschany <apo at debian.org>  Tue, 02 Oct 2018 12:53:23 +0200
+
 gradle-jflex-plugin (0.0.2-3) unstable; urgency=medium
 
   * Update gradle-2.12.patch for jflex 1.6.1.


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
@@ -5,12 +5,12 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo at debian.org>
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 11),
  gradle-debian-helper,
  default-jdk,
- jflex (>= 1.6.1),
+ jflex (>= 1.7.0),
  maven-repo-helper
-Standards-Version: 3.9.8
+Standards-Version: 4.2.1
 Homepage: https://github.com/thomaslee/gradle-jflex-plugin
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/gradle-jflex-plugin.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/gradle-jflex-plugin.git


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gradle-jflex-plugin
 Source: https://github.com/thomaslee/gradle-jflex-plugin
 Files-Excluded:
@@ -9,7 +9,7 @@ Copyright: 2014-2015, Tom Lee
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2016, Markus Koschany <apo at debian.org>
+Copyright: 2016-2018, Markus Koschany <apo at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/patches/jflex-cup_runtime.patch
=====================================
@@ -0,0 +1,41 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 1 Oct 2018 14:48:25 +0200
+Subject: jflex cup_runtime
+
+Forwarded: no
+---
+ build.gradle | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 52dd9b5..7c23fcc 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -6,8 +6,8 @@ apply plugin: 'maven'
+ //apply plugin: 'nexus'
+ //apply plugin: 'release'
+ 
+-sourceCompatibility = 1.6
+-targetCompatibility = 1.6
++sourceCompatibility = 1.7
++targetCompatibility = 1.7
+ 
+ buildscript {
+   repositories {
+@@ -22,7 +22,7 @@ buildscript {
+ }
+ 
+ ext {
+-  jflexVersion = '1.6.0'
++  jflexVersion = '1.7.0'
+ }
+ 
+ repositories {
+@@ -33,6 +33,7 @@ repositories {
+ dependencies {
+   compile gradleApi()
+   compile "de.jflex:jflex:${jflexVersion}"
++  compile "de.jflex:cup_runtime:0.11b"
+   testCompile 'junit:junit:4.11'
+ }
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 gradle-2.12.patch
 build.patch
+jflex-cup_runtime.patch


=====================================
debian/pom.xml
=====================================
@@ -37,8 +37,14 @@
     <dependency>
       <groupId>de.jflex</groupId>
       <artifactId>jflex</artifactId>
-      <version>1.6.0</version>
+      <version>1.7.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>de.jflex</groupId>
+      <artifactId>cup_runtime</artifactId>
+      <version>1.7.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>


=====================================
debian/rules
=====================================
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel --with maven_repo_helper --buildsystem=gradle
+	dh $@ --with maven_repo_helper --buildsystem=gradle
 
 get-orig-source:
 	uscan --force-download --download-current-version



View it on GitLab: https://salsa.debian.org/java-team/gradle-jflex-plugin/compare/8514d71fdd732bdb4e375bc2c2ed5253245825e4...b9ec13ab59b3693e06d53f9dfbdb7740406b923b

-- 
View it on GitLab: https://salsa.debian.org/java-team/gradle-jflex-plugin/compare/8514d71fdd732bdb4e375bc2c2ed5253245825e4...b9ec13ab59b3693e06d53f9dfbdb7740406b923b
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/20181002/02fa1450/attachment.html>