From 5e4eecf4a46fd2bfe1ffeea4b75b107672e2272b Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Fri, 26 Jan 2024 09:39:22 +0100
Subject: [PATCH] ant is no longer required
---
.gitlab-ci.yml | 6 +--
build.xml | 114 -------------------------------------------------
2 files changed, 3 insertions(+), 117 deletions(-)
delete mode 100644 build.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c915fe3cd..d620a31f33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,7 +160,7 @@ test:frontend:
.test_backend_web_template:
script: &test_backend_web_definition
- apt-get update
- - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
+ - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
- mvn -DskipTests=true clean install -pl web -am
@@ -405,7 +405,7 @@ test:dependency_conflict:
stage: test
script:
- apt-get update
- - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
+ - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
@@ -423,7 +423,7 @@ test:code_validation:
stage: test
script:
- apt-get update
- - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
+ - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
diff --git a/build.xml b/build.xml
deleted file mode 100644
index be0ebacaf7..0000000000
--- a/build.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="minerva" default="main" basedir=".">
- <property environment="env" />
-
- <property name="build.dir" value="web/target" />
- <property name="war.file" value="*.war" />
- <property name="tomcat.home" value="${env.CATALINA_HOME}" />
- <property name="tomcat.deploy.dir" value="${tomcat.home}/webapps" />
-
- <condition property="isWindows">
- <os family="windows" />
- </condition>
-
- <condition property="isUnix">
- <os family="unix" />
- </condition>
-
- <target name="war-exists">
- <available file="${tomcat.deploy.dir}/${ant.project.name}.war" property="war.exists" />
- </target>
-
- <target name="remove-war" depends="war-exists" if="war.exists">
- <delete file="${tomcat.deploy.dir}/${ant.project.name}.war" />
- </target>
-
- <target name="war-dir-exists">
- <available file="${tomcat.deploy.dir}/${ant.project.name}" property="war-dir.exists" type="dir" />
- </target>
-
- <target name="remove-war-dir" depends="war-dir-exists" if="war-dir.exists">
- <delete dir="${tomcat.deploy.dir}/${ant.project.name}" />
- </target>
-
- <target name="deploy" depends="remove-war,remove-war-dir">
- <copy todir="${tomcat.deploy.dir}">
- <fileset dir="${build.dir}">
- <include name="${war.file}" />
- </fileset>
- <globmapper from="*.war" to="${ant.project.name}.war"/>
- </copy>
- </target>
-
-
- <target name="main" depends="tomcat-stop,maven-build,deploy,tomcat-start">
- </target>
-
- <target name="all" depends="main">
- </target>
-
- <target name="tomcat-start" depends="tomcat-start-windows, tomcat-start-unix" />
- <target name="tomcat-start-windows" if="isWindows">
- <exec executable="${tomcat.home}/bin/startup.bat" />
- </target>
- <target name="tomcat-start-unix" if="isUnix">
- <exec executable="${tomcat.home}/bin/startup.sh" />
- </target>
-
- <target name="tomcat-stop" depends="tomcat-stop-windows, tomcat-stop-unix" />
- <target name="tomcat-stop-windows" if="isWindows">
- <exec executable="${tomcat.home}/bin/shutdown.bat" />
- </target>
- <target name="tomcat-stop-unix" if="isUnix">
- <exec executable="${tomcat.home}/bin/shutdown.sh" />
- </target>
-
-
- <target name="maven-build" depends="maven-build-windows, maven-build-unix" />
-
- <target name="maven-build-windows" if="isWindows">
- <exec dir="." executable="cmd">
- <arg line="/c mvn -Dmaven.test.skip=true clean install -pl web -am" />
- </exec>
- </target>
-
- <target name="maven-build-unix" if="isUnix">
- <exec dir="." executable="sh">
- <arg line="-c 'mvn -Dmaven.test.skip=true clean install -pl web -am'" />
- </exec>
- </target>
-
- <target name="maven-build-with-doc" depends="maven-build-with-doc-windows, maven-build-with-doc-unix" />
-
- <target name="maven-build-with-doc-windows" if="isWindows">
- <exec dir="." executable="cmd">
- <arg line="/c mvn -DfailIfNoTests=false -Dtest=lcsb.mapviewer.web.** clean install -pl web -am" />
- </exec>
- </target>
-
- <target name="maven-build-with-doc-unix" if="isUnix">
- <exec dir="." executable="sh">
- <arg line="-c 'mvn -DfailIfNoTests=false -Dtest=lcsb.mapviewer.web.** clean install -pl web -am'" />
- </exec>
- </target>
-
- <target name="maven-test" depends="maven-test-windows, maven-test-unix" />
-
- <target name="maven-test-windows" depends="maven-build" if="isWindows">
- <exec dir="." executable="cmd">
- <arg line="/c mvn test -fn" />
- <!-- <arg line="/c mvn surefire-report:report" /> -->
- </exec>
- </target>
-
- <target name="maven-test-unix" depends="maven-build" if="isUnix">
- <exec dir="." executable="sh">
- <arg line="-c 'mvn test -fn'" />
- <!-- <arg line="-c 'mvn surefire-report:report'" /> -->
- </exec>
- </target>
-
- <target name="debian-pkg" depends="maven-build">
- <exec executable="debian/create-debian-pkg.sh" />
- </target>
-</project>
--
GitLab