[Git][java-team/byteman][master] 8 commits: Standards-Version updated to 4.5.1

Emmanuel Bourg gitlab at salsa.debian.org
Wed Feb 3 10:21:19 GMT 2021 


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


Commits:
0c99a7b9 by Emmanuel Bourg at 2021-02-03T09:40:23+01:00
Standards-Version updated to 4.5.1

- - - - -
bdb744ec by Emmanuel Bourg at 2021-02-03T09:40:26+01:00
Switch to debhelper level 13

- - - - -
f55ef410 by Emmanuel Bourg at 2021-02-03T09:45:27+01:00
Removed the unused build dependency on jruby

- - - - -
7711af93 by Emmanuel Bourg at 2021-02-03T11:07:13+01:00
Removed the unused Maven rules

- - - - -
63eea963 by Emmanuel Bourg at 2021-02-03T11:08:53+01:00
Set the org.jboss.byteman.home property instead of patching the pom

- - - - -
a731ac0d by Emmanuel Bourg at 2021-02-03T11:09:29+01:00
Fixed the dependency resolution errors

- - - - -
02fdc123 by Emmanuel Bourg at 2021-02-03T11:20:41+01:00
Simplified skip-modules.patch

- - - - -
dd7d2019 by Emmanuel Bourg at 2021-02-03T11:20:58+01:00
Upload to unstable

- - - - -


11 changed files:

- debian/changelog
- − debian/compat
- debian/control
- − debian/maven.cleanIgnoreRules
- debian/maven.ignoreRules
- + debian/maven.properties
- debian/maven.rules
- − debian/patches/fix-bmunit-test.patch
- debian/patches/series
- debian/patches/skip-modules.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+byteman (4.0.12-2) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the unused build dependency on jruby
+  * Set the org.jboss.byteman.home property instead of patching the pom
+  * Fixed the dependency resolution errors
+  * Standards-Version updated to 4.5.1
+  * Switch to debhelper level 13
+  * Removed the unused Maven rules
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Feb 2021 11:20:48 +0100
+
 byteman (4.0.12-1) unstable; urgency=medium
 
   * New upstream version 4.0.12


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


=====================================
debian/control
=====================================
@@ -6,8 +6,8 @@ Uploaders:
  Andrius Merkys <merkys at debian.org>,
 Build-Depends:
  cup,
- debhelper (>= 12),
- jruby,
+ debhelper-compat (= 13),
+ libjboss-modules-java,
  libmaven-assembly-plugin-java,
  libmaven-bundle-plugin-java (>= 3.5.1),
  libmaven-compiler-plugin-java (>= 3.8.0),
@@ -19,7 +19,7 @@ Build-Depends:
  libsurefire-java (>= 2.22.1),
  maven-debian-helper,
  testng,
-Standards-Version: 4.4.0
+Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: http://byteman.jboss.org
 Vcs-Browser: https://salsa.debian.org/java-team/byteman


=====================================
debian/maven.cleanIgnoreRules deleted
=====================================
@@ -1 +0,0 @@
-


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,3 +1,4 @@
 
 org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.plugins maven-verifier-plugin * * * *
+org.apache.maven maven-project * * * *


=====================================
debian/maven.properties
=====================================
@@ -0,0 +1,2 @@
+
+org.jboss.byteman.home=../../debian/byteman-home


=====================================
debian/maven.rules
=====================================
@@ -1,35 +1,4 @@
 
 junit junit jar s/4\..*/4.x/ * *
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
-org.jboss.byteman byteman-agent jar s/.*/debian/ * *
-org.jboss.byteman byteman-asciidoc jar s/.*/debian/ * *
-org.jboss.byteman byteman-bmunit jar s/.*/debian/ * *
-org.jboss.byteman byteman-docs pom s/.*/debian/ * *
-org.jboss.byteman byteman-download pom s/.*/debian/ * *
-org.jboss.byteman byteman-dtest jar s/.*/debian/ * *
-org.jboss.byteman byteman-install bundle s/.*/debian/ * *
-org.jboss.byteman byteman-jboss-modules-plugin jar s/.*/debian/ * *
-org.jboss.byteman byteman-jboss-modules pom s/.*/debian/ * *
-org.jboss.byteman byteman-jigsaw jar s/.*/debian/ * *
-org.jboss.byteman byteman-layer jar s/.*/debian/ * *
-org.jboss.byteman byteman-root pom s/.*/debian/ * *
-org.jboss.byteman byteman-sample jar s/.*/debian/ * *
-org.jboss.byteman byteman-submit bundle s/.*/debian/ * *
-org.jboss.byteman byteman jar s/.*/debian/ * *
-org.jboss.byteman tests pom s/.*/debian/ * *
-org.jboss.modules jboss-modules jar s/.*/debian/ * *
-com.coderplus.maven.plugins copy-rename-maven-plugin * * * *
-org.apache.maven.plugins maven-changes-plugin * * * *
-org.apache.maven.plugins maven-enforcer-plugin * s/.*/debian/ * *
-org.apache.maven.plugins maven-gpg-plugin * * * *
-org.apache.maven.plugins maven-javadoc-plugin * * * *
-org.apache.maven.plugins maven-release-plugin * * * *
-org.apache.maven.plugins maven-source-plugin * * * *
-org.apache.maven.plugins maven-surefire-plugin * * * *
-org.apache.maven.shared maven-plugin-testing-harness * * * *
-org.apache.rat apache-rat-plugin * * * *
-org.apache.rat apache-rat-plugin * s/.*/debian/ * *
-org.assertj assertj-core * * * *
-org.codehaus.plexus plexus-container-default * * * *
 org.apache.maven maven* * s/.*/3.x/ * *
-org.ow2.asm * * s/.*/debian/ * *


=====================================
debian/patches/fix-bmunit-test.patch deleted
=====================================
@@ -1,14 +0,0 @@
-Description: setting org.jboss.byteman.home variable with a location where
- to look for generated byteman jar.
-Author: Andrius Merkys <merkys at debian.org>
---- a/contrib/bmunit/pom.xml
-+++ b/contrib/bmunit/pom.xml
-@@ -68,7 +68,7 @@
-                     <systemProperties>
-                         <property>
-                             <name>org.jboss.byteman.home</name>
--                            <value></value>
-+                            <value>##BYTEMAN_HOME##</value>
-                         </property>
-                     </systemProperties>
-                     <argLine>-Djdk.attach.allowAttachSelf</argLine>


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
 fix-dtest-pom.patch
 skip-modules.patch
-fix-bmunit-test.patch


=====================================
debian/patches/skip-modules.patch
=====================================
@@ -2,7 +2,7 @@ Description: excluding not packaged modules
 Author: Andrius Merkys <merkys at debian.org>
 --- a/pom.xml
 +++ b/pom.xml
-@@ -435,13 +435,9 @@
+@@ -435,10 +435,7 @@
          <module>jigsaw</module>
          <module>install</module>
          <module>contrib/bmunit</module>
@@ -12,7 +12,4 @@ Author: Andrius Merkys <merkys at debian.org>
 -        <module>contrib/jboss-modules-system</module>
          <module>sample</module>
          <module>docs</module>
--        <module>download</module>
-     </modules>
- 
-     <profiles>
+         <module>download</module>


=====================================
debian/rules
=====================================
@@ -19,7 +19,6 @@ override_dh_auto_configure:
 			debian/maven-repo/org/jboss/byteman/byteman-$${PKG}/$${VERSION}/byteman-$${PKG}-$${VERSION}.jar; \
            done; \
 	done
-	sed -ie "s@##BYTEMAN_HOME##@../../debian/byteman-home at g" contrib/bmunit/pom.xml
 	mkdir --parents debian/byteman-home/lib
 	ln -s ../../../byteman/target/byteman-$(DEB_VERSION_UPSTREAM).jar debian/byteman-home/lib/byteman.jar
 



View it on GitLab: https://salsa.debian.org/java-team/byteman/-/compare/c5b3788e87ff8ce360e8ac64af760e2176f1ba72...dd7d2019bd88b5f363ce72cf982a0545226393ae

-- 
View it on GitLab: https://salsa.debian.org/java-team/byteman/-/compare/c5b3788e87ff8ce360e8ac64af760e2176f1ba72...dd7d2019bd88b5f363ce72cf982a0545226393ae
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/20210203/7d95ec6d/attachment.html>

More information about the pkg-java-commits mailing list