[#6657] Error in maven-install.bat and .sh scripts when installing cross released Scala deliverables

This commit is contained in:
lukaseder 2017-10-09 13:12:16 +02:00
parent f59402cf1f
commit c6a4de770c
2 changed files with 45 additions and 18 deletions

View File

@ -7,10 +7,14 @@ if exist jOOQ-javadoc\jooq-%VERSION%-javadoc.jar (
set JAVADOC_JOOQ_META_EXTENSIONS=-Djavadoc=jOOQ-javadoc\jooq-meta-extensions-%VERSION%-javadoc.jar
set JAVADOC_JOOQ_CODEGEN=-Djavadoc=jOOQ-javadoc\jooq-codegen-%VERSION%-javadoc.jar
set JAVADOC_JOOQ_CODEGEN_MAVEN=-Djavadoc=jOOQ-javadoc\jooq-codegen-maven-%VERSION%-javadoc.jar
rem [java-8]
set JAVADOC_JOOQ_CHECKER=-Djavadoc=jOOQ-javadoc\jooq-checker-%VERSION%-javadoc.jar
rem [/java-8]
set JAVADOC_JOOQ_SCALA=-Djavadoc=jOOQ-javadoc\jooq-scala-%VERSION%-javadoc.jar
set JAVADOC_JOOQ_SCALA_2_11=-Djavadoc=jOOQ-javadoc\jooq-scala_2.11-%VERSION%-javadoc.jar
set JAVADOC_JOOQ_SCALA_2_12=-Djavadoc=jOOQ-javadoc\jooq-scala_2.12-%VERSION%-javadoc.jar
)
if exist jOOQ-src\jooq-%VERSION%-sources.jar (
@ -19,10 +23,14 @@ if exist jOOQ-src\jooq-%VERSION%-sources.jar (
set SOURCES_JOOQ_META_EXTENSIONS=-Dsources=jOOQ-src\jooq-meta-extensions-%VERSION%-sources.jar
set SOURCES_JOOQ_CODEGEN=-Dsources=jOOQ-src\jooq-codegen-%VERSION%-sources.jar
set SOURCES_JOOQ_CODEGEN_MAVEN=-Dsources=jOOQ-src\jooq-codegen-maven-%VERSION%-sources.jar
rem [java-8]
set SOURCES_JOOQ_CHECKER=-Dsources=jOOQ-src\jooq-checker-%VERSION%-sources.jar
rem [/java-8]
set SOURCES_JOOQ_SCALA=-Dsources=jOOQ-src\jooq-scala-%VERSION%-sources.jar
set SOURCES_JOOQ_SCALA_2_11=-Djavadoc=jOOQ-src\jooq-scala_2.11-%VERSION%-sources.jar
set SOURCES_JOOQ_SCALA_2_12=-Djavadoc=jOOQ-src\jooq-scala_2.12-%VERSION%-sources.jar
)
call mvn install:install-file -Dfile=jOOQ-pom\pom.xml -DgroupId=org.jooq -DartifactId=jooq-parent -Dversion=%VERSION% -Dpackaging=pom
@ -31,10 +39,16 @@ call mvn install:install-file -Dfile=jOOQ-lib\jooq-meta-%VERSION%.jar
call mvn install:install-file -Dfile=jOOQ-lib\jooq-meta-extensions-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-meta-extensions -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_META_EXTENSIONS% %SOURCES_JOOQ_META_EXTENSIONS% -DpomFile=jOOQ-pom\jooq-meta-extensions\pom.xml
call mvn install:install-file -Dfile=jOOQ-lib\jooq-codegen-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-codegen -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_CODEGEN% %SOURCES_JOOQ_CODEGEN% -DpomFile=jOOQ-pom\jooq-codegen\pom.xml
call mvn install:install-file -Dfile=jOOQ-lib\jooq-codegen-maven-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-codegen-maven -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_CODEGEN_MAVEN% %SOURCES_JOOQ_CODEGEN_META% -DpomFile=jOOQ-pom\jooq-codegen-maven\pom.xml
rem [java-8]
call mvn install:install-file -Dfile=jOOQ-lib\jooq-checker-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-checker -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_CHECKER% %SOURCES_JOOQ_CHECKER% -DpomFile=jOOQ-pom\jooq-checker\pom.xml
rem [/java-8]
call mvn install:install-file -Dfile=jOOQ-lib\jooq-scala-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-scala -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_SCALA% %SOURCES_JOOQ_SCALA% -DpomFile=jOOQ-pom\jooq-scala\pom.xml
call mvn install:install-file -Dfile=jOOQ-lib\jooq-scala_2.11-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-scala_2.11 -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_SCALA_2_11% %SOURCES_JOOQ_SCALA_2_11% -DpomFile=jOOQ-pom\jooq-scala_2.11\pom.xml
call mvn install:install-file -Dfile=jOOQ-lib\jooq-scala_2.12-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-scala_2.12 -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_SCALA_2_12% %SOURCES_JOOQ_SCALA_2_12% -DpomFile=jOOQ-pom\jooq-scala_2.12\pom.xml
echo
echo

View File

@ -7,10 +7,14 @@ if [ -f jOOQ-javadoc/jooq-$VERSION-javadoc.jar ]; then
JAVADOC_JOOQ_META_EXTENSIONS=-Djavadoc=jOOQ-javadoc/jooq-meta-extensions-$VERSION-javadoc.jar
JAVADOC_JOOQ_CODEGEN=-Djavadoc=jOOQ-javadoc/jooq-codegen-$VERSION-javadoc.jar
JAVADOC_JOOQ_CODEGEN_MAVEN=-Djavadoc=jOOQ-javadoc/jooq-codegen-maven-$VERSION-javadoc.jar
# [java-8]
JAVADOC_JOOQ_CHECKER=-Djavadoc=jOOQ-javadoc/jooq-checker-$VERSION-javadoc.jar
# [/java-8]
JAVADOC_JOOQ_SCALA=-Djavadoc=jOOQ-javadoc/jooq-scala-$VERSION-javadoc.jar
JAVADOC_JOOQ_SCALA_2_11=-Djavadoc=jOOQ-javadoc/jooq-scala_2.11-$VERSION-javadoc.jar
JAVADOC_JOOQ_SCALA_2_12=-Djavadoc=jOOQ-javadoc/jooq-scala_2.12-$VERSION-javadoc.jar
fi
if [ -f jOOQ-src/jooq-$VERSION-sources.jar ]; then
@ -19,10 +23,14 @@ if [ -f jOOQ-src/jooq-$VERSION-sources.jar ]; then
SOURCES_JOOQ_META_EXTENSIONS=-Dsources=jOOQ-src/jooq-meta-extensions-$VERSION-sources.jar
SOURCES_JOOQ_CODEGEN=-Dsources=jOOQ-src/jooq-codegen-$VERSION-sources.jar
SOURCES_JOOQ_CODEGEN_MAVEN=-Dsources=jOOQ-src/jooq-codegen-maven-$VERSION-sources.jar
# [java-8]
SOURCES_JOOQ_CHECKER=-Dsources=jOOQ-src/jooq-checker-$VERSION-sources.jar
# [/java-8]
SOURCES_JOOQ_SCALA=-Dsources=jOOQ-src/jooq-scala-$VERSION-sources.jar
SOURCES_JOOQ_SCALA_2_11=-Djavadoc=jOOQ-src/jooq-scala_2.11-$VERSION-sources.jar
SOURCES_JOOQ_SCALA_2_12=-Djavadoc=jOOQ-src/jooq-scala_2.12-$VERSION-sources.jar
fi
mvn install:install-file -Dfile=jOOQ-pom/pom.xml -DgroupId=org.jooq -DartifactId=jooq-parent -Dversion=$VERSION -Dpackaging=pom
@ -31,10 +39,15 @@ mvn install:install-file -Dfile=jOOQ-lib/jooq-meta-$VERSION.jar -Dgro
mvn install:install-file -Dfile=jOOQ-lib/jooq-meta-extensions-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-meta-extensions -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_META_EXTENSIONS $SOURCES_JOOQ_META_EXTENSIONS -DpomFile=jOOQ-pom/jooq-meta-extensions/pom.xml
mvn install:install-file -Dfile=jOOQ-lib/jooq-codegen-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-codegen -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_CODEGEN $SOURCES_JOOQ_CODEGEN -DpomFile=jOOQ-pom/jooq-codegen/pom.xml
mvn install:install-file -Dfile=jOOQ-lib/jooq-codegen-maven-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-codegen-maven -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_CODEGEN_MAVEN $SOURCES_JOOQ_CODEGEN_META -DpomFile=jOOQ-pom/jooq-codegen-maven/pom.xml
# [java-8]
mvn install:install-file -Dfile=jOOQ-lib/jooq-checker-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-checker -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_CHEKER $SOURCES_JOOQ_CHECKER -DpomFile=jOOQ-pom/jooq-checker/pom.xml
# [/java-8]
mvn install:install-file -Dfile=jOOQ-lib/jooq-scala-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-scala -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_SCALA $SOURCES_JOOQ_SCALA -DpomFile=jOOQ-pom/jooq-scala/pom.xml
mvn install:install-file -Dfile=jOOQ-lib/jooq-scala_2.11-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-scala_2.11 -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_SCALA_2_11 $SOURCES_JOOQ_SCALA_2_11 -DpomFile=jOOQ-pom/jooq-scala_2.11/pom.xml
mvn install:install-file -Dfile=jOOQ-lib/jooq-scala_2.12-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-scala_2.12 -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_SCALA_2_12 $SOURCES_JOOQ_SCALA_2_12 -DpomFile=jOOQ-pom/jooq-scala_2.12/pom.xml
echo
echo