Unverified Commit f4cb5342 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #238764 from wegank/maven-refactor

maven: refactor
parents 49660fc7 dca41555
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@
, maven
, webkitgtk_4_1
, glib-networking
, javaPackages
}:

let
@@ -24,9 +23,7 @@ let
    jdk = jdk17;
  };
in
(javaPackages.mavenfod.override {
  maven = mavenJdk17;
}) rec {
mavenJdk17.buildMavenPackage rec {
  pname = "dbeaver";
  version = "22.2.2"; # When updating also update mvnHash

+2 −2
Original line number Diff line number Diff line
{ lib, javaPackages, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
{ lib, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
, jre, maven
}:

@@ -27,7 +27,7 @@ let
  # Also use the commit date as a build and output timestamp.
  mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
in
javaPackages.mavenfod rec {
maven.buildMavenPackage rec {
  pname = "digital";
  inherit version jre;

+1 −3
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ let
    jdk = jdk11;
  };
in
(javaPackages.mavenfod.override {
  maven = mavenJdk11;
}) rec {
mavenJdk11.buildMavenPackage rec {
  pname = "gephi";
  version = "0.10.1";

+0 −19
Original line number Diff line number Diff line
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source $stdenv/setup

unpackPhase

mkdir -p $out/maven
cp -r $name/* $out/maven

makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk"
makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug --set-default JAVA_HOME "$jdk"

# Add the maven-axis and JIRA plugin by default when using maven 1.x
if [ -e $out/maven/bin/maven ]
then
  export OLD_HOME=$HOME
  export HOME=.
  $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7
  export HOME=OLD_HOME
fi
Loading