diff --git a/build_resources/.project b/build_resources/.project
deleted file mode 100644
index 70bf5bccdb6557f304fc1d6acb1d58b538c07c27..0000000000000000000000000000000000000000
--- a/build_resources/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>build_resources</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/build_resources/ant/build-basic.xml b/build_resources/ant/build-basic.xml
deleted file mode 100644
index 854f85840c261d52a973ea9ae2b67fd999a4f549..0000000000000000000000000000000000000000
--- a/build_resources/ant/build-basic.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<project name="build-basic" basedir="..">
-
- <!--
- // Set some properties that are os specific.
- -->
- <condition property="os.mac">
- <os family="mac" />
- </condition>
-
- <condition property="os.windows">
- <os family="windows" />
- </condition>
-
- <condition property="os.unix">
- <os family="unix" />
- </condition>
-
- <path id="build-resource.path">
- <fileset dir="../build_resources/lib">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <property name="resource" value="resource" />
- <property name="targets" value="targets" />
- <property name="dist" value="${targets}/dist" />
-</project>
\ No newline at end of file
diff --git a/build_resources/ant/build-common.xml b/build_resources/ant/build-common.xml
deleted file mode 100644
index f7cf3c2e7a7b6566ae131d23e0ae7ba19acba7bc..0000000000000000000000000000000000000000
--- a/build_resources/ant/build-common.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<project name="build-common" basedir="..">
- <import file="build-basic.xml" />
-
- <property name="lib" value="../libraries" />
- <taskdef name="build-info"
- classname="ch.systemsx.cisd.ant.task.subversion.GatherRevisionAndVersionTask"
- classpathref="build-resource.path" />
- <taskdef name="build-java-subprojects"
- classname="ch.systemsx.cisd.ant.task.subprojectbuilder.BuildJavaSubprojectsTask"
- classpathref="build-resource.path" />
- <taskdef name="project-classpath"
- classname="ch.systemsx.cisd.ant.task.SetEclipseClasspathTask"
- classpathref="build-resource.path" />
- <typedef name="recursive-jar"
- classname="ch.systemsx.cisd.ant.task.RecursiveJar"
- classpathref="build-resource.path" />
- <taskdef name="testng"
- classname="org.testng.TestNGAntTask"
- classpath="../libraries/testng/testng-jdk15.jar" />
- <taskdef name="dependency-checker"
- classname="classycle.ant.DependencyCheckingTask"
- classpath="${lib}/classycle/classycle.jar" />
-
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
- <property name="server-resource" value="${resource}/server" />
- <property name="sources" value="source/java" />
- <property name="sources.test" value="sourceTest/java" />
- <property name="classes" value="${targets}/ant/classes" />
- <property name="output.test" value="${targets}/test-output" />
- <property name="build.info.filename" value="BUILD-${ant.project.name}.INFO" />
- <property name="build.info.file" value="${classes}/${build.info.filename}" />
- <property name="log.configuration.file" location="etc/log.xml" />
-
- <!-- The name of the file containing checksums for all properties files -->
- <property name="checksum.file.name" value="configuration.MD5" />
- <property name="checksum.file" value="${dist}/${checksum.file.name}" />
-
- <!--
- // Dummy target used by cruisecontrol
- -->
- <target name="_dummy" description="Dummy target used by cruisecontrol" />
-
- <target name="prepare">
- <delete dir="${classes}" />
- <mkdir dir="${classes}" />
- </target>
-
- <target name="compile" unless="compile.bypass">
- <build-java-subprojects target="_plain-compile-sources"/>
- <antcall target="_plain-compile-sources" />
- </target>
-
- <target name="compile-tests" depends="compile">
- <build-java-subprojects target="_plain-compile-tests"/>
- <antcall target="_plain-compile-tests" />
- </target>
-
- <target name="check-dependencies" depends="compile">
- <antcall target="check-dependencies-no-compile" />
- </target>
-
- <target name="check-dependencies-no-compile">
- <dependency-checker definitionFile="resource/dependency-structure.ddf"
- failOnUnwantedDependencies="true"
- mergeInnerClasses="true">
- <fileset dir="${classes}">
- <include name="**/*.class" />
- </fileset>
- </dependency-checker>
- </target>
-
- <target name="_plain-compile-sources" depends="prepare">
- <antcall target="_plain-compile">
- <param name="src" value="${sources}" />
- </antcall>
- </target>
-
- <target name="_plain-compile-tests">
- <antcall target="_plain-compile">
- <param name="src" value="${sources.test}" />
- </antcall>
- </target>
-
- <!--
- // Compile Java classes using the Eclipse compiler
- // Note: THIS IS A PRIVATE TARGET. It isn't intended to be used in other build scripts.
- // Parameter: src = source folder
- -->
- <target name="_plain-compile">
- <echo level="info">Compile all classes in ${basedir}/${src} and subfolders</echo>
- <javac srcdir="${src}"
- destdir="${classes}"
- classpath="${ecp}"
- source="1.6"
- target="1.6"
- encoding="UTF-8"
- debug="true">
- <compilerarg line="-warn:none" />
- </javac>
- <copy todir="${classes}">
- <fileset dir="${src}">
- <include name="**/*.xml" />
- <include name="**/*.xsd" />
- <include name="**/*.properties" />
- <include name="**/*.jpg" />
- <include name="**/*.png" />
- <include name="**/*.gif" />
- </fileset>
- </copy>
- </target>
-
- <!--
- // Runs a TestNG test suite
- // Parameter: test.suite = path of test suite relative to the test source folder
- -->
-
- <target name="_run-testng">
-
- <condition property="log.configuration.file.jvmarg" value="-Dlog4j.configuration=file:${log.configuration.file}">
- <available file="${log.configuration.file}" />
- </condition>
-
- <condition property="log.configuration.file.jvmarg" value="-Dlog4j.dummy.property">
- <not>
- <available file="${log.configuration.file}" />
- </not>
- </condition>
-
- <testng classpath="${ecp}"
- workingDir="."
- outputdir="${output.test}"
- failureproperty="${failure.property}">
- <xmlfileset dir="${sources.test}" includes="${test.suite}" />
- <jvmarg value="-Xmx1024M" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-Dant.project.name=${ant.project.name}" />
- <jvmarg value="-Dlog4j.debug" />
- <jvmarg value="-Duser.timezone=Europe/Zurich" />
- <jvmarg value="${log.configuration.file.jvmarg}" />
- </testng>
-
- </target>
-
- <target name="run-tests" depends="compile-tests">
- <delete dir="${output.test}" />
-
- <antcall target="_run-testng">
- <param name="test.suite" value="${test.suite}" />
- <param name="failure.property" value="tests.failed" />
- </antcall>
-
- <junitreport todir="${output.test}">
- <fileset dir="${output.test}">
- <include name="junitreports/*.xml" />
- </fileset>
- <report format="noframes" todir="${output.test}" />
- </junitreport>
- <fail if="tests.failed" message="At least one test failed." />
- </target>
-
- <target name="ci">
- <antcall target="run-tests">
- <param name="test.suite" value="tests.xml" />
- </antcall>
- <antcall target="check-restrictions" />
- </target>
-
- <!--
- 1. Compiles productive and test code
- 2. Checks restrictions (@Friend-@Private annotations)
- 3. Checks dependencies (defined in /dependency-structure.ddf)
- -->
- <target name="compile-and-check" depends="check-dependencies, check-restrictions"/>
-
- <target name="check-restrictions" depends="compile, compile-tests">
- <exec executable="sh" failonerror="true">
- <arg value="../libraries/restrictionchecker/jrc" />
- <arg value="-r" />
- <arg value="../${mainfolder}/${classes}" />
- <!--arg value="-jd" />
- <arg value="../libraries" /-->
- <arg value="-cp" />
- <arg value="${ecp}" />
- </exec>
- </target>
-
- <!-- = = = = = = = = = = = = = = = = =
- macrodef: concat-checksums
- Take checksum files located in the ${dist} directory, concatenate
- them into one file and delete the individual files.
- = = = = = = = = = = = = = = = = = -->
- <macrodef name="concat-checksums">
- <sequential>
- <concat destfile="${checksum.file}">
- <!-- If a configuration.MD5 file is already in the directory, ignore it -->
- <fileset dir="${dist}" excludes="${checksum.file.name}">
- <include name="**/*.MD5"/>
- </fileset>
- </concat>
- <delete>
- <fileset dir="${dist}" excludes="${checksum.file.name}">
- <include name="**/*.MD5"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
diff --git a/build_resources/ant/build.xml b/build_resources/ant/build.xml
deleted file mode 100644
index e722dedb75858428bca24bb06c75c5397a635b1a..0000000000000000000000000000000000000000
--- a/build_resources/ant/build.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<project name="build_resources" basedir="..">
- <import file="build-basic.xml" />
-
- <taskdef name="branch-and-tag-project"
- classname="ch.systemsx.cisd.ant.task.subversion.SVNBranchAndTagTask"
- classpathref="build-resource.path" />
- <taskdef name="checkout-project"
- classname="ch.systemsx.cisd.ant.task.subversion.SVNRecursiveCheckoutTask"
- classpathref="build-resource.path"/>
-
- <property name="repositoryRoot.default" value="svn+ssh://svncisd.ethz.ch/repos"/>
-
-
- <target name="checkout">
- <condition property="repositoryRoot" value="${repositoryRoot.default}">
- <not>
- <isset property="repositoryRoot" />
- </not>
- </condition>
- <condition property="group" value="cisd">
- <not>
- <isset property="group" />
- </not>
- </condition>
- <condition property="version" value="trunk">
- <not>
- <isset property="version" />
- </not>
- </condition>
- <condition property="revision" value="HEAD">
- <not>
- <isset property="revision" />
- </not>
- </condition>
- <condition property="dir" value=".">
- <not>
- <isset property="dir" />
- </not>
- </condition>
- <checkout-project repositoryRoot="${repositoryRoot}" group="${group}" name="${name}" version="${version}"
- revision="${revision}" dir="${dir}" />
- </target>
-
- <target name="branch">
- <condition property="repositoryRoot" value="${repositoryRoot.default}">
- <not>
- <isset property="repositoryRoot" />
- </not>
- </condition>
- <condition property="group" value="cisd">
- <not>
- <isset property="group" />
- </not>
- </condition>
- <condition property="revision" value="HEAD">
- <not>
- <isset property="revision" />
- </not>
- </condition>
- <branch-and-tag-project repositoryRoot="${repositoryRoot}" group="${group}" name="${name}"
- revision="${revision}" releaseBranch="${branch}" />
- </target>
-
- <target name="feature-branch">
- <condition property="repositoryRoot" value="${repositoryRoot.default}">
- <not>
- <isset property="repositoryRoot" />
- </not>
- </condition>
- <condition property="group" value="cisd">
- <not>
- <isset property="group" />
- </not>
- </condition>
- <condition property="revision" value="HEAD">
- <not>
- <isset property="revision" />
- </not>
- </condition>
- <branch-and-tag-project repositoryRoot="${repositoryRoot}" group="${group}" name="${name}"
- revision="${revision}" featureBranch="${branch}" />
- </target>
-
- <target name="tag">
- <condition property="repositoryRoot" value="${repositoryRoot.default}">
- <not>
- <isset property="repositoryRoot" />
- </not>
- </condition>
- <condition property="group" value="cisd">
- <not>
- <isset property="group" />
- </not>
- </condition>
- <branch-and-tag-project repositoryRoot="${repositoryRoot}" group="${group}" name="${name}"
- releaseTag="${tag}" />
- </target>
-
-
- <!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- Tag a project. Also a branch is created if necessary.
-
- Properties:
- name Name of the project. Mandatory
- tag Tag number. Mandatory
- group Group of the project. Default: cisd
- repositoryRoot URL of the root of the Subversion repository.
- Default: ${repositoryRoot.default}=svn+ssh://svncisd.ethz.ch/repos
- -->
- <target name="branch-and-tag">
- <condition property="repositoryRoot" value="${repositoryRoot.default}">
- <not>
- <isset property="repositoryRoot" />
- </not>
- </condition>
- <condition property="group" value="cisd">
- <not>
- <isset property="group" />
- </not>
- </condition>
- <branch-and-tag-project repositoryRoot="${repositoryRoot}" group="${group}" name="${name}"
- releaseTag="${tag}" branchIfNecessary="true" />
- </target>
-
- <!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- Tag a project. Also a branch is created if necessary.
-
- Properties:
- name Name of the project. Mandatory
- tag Tag number. Mandatory
- group Group of the project. Default: cisd
- repositoryRoot URL of the root of the Subversion repository.
- Default: ${repositoryRoot.default}=svn+ssh://svncisd.ethz.ch/repos
- -->
- <target name="tag-sprint">
- <condition property="repositoryRoot" value="${repositoryRoot.default}">
- <not>
- <isset property="repositoryRoot" />
- </not>
- </condition>
- <condition property="group" value="cisd">
- <not>
- <isset property="group" />
- </not>
- </condition>
- <branch-and-tag-project repositoryRoot="${repositoryRoot}" group="${group}" name="${name}"
- sprintTag="${tag}" branchIfNecessary="true" />
- </target>
-
-
- <target name="tag-release">
- <condition property="repositoryRoot" value="${repositoryRoot.default}">
- <not>
- <isset property="repositoryRoot" />
- </not>
- </condition>
- <condition property="group" value="cisd">
- <not>
- <isset property="group" />
- </not>
- </condition>
- <branch-and-tag-project repositoryRoot="${repositoryRoot}" group="${group}" name="${name}"
- releaseTag="${tag}" branchIfNecessary="true" />
- </target>
-
- <!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- Checks out a tagged version of a project and run the 'dist' target.
-
- Properties:
- name Name of the project. Mandatory
- version Version number. Default: trunk
- revision Revision. Default: HEAD
- dir Build directory. Default: .
- result.dir Folder which will contain the result. Mandatory
- group Group of the project. Default: cisd
- repositoryRoot URL of the root of the Subversion repository.
- Default: ${repositoryRoot.default}=svn+ssh://svncisd.ethz.ch/repos
- -->
- <target name="build" depends="checkout">
- <exec executable="ant" failonerror="true">
- <arg value="-lib"/>
- <arg value="${dir}/build_resources/lib/ecj.jar"/>
- <arg value="-f"/>
- <arg value="${dir}/${name}/build/build.xml"/>
- <arg value="dist"/>
- </exec>
- <copy todir="${result.dir}">
- <fileset dir="${dir}/${name}/${dist}"/>
- </copy>
- </target>
-
- <target name="build-target" depends="checkout">
- <exec executable="ant" failonerror="true">
- <arg value="-lib"/>
- <arg value="${dir}/build_resources/lib/ecj.jar"/>
- <arg value="-f"/>
- <arg value="${dir}/${name}/build/build.xml"/>
- <arg value="${target}"/>
- </exec>
- <copy todir="${result.dir}">
- <fileset dir="${dir}/${name}/${dist}"/>
- </copy>
- </target>
-
-</project>
diff --git a/build_resources/branch.sh b/build_resources/branch.sh
deleted file mode 100755
index 566ae13d5a5a2327740fb3933e4fdc99613a9c54..0000000000000000000000000000000000000000
--- a/build_resources/branch.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "Usage is $0 <project name> <branch> [<revision>]"
- exit 1
-fi
-
-name=$1
-branch=$2
-if [ "$3" != "" ]; then
- revision=$3
-else
- revision=HEAD
-fi
-
-dir=`dirname $0`
-ant -f $dir/ant/build.xml -Dname=$name -Dbranch=$branch -Drevision=$revision branch
diff --git a/build_resources/build.sh b/build_resources/build.sh
deleted file mode 100755
index 4b385cde829898576e233ed12a2916c51c2f258d..0000000000000000000000000000000000000000
--- a/build_resources/build.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-usage()
-{
- echo ""
- echo "Usage: ./build.sh [--publish <local ivy repository>] openbis|apis|<project> [trunk|sprint] [<sprint version>]"
- echo ""
- echo "Example: ./build.sh cifex" - will build cifex installer from trunk
- echo "Example: ./build.sh apis sprint" - will build openBIS clients and APIs package from latest released sprint.
- echo "Example: ./build.sh openbis sprint S178" - will build the openBIS installer from latest revision of sprint S178.
- echo "Example: ./build.sh apis sprint S178.1" - will build openBIS clients and APIs package from revision 1 of sprint S178.
- echo "Example: ./build.sh --publish ~/dev/eclipse-workspace/ivy-repository base sprint" - will build base from latest sprint release and publish it.
- echo ""
- echo "NOTE:"
- echo " 1. This script can be used to build openBIS starting from S178. Earlier versions need to be built with ./build_ant.sh"
- echo " 2. The publish option is currently not supported for openbis and apis"
- exit 1
-}
-
-if [ $# -lt 1 ]; then
- usage
-fi
-
-DIR=`dirname $0`
-
-if [ "$1" == "--publish" ]; then
- if [ $# -lt 3 ]; then
- usage
- fi
- project=$3
-else
- project=$1
-fi
-
-if [ "$project" == "openbis" ] || [ "$project" == "apis" ]; then
- if [ "$1" == "--publish" ]; then
- shift 2
- fi
- ${DIR}/gradle/build_openbis.sh $@
-else
- ${DIR}/gradle/build_project.sh $@
-fi
-
-exit 0
diff --git a/build_resources/build_ant.sh b/build_resources/build_ant.sh
deleted file mode 100755
index 81d8ab6ccbf169d8ffbe78efed1d7d943fc9e819..0000000000000000000000000000000000000000
--- a/build_resources/build_ant.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-if [ $# -eq 0 ]; then
- echo "Usage is $0 [--revision <revision>] <project name> [<version>]"
- exit 1
-fi
-
-repository=svn+ssh://svncisd.ethz.ch/repos
-if [ "$1" = "--revision" ]; then
- shift
- revision="$1"
- shift
-else
- revision="HEAD"
-fi
-
-name=$1
-version=trunk
-if [ $# -gt 1 ]; then
- version=$2
-fi
-
-dir=`dirname $0`
-cdir=`pwd`
-build_dir=$cdir/tmp
-
-rm -rf $build_dir
-mkdir $build_dir
-ant -lib $dir/lib/ecj.jar -f $dir/ant/build.xml \
- -DrepositoryRoot=$repository \
- -Dname=$name \
- -Drevision=$revision \
- -Dversion=$version \
- -Ddir=$build_dir \
- -Dresult.dir=$cdir \
- build
diff --git a/build_resources/build_stage.sh b/build_resources/build_stage.sh
deleted file mode 100755
index 465196af70080ca1a9f265b5b751ae53613474a5..0000000000000000000000000000000000000000
--- a/build_resources/build_stage.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-# Builds the software components, uploads them to sprint server
-# and places a copy of them on the sprint server ready for installation.
-#
-# This script assumes that you have a SSH access on 'sprint-openbis.ethz.ch'.
-# This is typically configured in the SSH config file.
-
-if [ $# -lt 1 ]; then
- echo "Usage: $0 <year.month.x>"
- echo "Example: $0 13.04.x"
- exit 1
-fi
-
-TODAY=`date "+%Y-%m-%d"`
-VER=$1
-FULL_VER=$VER.stage
-SPRINT_SERVER=sprint-openbis.ethz.ch
-
-# Unset this to do a dry-run (like rsync -n) and set it to actually execute the commands
-# unset EXECUTE_COMMANDS
-EXECUTE_COMMANDS=1
-
-function state_start {
- echo "----------------------------------------------------------------------"
- echo -n "| "
- echo $1
- echo ""
-}
-
-function state_end {
- echo "\ -----------------------------------"
- echo ""
-}
-
-function setup {
- state_start Setup
- echo "svn checkout svn+ssh://svncisd.ethz.ch/repos/cisd/build_resources/trunk build_resources"
- if [ $EXECUTE_COMMANDS ]; then
- svn checkout svn+ssh://svncisd.ethz.ch/repos/cisd/build_resources/trunk build_resources
- fi
-
- echo "cd build_resources"
- if [ $EXECUTE_COMMANDS ]; then
- cd build_resources
- fi
- state_end
-}
-
-function build {
- state_start "Building openBIS..."
-
- echo "./build.sh openbis_all $FULL_VER"
- if [ $EXECUTE_COMMANDS ]; then
- ./build.sh openbis_all $FULL_VER
- fi
- state_end
-}
-
-function copy_to_cisd_server {
- state_start "Copying new openBIS components to sprint-builds'..."
-
- if [ $EXECUTE_COMMANDS ]; then
-
- OPENBIS_PATH=~openbis/fileserver/sprint_builds/openBIS
- SPRINT_DIR=$OPENBIS_PATH/$TODAY-$FULL_VER
- mkdir -p $SPRINT_DIR
- cp -p *$VER*.{zip,gz,jar} $SPRINT_DIR/
- cp -p *knime*.jar $SPRINT_DIR/
- chmod g+w -R $SPRINT_DIR
- fi
- state_end
-}
-
-if [ $EXECUTE_COMMANDS ]; then
- echo -n
-else
- state_start "RUNNING DRY RUN"
-fi
-
-setup
-build
-copy_to_cisd_server
-
-state_start Done!
diff --git a/build_resources/checkstyle/cisd_checkstyle.xml b/build_resources/checkstyle/cisd_checkstyle.xml
deleted file mode 100644
index 4bb3fa4bcfcd82049875813430b1b56933fd416d..0000000000000000000000000000000000000000
--- a/build_resources/checkstyle/cisd_checkstyle.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
- Checkstyle-Configuration: CISD Checks
- Description:
-CISD mandatory checks.
--->
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="TreeWalker">
- <module name="LeftCurly">
- <property name="option" value="nl"/>
- <property name="maxLineLength" value="120"/>
- </module>
- <module name="RightCurly"/>
- <module name="ConstantName">
- <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$|^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*(V[0-9]+_[0-9]+)?$"/>
- </module>
- <module name="PackageName">
- <property name="format" value="^[a-z]+(\.[a-z][a-z0-9_]*)*$"/>
- </module>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName">
- <property name="format" value="^[A-Z][a-zA-Z0-9]*(V[0-9]+_([0-9]+|X))?(Test)?$"/>
- </module>
- <module name="EmptyForInitializerPad">
- <property name="option" value="space"/>
- </module>
- <module name="JavadocType">
- <property name="severity" value="ignore"/>
- </module>
- <module name="JavadocStyle">
- <property name="severity" value="ignore"/>
- </module>
- <module name="JavadocType">
- <property name="severity" value="ignore"/>
- </module>
- <module name="EmptyForIteratorPad">
- <property name="option" value="space"/>
- </module>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
- </module>
- <module name="NoWhitespaceBefore">
- <property name="allowLineBreaks" value="true"/>
- <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
- </module>
- <module name="TabCharacter"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
- </module>
- <module name="EqualsHashCode">
- <property name="severity" value="ignore"/>
- </module>
- <module name="EmptyStatement">
- <property name="severity" value="ignore"/>
- </module>
- <module name="DefaultComesLast"/>
- <module name="CovariantEquals"/>
- <module name="ParameterAssignment"/>
- <module name="MultipleVariableDeclarations"/>
- <module name="MultipleStringLiterals">
- <property name="severity" value="ignore"/>
- </module>
- <module name="ModifiedControlVariable"/>
- <module name="InnerAssignment"/>
- <module name="SimplifyBooleanExpression">
- <property name="severity" value="ignore"/>
- </module>
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <module name="InterfaceIsType"/>
- <module name="MutableException">
- <property name="format" value="^.*Exception$|^.*Error.*$"/>
- </module>
- <module name="VisibilityModifier">
- <property name="packageAllowed" value="true"/>
- <property name="protectedAllowed" value="true"/>
- </module>
- <module name="UpperEll"/>
- <module name="ModifierOrder">
- <property name="severity" value="ignore"/>
- </module>
- <module name="RedundantModifier">
- <property name="severity" value="ignore"/>
- </module>
- <module name="HiddenField">
- <property name="tokens" value="VARIABLE_DEF"/>
- </module>
- <module name="RegexpHeader">
- <property name="header" value="/\*\n \* Copyright 2[0-9]{3}.+\n \*\n \* Licensed under .+"/>
- </module>
- </module>
-</module>
diff --git a/build_resources/featurebranch.sh b/build_resources/featurebranch.sh
deleted file mode 100755
index ef5730bc97f67c9d5f7d202dcc32cf7862326956..0000000000000000000000000000000000000000
--- a/build_resources/featurebranch.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "Usage is $0 <project name> <branch> [<revision>]"
- exit 1
-fi
-
-name=$1
-branch=$2
-if [ "$3" != "" ]; then
- revision=$3
-else
- revision=HEAD
-fi
-
-dir=`dirname $0`
-ant -f $dir/ant/build.xml -Dname=$name -Dbranch=$branch -Drevision=$revision feature-branch
diff --git a/build_resources/gradle/build_openbis.sh b/build_resources/gradle/build_openbis.sh
deleted file mode 100755
index 9433d019a5c90c4612fb276f0c06596d23b9178b..0000000000000000000000000000000000000000
--- a/build_resources/gradle/build_openbis.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-
-PRODUCT=$1
-BRANCH=$2
-VERSION=$3
-
-PROJECTS="\
-gradle \
-authentication \
-common \
-datamover \
-datastore_server \
-dbmigration \
-deep_sequencing_unit \
-image_readers \
-installation \
-integration-tests \
-js-test \
-openbis \
-openbis_all \
-openbis_api \
-openbis_standard_technologies \
-openbis-common \
-plasmid \
-rtd_cina \
-rtd_phosphonetx \
-rtd_yeastx \
-sanofi \
-screening \
-ui-test\
-"
-LATEST_SPRINT=`svn list svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/branches/sprint/|awk '{print $0, length()}'|sort -n --key=2|awk '{print $1'}|tail -1|sed -e "s/.x\///g"`
-
-rm -rf /tmp/gradle-build
-mkdir -p /tmp/gradle-build
-
-for project in $PROJECTS; do
-
- if [[ -z "$BRANCH" ]]
- then
- BRANCH=trunk
- fi
-
- if [ "$BRANCH" == "trunk" ]
- then
- SVN_PATH="${project}/trunk"
- elif [ "$BRANCH" == "stage" ]
- then
- SVN_PATH="openbis_all/branches/stage/15.xx.x/${project}"
- elif [ "$BRANCH" == "sprint" ]
- then
- if [[ -z "$VERSION" ]]
- then
- VERSION=$LATEST_SPRINT
- fi
-
- if [[ $VERSION == *.* ]]
- then
- TAG=${VERSION}/
- VERSION=`echo $VERSION|cut -d. -f1`
- else
- TAG=`svn list svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/tags/sprint/${VERSION}.x/|awk '{print $0, length()}'|sort -n --key=2|awk '{print $1'}|tail -1`
- fi
-
- SVN_PATH="openbis_all/tags/sprint/${VERSION}.x/${TAG}${project}"
-
- svn ls svn+ssh://svncisd.ethz.ch/repos/cisd/$SVN_PATH --depth=empty 2>/dev/null >/dev/null
- if [ $? -ne 0 ]
- then
- echo "Unable to read svn+ssh://svncisd.ethz.ch/repos/cisd/$SVN_PATH - aborting"
- exit 1
- fi
- else
- echo "Unknown branch $BRANCH (valid options: trunk / sprint)"
- exit 1
- fi
-
- svn co svn+ssh://svncisd.ethz.ch/repos/cisd/$SVN_PATH /tmp/gradle-build/${project}
-done
-
-pushd .
-cd /tmp/gradle-build/gradle
-
-if [ "$PRODUCT" == "openbis" ]
-then
- ./gradlew :installation:build -x test
- popd
- mv /tmp/gradle-build/installation/targets/gradle/distributions/*.tar.gz .
-else
- ./gradlew :openbis_standard_technologies:clientsAndApis -x test
- popd
- mv /tmp/gradle-build/openbis_standard_technologies/targets/gradle/distributions/openBIS-clients-and-APIs*.zip .
-fi
-
-
diff --git a/build_resources/gradle/build_project.sh b/build_resources/gradle/build_project.sh
deleted file mode 100755
index 4db935d6c7656b8db1d4673127d8b10173be1b25..0000000000000000000000000000000000000000
--- a/build_resources/gradle/build_project.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-IVY_REPO=""
-if [ "$1" == "--publish" ]; then
- IVY_REPO="$2"
- shift 2
-fi
-
-
-PROJECT=$1
-BRANCH=$2
-VERSION=$3
-
-BUILDING_SITE="/tmp/gradle-build"
-
-BASE=`dirname "$0"`
-if [ ${BASE#/} == ${BASE} ]; then
- BASE="`pwd`/${BASE}"
-fi
-source $BASE/utilities.sh
-
-template_url=$(calculate_repository_template_url $PROJECT $BRANCH $VERSION)
-echo "Repository Template URL: $template_url"
-if [[ -z "$template_url" ]]; then
- exit 1
-fi
-
-rm -rf "$BUILDING_SITE"
-
-
-checkout()
-{
- local project=$1
-
- echo svn co ${template_url/__project__/$project} -q "$BUILDING_SITE/$project"
- svn co ${template_url/__project__/$project} -q "$BUILDING_SITE/$project"
-}
-
-#
-# Retrieve main project
-#
-checkout $PROJECT
-settings_gradle_file="$BUILDING_SITE/$PROJECT/settings.gradle"
-if [ ! -f "$settings_gradle_file" ]; then
- echo "Building stopped because no file settings.gradle found in ${TEMPLATE_URL/__project__/$PROJECT}."
- exit 1
-fi
-
-projects=`awk '/includeFlat/ {line=substr($0,12); while(match(line,",[\t ]*$")) {getline;line=(line $0)}; gsub(",", " ", line); gsub("'\''", "", line); print line}' "$settings_gradle_file"`
-for project in $projects; do
- if [[ $project != $PROJECT ]]; then
- checkout $project
- fi
-done
-checkout gradle
-
-pushd .
-target=build
-if [ "$IVY_REPO" != "" ]; then
- target=publish
- if [ ${IVY_REPO:0:1} != "/" ]; then
- IVY_REPO="$PWD/$IVY_REPO"
- fi
-fi
-cd "$BUILDING_SITE/$PROJECT"
-./gradlew --gradle-user-home "$BUILDING_SITE" $target -x test -PivyRepository="$IVY_REPO"
-popd
-if [ -d "$BUILDING_SITE/$PROJECT/targets/gradle/distributions" ]; then
- for f in "$BUILDING_SITE/$PROJECT/targets/gradle/distributions/*"; do
- mv $f .
- done
-fi
-
-
diff --git a/build_resources/gradle/utilities.sh b/build_resources/gradle/utilities.sh
deleted file mode 100644
index 07e30245b5e2c7e4bb376cea75838573f3407ac4..0000000000000000000000000000000000000000
--- a/build_resources/gradle/utilities.sh
+++ /dev/null
@@ -1,445 +0,0 @@
-SVN_CMD=svn
-SVN_MUCC=svnmucc
-REPOSITORY_URL="svn+ssh://svncisd.ethz.ch/repos/cisd"
-
-SPRINT_VERSION_REGEX="^(S([0-9]+)(\.([0-9]+))?)?$"
-RELEASE_VERSION_REGEX="^(([0-9]+.[01][0-9])(\.([0-9]+))?)?$"
-
-#
-# Asserts specified project exists in the repository. Otherwise the script is terminated.
-#
-assert_valid_project()
-{
- local project=$1
-
- if [ $(_path_exists $project) == FALSE ]; then
- _error "Unknown project: $project"
- _exit_on_error
- fi
-}
-
-#
-# Asserts specified sprint version/tag is valid. Otherwise the script is terminated.
-#
-# As a side effect BASH_REMATCH[2] and BASH_REMATCH[4] are set with version and patch number, respectively.
-#
-assert_valid_sprint_version_tag()
-{
- local version_tag=$1
-
- if [[ ! $version_tag =~ $SPRINT_VERSION_REGEX ]]; then
- _error "Sprint version/tag is not of form S<version number>[.<patch number>]: $version_tag"
- _error "Valid examples: S23.12, S108, S156.8"
- _exit_on_error
- fi
-}
-
-#
-# Asserts specified release version/tag is valid. Otherwise the script is terminated.
-#
-# As a side effect BASH_REMATCH[2] and BASH_REMATCH[4] are set with version and patch number, respectively.
-#
-assert_valid_release_version_tag()
-{
- local version_tag=$1
-
- if [[ ! $version_tag =~ $RELEASE_VERSION_REGEX ]]; then
- _error "Release version/tag is not of form <year>.<month>[.<patch number>]: $version_tag"
- _error "Valid examples: 9.12, 13.04, 13.04.2, 10.06.13"
- _exit_on_error
- fi
-}
-
-#
-# Returns specified version number if it is not an empty string.
-# If undefined the latest sprint version of the specified project is read from the repository.
-# This version number increased by one will be returned.
-#
-# This function should be used as follows:
-# sprint_version=$(get_sprint_version $project $version_number)
-#
-get_sprint_version()
-{
- local project=$1
- local version_number=$2
-
- if [ "$version_number" == "" ]; then
- latest=$(_get_latest_sprint_version $project)
- if [ "$latest" == "" ]; then
- echo 1
- else
- echo $(($latest + 1))
- fi
- else
- echo "$version_number"
- fi
-}
-
-#
-# Returns specified release number if it is not an empty string.
-# If undefined the current year and month will be returned in the form <2-digit year>.<2-digit month>.
-#
-# This function should be used as follows:
-# release_version=$(get_release_version $version_number)
-#
-get_release_version()
-{
- local version_number=$1
-
- if [ "$version_number" == "" ]; then
- echo `date "+%y.%m"`
- else
- echo "$version_number"
- fi
-}
-
-#
-# Returns specified patch number if it is not an empty string.
-# If undefined the latest tagged version of the specified project for the specified branch
-# is read from the repository. This patch number increased by one will be returned.
-#
-# This function should be used as follows:
-# patch=$(get_patch_number $project $branch $version $patch_number)
-#
-get_patch_number()
-{
- local project=$1
- local branch=$2
- local version=$3
- local patch_number=$4
-
- if [ "$patch_number" == "" ]; then
- local path=$project/tags/$branch/$version.x
- echo "PATH:$path" >&2
- if [ $(_path_exists $path) == TRUE ]; then
- latest=$(_get_latest_patch_number $project $branch $version)
- if [ "$latest" == "" ]; then
- echo 0
- else
- echo $(($latest + 1))
- fi
- else
- echo 0
- fi
- else
- echo $patch_number
- fi
-}
-
-#
-# Creates specified branch for specified project if it not already exists.
-# Copies main project and all dependent project (determined by file 'settings.gradle' of main project)
-# from trunk into the new branch. Also library dependencies in gradle files are freezed.
-#
-create_branch_if_necessary()
-{
- local project=$1
- local branch=$2
- local version=$3
-
- local dir_name=$version.x
- local path="$project/branches/$branch/$dir_name"
- if [ $(_path_exists $path) == FALSE ]; then
- _start_batch
- _mkdir "$path"
- local projects="$(_list_projects "$project/trunk") $project gradle build_resources"
- for p in $projects; do
- _batch cp "$REPOSITORY_URL/$p/trunk" "$REPOSITORY_URL/$path/$p"
- done
- local log_message="Create $branch branch '$dir_name' for project $project"
- echo $log_message
- _submit_batch "$log_message"
- rm -rf tmp-checkout
- mkdir -p tmp-checkout
- _svn_with_echo -q checkout "$REPOSITORY_URL/$path" tmp-checkout
- for p in $projects; do
- cd "tmp-checkout/$p"
- if [ -f gradlew ] && [ "$p" != "gradle" ]; then
- echo "======== freeze library dependencies for project $p"
- ./gradlew dependencyReport
- if [ -f targets/gradle/reports/project/dependencies.txt ]; then
- cat targets/gradle/reports/project/dependencies.txt|egrep ^.---|grep \>|sort|uniq\
- |awk '{print $2 ":" $4}'|awk -F: '{print "s/" $1 ":" $2 ":" $3 "/" $1 ":" $2 ":" $4 "/g"}' > sed_commands;
- for file in *.gradle; do
- if [ -s $file ]; then
- sed -f sed_commands $file > $file.tmp
- mv $file.tmp $file
- fi
- done
- rm sed_commands
- fi
- echo "======== library dependencies for project $p are freezed"
- fi
- cd -
- done
- cd tmp-checkout
- _svn_with_echo commit -m "freeze dependencies of projects in $path"
- cd -
- rm -rf tmp-checkout
- fi
-}
-
-#
-# Tags the specified branch of specified project.
-# Creates <project>/tags/<branch>/<version>.x and copies to this folder
-# the branch <project>/branch/<branch>/<version>.x as tag <version>.<patch number>
-#
-copy_branch_to_tag()
-{
- local project=$1
- local branch=$2
- local version=$3
- local patch_number=$4
-
- local dir_name=$version.x
- local tag_name=$version.$patch_number
- local path="$project/tags/$branch/$dir_name"
- if [ $(_path_exists "$path/$tag_name") == TRUE ]; then
- _error "There exists already a $branch tag '$tag_name' for project $project."
- _error "You can use the branch version '$version' without specifying the patch number."
- _error "The tagging script will find out the next available patch number."
- _exit_on_error
- fi
- _start_batch
- _mkdir "$path"
- _batch cp "$REPOSITORY_URL/$project/branches/$branch/$dir_name" "$REPOSITORY_URL/$path/$tag_name"
- local log_message="Create $branch tag '$tag_name' for project $project"
- echo $log_message
- _submit_batch "$log_message"
-}
-
-#
-# Calculates the template for the repository URL. The template contains '__project__' which will
-# be the place holder for the projects to be checked out.
-#
-# This function should be used as follows:
-# template=$(calculate_repository_template_url $project $branch $version)
-#
-# In case of an error an empty string is returned.
-#
-calculate_repository_template_url()
-{
- local project=$1
- local branch=$2
- local version=$3
-
- assert_valid_project $project
- if [[ -z "$branch" ]]; then
- branch="trunk"
- fi
- if [ "$branch" == "trunk" ]; then
- echo "$REPOSITORY_URL/__project__/trunk"
- else
- if [[ "$version" == *.x ]]; then
- local path="$REPOSITORY_URL/$project/branches/$branch/$version"
- if [ $(_path_exists $path) == FALSE ]; then
- _error "Unknown version '$version' in $branch branch for project $project."
- _exit_on_error
- fi
- echo "$REPOSITORY_URL/$project/branches/$branch/$version/__project__"
- else
- if [[ "$branch" != "sprint" && -z "$version" ]]; then
- _error "Missing version argument. Needed for $branch branch."
- _exit_on_error
- else
- if [[ -z "$version" ]]; then
- version=S$(_get_latest_sprint_version $project)
- fi
- if [[ "$version" == S*.* || "$version" == *.*.* ]]; then
- local tag="$version"
- version=${version%.*}
- else
- local path=$project/tags/$branch/$version.x
- if [ $(_path_exists $path) == FALSE ]; then
- _error "No tags exists for version '$version' of $branch branch for project $project."
- _exit_on_error
- fi
- local tag=$version.$(_get_latest_patch_number $project $branch $version)
- fi
- fi
- local path=$project/tags/$branch/$version.x/$tag
- if [ $(_path_exists $path) == FALSE ]; then
- _error "Unknown tag '$tag' in $branch branch for project $project."
- _exit_on_error
- fi
- echo "$REPOSITORY_URL/$path/__project__"
- fi
- fi
-
-}
-
-################################### private functions (only used in this script) ################
-
-_start_batch()
-{
- tag_batch_command_count=0
-}
-
-_mkdir()
-{
- local path=$1
-
- local paths=()
- while [ $(_path_exists $path) == FALSE ]; do
- paths[${#paths[*]}]=$path
- local path=${path%/*}
- done
- for ((i=$((${#paths[*]} - 1)); i >= 0; i--)); do
- _batch mkdir "$REPOSITORY_URL/${paths[$i]}"
- done
-}
-
-_batch()
-{
- eval "tag_batch_command$tag_batch_command_count=(\"\$@\")"
- tag_batch_command_count=$(($tag_batch_command_count + 1))
-}
-
-_submit_batch()
-{
- local log_message=$1
-
- if [ $SVN_MUCC_AVAILABLE == TRUE ]; then
- tag_batch_command_mucc=(--message "$log_message")
- for ((i=0; i < $tag_batch_command_count; i++)); do
- eval "_add_mucc_command_item \"\${tag_batch_command$i[@]}\""
- done
- _echo "$SVN_MUCC" "${tag_batch_command_mucc[@]}"
- "$SVN_MUCC" "${tag_batch_command_mucc[@]}"
- else
- for ((i=0; i < $tag_batch_command_count; i++)); do
- eval "_svn_with_logmessage \"\$log_message\" \"\${tag_batch_command$i[@]}\""
- done
- fi
-}
-
-_add_mucc_command_item()
-{
- local cmd=$1
- shift
-
- tag_batch_command_mucc[${#tag_batch_command_mucc[*]}]=$cmd
- if [[ $cmd == "cp" ]]; then
- tag_batch_command_mucc[${#tag_batch_command_mucc[*]}]="HEAD"
- fi
- for item in "$@"; do
- tag_batch_command_mucc[${#tag_batch_command_mucc[*]}]="$item"
- done
-}
-
-_get_latest_sprint_version()
-{
- local project=$1
-
- _list_branches $project sprint|awk -F. '{print substr($1,2)}'|sort -nr|head -1
-}
-
-_get_latest_patch_number()
-{
- local project=$1
- local branch=$2
- local version=$3
-
- _list_folder $project/tags/$branch/$version.x|cut -d/ -f1|awk -F. '{print $NF}'|sort -nr|head -1
-}
-
-_list_branches()
-{
- local project=$1
- local branch_type=$2
-
- local path="$project/branches/$branch_type"
- if [ $(_path_exists $path) == TRUE ]; then
- _list_folder "$path"
- fi
-}
-
-_path_exists()
-{
- local path=$1
-
- _list_folder $path > /dev/null 2>&1
- if [ $? == 0 ]; then
- echo TRUE
- else
- echo FALSE
- fi
-}
-
-_list_folder()
-{
- local path=$1
-
- "$SVN_CMD" list --non-interactive "$REPOSITORY_URL/$path"
-}
-
-_list_projects()
-{
- local path=$1
-
- settings_gradle=`"$SVN_CMD" cat --non-interactive "$REPOSITORY_URL/$path/settings.gradle"`
- echo $settings_gradle|awk '/includeFlat/ {line=substr($0,12); while(match(line,",[\t ]*$")) {getline;line=(line $0)}; gsub(",", " ", line); gsub("'\''", "", line); print line}'
-}
-
-_svn_with_logmessage()
-{
- local log_message=$1
- local cmd=$2
- shift 2
-
- _svn_with_echo $cmd --message "$log_message" "$@"
-}
-
-_svn_with_echo()
-{
- _echo "$SVN_CMD" --non-interactive "$@"
- "$SVN_CMD" --non-interactive "$@"
-}
-
-_echo()
-{
- for item in "$@"; do
- echo -n "\"$item\" "
- done
- echo
-}
-
-_assert_repository()
-{
- "$SVN_CMD" -q --non-interactive --version > /dev/null
- if [ $? != 0 ]; then
- _error "Subversion client client '$SVN_CMD' not available"
- _error "Please make Subversion command line client available or set variable SVN_CMD in script '${BASH_SOURCE[0]}' correctly."
- _exit_on_error
- fi
- "$SVN_CMD" info --non-interactive "$REPOSITORY_URL" > /dev/null
- if [ $? != 0 ]; then
- _error "Subversion repository '$REPOSITORY_URL' not available"
- _error "Please check that the variable REPOSITORY_URL in script '${BASH_SOURCE[0]}' is set correctly."
- _exit_on_error
- fi
- "$SVN_MUCC" --help > /dev/null 2>&1
- if [ $? == 0 ]; then
- SVN_MUCC_AVAILABLE=TRUE
- echo "Command '$SVN_MUCC' available."
- else
- SVN_MUCC_AVAILABLE=FALSE
- echo "Command '$SVN_MUCC' not available."
- echo -n "The command 'svnmucc' allows to create and copy several folders in the repository "
- echo "in one transaction leading to only one new revision."
- fi
-}
-
-_error()
-{
- echo "ERROR> $@" >&2
-}
-
-_exit_on_error()
-{
- exit 1
-}
-
-_assert_repository
-
-
diff --git a/build_resources/lib/cisd-ant-tasks.jar b/build_resources/lib/cisd-ant-tasks.jar
deleted file mode 100644
index 50d77a8ce73d28457fbcd6c8c1593402f20167d5..0000000000000000000000000000000000000000
Binary files a/build_resources/lib/cisd-ant-tasks.jar and /dev/null differ
diff --git a/build_resources/lib/ecj-version.txt b/build_resources/lib/ecj-version.txt
deleted file mode 100644
index f2807196747ffcee4ae8a36604b9cff7ebeed9ca..0000000000000000000000000000000000000000
--- a/build_resources/lib/ecj-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.8.1
diff --git a/build_resources/lib/ecj.jar b/build_resources/lib/ecj.jar
deleted file mode 100644
index cf54808b51a1f17ebfb6f2028fb0ad205ee668d4..0000000000000000000000000000000000000000
Binary files a/build_resources/lib/ecj.jar and /dev/null differ
diff --git a/build_resources/tag.sh b/build_resources/tag.sh
deleted file mode 100755
index 773eb146a637b8e8b4cf91ee459f0683b1b36b33..0000000000000000000000000000000000000000
--- a/build_resources/tag.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-if [ $# -lt 2 ]; then
- echo
- echo "Usage: $0 <project name> <branch> [<version>[.<patch number>]]"
- echo
- echo "Creates a tagged version of the specified project. If necessary a branch is created first."
- echo "It will contain the project itself, all its sub-projects"
- echo "as defined in file 'settings.gradle' of the project as well as 'build_resources' and 'gradle'."
- echo
- echo "Currently only the sprint and release branched can be tagged."
- echo "If <patch number> is undefined the next available patch number is used."
- echo "If <version> is undefined the next available version number is used in case of sprint branch."
- echo -n "In case of release branch the current date is used to create a version of "
- echo "the form <2-digit year>.<2-digit month>."
- echo
- echo "NOTE: Sprint versions have to start with an 'S'."
- echo
- echo "Examples:"
- echo "$0 datamover sprint"
- echo "$0 datamover sprint S184"
- echo "$0 datamover sprint S184.2"
- echo "$0 datamover release"
- echo "$0 datamover release 10.06"
- echo "$0 datamover release 10.06.13"
- exit 1
-fi
-
-PROJECT=$1
-BRANCH=$2
-VERSION_TAG=$3
-
-BASE=`dirname "$0"`
-if [ ${BASE#/} == ${BASE} ]; then
- BASE="`pwd`/${BASE}"
-fi
-source $BASE/gradle/utilities.sh
-
-assert_valid_project $PROJECT
-if [[ "$BRANCH" == "sprint" ]]; then
- assert_valid_sprint_version_tag $VERSION_TAG
- version=S$(get_sprint_version $PROJECT ${BASH_REMATCH[2]})
-elif [[ "$BRANCH" == "release" ]]; then
- assert_valid_release_version_tag $VERSION_TAG
- version=$(get_release_version ${BASH_REMATCH[2]})
-else
- echo "Tagging of branch '$BRANCH' not supported."
- exit 1
-fi
-patch=$(get_patch_number $PROJECT $BRANCH $version ${BASH_REMATCH[4]})
-echo "$BRANCH version:$version, patch number:$patch"
-create_branch_if_necessary $PROJECT $BRANCH $version
-copy_branch_to_tag $PROJECT $BRANCH $version $patch
\ No newline at end of file
diff --git a/build_resources/tag_release.sh b/build_resources/tag_release.sh
deleted file mode 100755
index 20985fd859b90e2527cd145fd805d662d1fe8eff..0000000000000000000000000000000000000000
--- a/build_resources/tag_release.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-if [ $# -ne 2 ]; then
- echo "Usage is $0 <project name> <release_tag>"
- exit 1
-fi
-
-name=$1
-tag=$2
-
-dir=`dirname $0`
-ant -f $dir/ant/build.xml -Dname=$name -Dtag=$tag tag-release