From 9fa83843558990ea495e1bd4b1cbf667b810fdb5 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 22 四月 2025 11:49:13 +0800 Subject: [PATCH] 1、gitignore文件规范;2、remote模块去除依赖;3、sso模块找回文件。 --- pipIrr-platform/pipIrr-web/pipIrr-web-gis/.gitignore | 1 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/.gitignore | 1 pipIrr-platform/pipIrr-common/.gitignore | 33 ++++ pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore | 1 pipIrr-platform/pipIrr-web/pipIrr-web-sso/.gitignore | 2 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore | 1 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/.gitignore | 1 pipIrr-platform/pipIrr-web/pipIrr-web-file/.gitignore | 1 pipIrr-platform/pipIrr-web/.gitignore | 33 ++++ pipIrr-platform/pipIrr-web/pipIrr-web-base/.gitignore | 1 pipIrr-platform/pipIrr-web/pipIrr-web-remote/.gitignore | 1 pipIrr-platform/.gitignore | 35 ++++ pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/.gitignore | 1 pipIrr-platform/pipIrr-web/pipIrr-web-sso/mvnw | 308 ++++++++++++++++++++++++++++++++++++++ pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml | 9 - pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore | 1 pipIrr-platform/pipIrr-web/pipIrr-web-project/.gitignore | 1 pipIrr-platform/pipIrr-web/pipIrr-web-sell/.gitignore | 1 pipIrr-platform/pipIrr-global/.gitignore | 33 ++++ pipIrr-platform/pipIrr-mw/.gitignore | 1 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/.gitignore | 1 21 files changed, 436 insertions(+), 31 deletions(-) diff --git a/pipIrr-platform/.gitignore b/pipIrr-platform/.gitignore index f54b775..549e00a 100644 --- a/pipIrr-platform/.gitignore +++ b/pipIrr-platform/.gitignore @@ -1,4 +1,33 @@ +HELP.md target/ -/pipIrr-platform.iml -/pipIrr-parent.iml -/鏂囨。/~$pIrr鎺ュ彛.docx +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/pipIrr-platform/pipIrr-common/.gitignore b/pipIrr-platform/pipIrr-common/.gitignore index dd8d0d1..549e00a 100644 --- a/pipIrr-platform/pipIrr-common/.gitignore +++ b/pipIrr-platform/pipIrr-common/.gitignore @@ -1,2 +1,33 @@ +HELP.md target/ -/pipIrr-common.iml +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/pipIrr-platform/pipIrr-global/.gitignore b/pipIrr-platform/pipIrr-global/.gitignore index bc1fdd3..549e00a 100644 --- a/pipIrr-platform/pipIrr-global/.gitignore +++ b/pipIrr-platform/pipIrr-global/.gitignore @@ -1,2 +1,33 @@ +HELP.md target/ -/pipIrr-global.iml \ No newline at end of file +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/pipIrr-platform/pipIrr-mw/.gitignore b/pipIrr-platform/pipIrr-mw/.gitignore index 95a2783..549e00a 100644 --- a/pipIrr-platform/pipIrr-mw/.gitignore +++ b/pipIrr-platform/pipIrr-mw/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-mw.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/.gitignore index cbb8325..549e00a 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/.gitignore +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-mw-rtu.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore index 85c2a88..549e00a 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-mw-rtu3rd.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/.gitignore index a66824f..549e00a 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/.gitignore +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-mw-simulate-rtu.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore index c1be7d5..549e00a 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-mw-simulate-rtu202404.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/.gitignore index 99e214e..549e00a 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/.gitignore +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-mwTest-client.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore index afe3d20..549e00a 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-mwTest-server.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/.gitignore b/pipIrr-platform/pipIrr-web/.gitignore index 14569d5..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/.gitignore +++ b/pipIrr-platform/pipIrr-web/.gitignore @@ -1,2 +1,33 @@ +HELP.md target/ -pipIrr-web.iml +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-base/.gitignore index 6452900..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-web-base.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-file/.gitignore index 7667296..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-web-file.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/.gitignore index df7fb40..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-web-gis.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-project/.gitignore index f80a40f..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-web-sell.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/.gitignore index 3d5de73..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-web-remote.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml index 728d920..1363c26 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml @@ -2,15 +2,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <dependencies> - <dependency> - <groupId>com.dy</groupId> - <artifactId>pipIrr-web-project</artifactId> - <version>1.0.0</version> - <scope>compile</scope> - </dependency> - - </dependencies> <parent> <artifactId>pipIrr-web</artifactId> diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/.gitignore index f80a40f..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-web-sell.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/.gitignore index b2b42bd..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/.gitignore @@ -1,7 +1,5 @@ HELP.md target/ -/pipIrr-web-sso.iml -mvnw !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/mvnw b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/.gitignore index 407c87d..549e00a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/.gitignore +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/.gitignore @@ -1,6 +1,5 @@ HELP.md target/ -/pipIrr-web-statistics.iml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ -- Gitblit v1.8.0