[med-svn] [Git][med-team/oncofuse][master] Try to get maven working

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / oncofuse


Commits:
b75b0b69 by Andreas Tille at 2019-10-06T07:52:24Z
Try to get maven working

- - - - -


3 changed files:

- debian/control
- + debian/patches/gmavenplus.patch
- + debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -10,7 +10,8 @@ Build-Depends-Indep: groovy,
                      libcommons-cli-java,
                      libgpars-groovy-java (>= 1.2.1),
                      libmaven-antrun-plugin-java (>= 1.8),
-                     libmaven-shade-plugin-java (>= 3.1.1) 
+                     libmaven-shade-plugin-java (>= 3.1.1),
+                     libgmavenplus-java
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/oncofuse
 Vcs-Git: https://salsa.debian.org/med-team/oncofuse.git


=====================================
debian/patches/gmavenplus.patch
=====================================
@@ -0,0 +1,45 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -12,6 +12,10 @@
+ 
+     <properties>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
++        <!-- http://groovy.github.io/GMavenPlus/compileTests-mojo.html#targetBytecode -->
++        <gmavenplus.javaRelease>1.8</gmavenplus.javaRelease>
++        <!-- maven plugins -->
++        <gmavenplus.plugin.version>1.7.1</gmavenplus.plugin.version>
+     </properties>
+ 
+     <build>
+@@ -40,20 +44,19 @@
+                 <version>2.4</version>
+             </plugin>
+             <plugin>
+-                <artifactId>maven-compiler-plugin</artifactId>
+-                <version>3.1</version>
++                <groupId>org.codehaus.gmavenplus</groupId>
++                <artifactId>gmavenplus-plugin</artifactId>
++                <version>${gmavenplus.plugin.version}</version>
++                <executions>
++                    <execution>
++                        <goals>
++                            <goal>compileTests</goal>
++                            </goals>
++                    </execution>
++                </executions>
+                 <configuration>
+-                    <compilerId>groovy-eclipse-compiler</compilerId>
+-                    <source>1.7</source>
+-                    <target>1.7</target>
++                    <targetBytecode>${gmavenplus.javaRelease}</targetBytecode>
+                 </configuration>
+-                <dependencies>
+-                    <dependency>
+-                        <groupId>org.codehaus.groovy</groupId>
+-                        <artifactId>groovy-eclipse-compiler</artifactId>
+-                        <version>2.7.0-01</version>
+-                    </dependency>
+-                </dependencies>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+gmavenplus.patch



View it on GitLab: https://salsa.debian.org/med-team/oncofuse/commit/b75b0b69e5335f502436938b0c098bed771c9c5d

-- 
View it on GitLab: https://salsa.debian.org/med-team/oncofuse/commit/b75b0b69e5335f502436938b0c098bed771c9c5d
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/debian-med-commit/attachments/20191006/75da63ea/attachment-0001.html>