joerg/rpm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update, but maven is a pain

Browse source
This commit is contained in:
Jörg Prante 2021-08-04 14:51:37 +02:00
parent 9633d9f48f
commit 550100544d
8 changed files with 18 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gradle-plugin-rpm/src/main/groovy/org/xbib/gradle/plugin/RpmPlugin.groovy
View file

@ -4,7 +4,6 @@ import org.gradle.api.GradleException
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.BasePlugin import org.gradle.api.plugins.BasePlugin
import org.gradle.api.tasks.TaskProvider
import org.gradle.util.GradleVersion import org.gradle.util.GradleVersion
class RpmPlugin implements Plugin<Project> { class RpmPlugin implements Plugin<Project> {
@ -17,9 +16,6 @@ class RpmPlugin implements Plugin<Project> {
project.with { project.with {
createExtension(project) createExtension(project)
} }
/*project.afterEvaluate {
addTasks(project)
}*/
} }
private static void checkVersion() { private static void checkVersion() {
@ -32,12 +28,4 @@ class RpmPlugin implements Plugin<Project> {
private static void createExtension(Project project) { private static void createExtension(Project project) {
project.extensions.create('rpm', RpmExtension) project.extensions.create('rpm', RpmExtension)
} }
/*private static void addTasks(Project project) {
TaskProvider<Rpm> taskProvider = project.tasks.register('buildRpm', Rpm) {
group = 'rpm'
description = 'Generate RPM archive'
}
project.tasks.findByName('build').dependsOn taskProvider
}*/
} }

24
gradle.properties
View file

@ -1,17 +1,19 @@
group = org.xbib group = org.xbib
name = rpm name = rpm
version = 2.0.1 version = 2.1.0
gradle.wrapper.version = 6.4.1 gradle.wrapper.version = 6.6.1
gradle.publish.plugin.version = 0.11.0 gradle.publish.plugin.version = 0.14.0
bouncycastle.version = 1.64 bouncycastle.version = 1.68
xbib-archive.version = 1.0.1 xbib-archive.version = 1.0.1
ant.version = 1.10.8 ant.version = 1.10.10
maven.version = 3.6.3 maven.version = 3.8.1
maven-plugin-annotations.version = 3.6.0 maven-plugin-annotations.version = 3.6.1
maven-plugin-plugin.version = 3.6.0 maven-plugin-plugin.version = 3.6.1
maven-wagon.version = 3.3.4 maven-wagon.version = 3.4.3
aether-connector-basic.version = 1.1.0 aether-connector-basic.version = 1.1.0
aether-transport-wagon.version = 1.1.0 aether-transport-wagon.version = 1.1.0
slf4j.version = 1.7.25 slf4j.version = 1.7.30
mvel.version = 2.4.5.Final mvel.version = 2.4.12.Final
org.gradle.warning.mode = ALL

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradlew vendored
View file

@ -130,7 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath

21
gradlew.bat vendored
View file

@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init if "%ERRORLEVEL%" == "0" goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute :execute
@rem Setup the command line @rem Setup the command line
@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell

4
maven-plugin-rpm/src/main/java/org/xbib/maven/plugin/rpm/package-info.java
View file

@ -1,4 +0,0 @@
/**
*
*/
package org.xbib.maven.plugin.rpm;

4
maven-plugin-rpm/src/test/java/org/xbib/maven/plugin/rpm/package-info.java
View file

@ -1,4 +0,0 @@
/**
*
*/
package org.xbib.maven.plugin.rpm;