commit 96902f756bdc7ce08a14edd66e42f13ca8d008f2 Author: gil puntogil@libero.it Date: Fri Jan 30 23:22:03 2015 +0100
re-base for use groovy 2
codenarc-0.17-antrunplugin.patch | 112 ++++++++++++++++++++++++++++++++++++++ codenarc-0.17-build.properties | 8 --- codenarc-0.17-build.xml | 103 ----------------------------------- codenarc.spec | 58 +++++++++++--------- 4 files changed, 145 insertions(+), 136 deletions(-) --- diff --git a/codenarc-0.17-antrunplugin.patch b/codenarc-0.17-antrunplugin.patch new file mode 100644 index 0000000..efaf837 --- /dev/null +++ b/codenarc-0.17-antrunplugin.patch @@ -0,0 +1,112 @@ +--- pom.xml 2012-03-23 21:08:05.000000000 +0100 ++++ pom.xml-gil 2015-01-30 22:59:37.375794842 +0100 +@@ -29,7 +29,7 @@ + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> +- <version>1.2.13</version> ++ <version>1.2.17</version> + </dependency> + + <dependency> +@@ -41,7 +41,7 @@ + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> +- <version>1.7.5</version> ++ <version>1.8.9</version> + </dependency> + + <dependency> +@@ -78,42 +78,67 @@ + <build> + <plugins> + <plugin> +- <groupId>org.codehaus.gmaven</groupId> +- <artifactId>gmaven-plugin</artifactId> +- <version>1.3</version> +- <configuration> +- <providerSelection>1.7</providerSelection> +- </configuration> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-antrun-plugin</artifactId> ++ <version>1.4</version> + <executions> + <execution> +- <goals> +- <goal>generateStubs</goal> +- <goal>compile</goal> +- <goal>generateTestStubs</goal> +- <goal>testCompile</goal> +- <!--if you want joint compilation, add stub generation goals here--> +- </goals> ++ <id>compile</id> ++ <phase>process-sources</phase> ++ <configuration> ++ <target> ++ <mkdir dir="${basedir}/target/classes"/> ++ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc"> ++ <classpath refid="maven.plugin.classpath"/> ++ </taskdef> ++ <groovyc destdir="${project.build.outputDirectory}" srcdir="${basedir}/src/main" classpathref="maven.compile.classpath"> ++ <javac source="1.5" target="1.5" debug="on"/> ++ </groovyc> ++ </target> ++ </configuration> ++ <goals> ++ <goal>run</goal> ++ </goals> + </execution> + </executions> + <dependencies> + <dependency> +- <groupId>org.codehaus.gmaven.runtime</groupId> +- <artifactId>gmaven-runtime-1.7</artifactId> +- <version>1.3</version> +- <exclusions> +- <exclusion> +- <groupId>org.codehaus.groovy</groupId> +- <artifactId>groovy-all</artifactId> +- </exclusion> +- </exclusions> ++ <groupId>org.apache.ant</groupId> ++ <artifactId>ant-junit</artifactId> ++ <version>1.8.1</version> ++ </dependency> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>4.8.2</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> +- <artifactId>groovy-all</artifactId> ++ <artifactId>groovy</artifactId> ++ <version>1.8.9</version> ++ </dependency> ++ <dependency> ++ <groupId>antlr</groupId> ++ <artifactId>antlr</artifactId> ++ <version>2.7.7</version> ++ </dependency> ++ <dependency> ++ <groupId>commons-cli</groupId> ++ <artifactId>commons-cli</artifactId> ++ <version>1.2</version> ++ </dependency> ++ <dependency> ++ <groupId>asm</groupId> ++ <artifactId>asm-all</artifactId> ++ <version>4.0</version> ++ </dependency> ++ <dependency> ++ <groupId>org.slf4j</groupId> ++ <artifactId>slf4j-nop</artifactId> + <version>1.7.5</version> + </dependency> + </dependencies> +- </plugin> ++ </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> diff --git a/codenarc.spec b/codenarc.spec index 4d21977..37d54d6 100644 --- a/codenarc.spec +++ b/codenarc.spec @@ -1,30 +1,38 @@ %global oname CodeNarc Name: codenarc Version: 0.17 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Groovy library that provides static analysis features for Groovy code License: ASL 2.0 Url: http://codenarc.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/codenarc/codenarc/CodeNarc%20Versio... -Source1: codenarc-%{version}-build.xml -Source2: codenarc-%{version}-build.properties +# use antrun-plugin instead of gmaven +# fix log4j version +Patch0: codenarc-0.17-antrunplugin.patch # remove @Override # unavailable method in groovy 1.8.x (...) Patch1: codenarc-0.17-groovy18.patch
-BuildRequires: java-devel -BuildRequires: java-javadoc -BuildRequires: javapackages-local +BuildRequires: maven-local +BuildRequires: maven-antrun-plugin +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires: antlr -BuildRequires: apache-commons-cli +# groovy-all embedded libraries +BuildRequires: mvn(antlr:antlr) +#BuildRequires: mvn(org.ow2.asm:asm-all) +# -distroshaded BuildRequires: objectweb-asm3 - -BuildRequires: ant -BuildRequires: cobertura -BuildRequires: gmetrics -BuildRequires: groovy18-lib -BuildRequires: log4j12 +BuildRequires: mvn(commons-cli:commons-cli) +BuildRequires: mvn(org.slf4j:slf4j-nop) + +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(log4j:log4j:1.2.17) +BuildRequires: mvn(net.sourceforge.cobertura:cobertura) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.ant:ant-junit) +#BuildRequires: mvn(org.codehaus.groovy:groovy-all) +BuildRequires: mvn(org.codehaus.groovy:groovy:1.8.9) +BuildRequires: mvn(org.gmetrics:GMetrics)
BuildArch: noarch
@@ -51,32 +59,29 @@ find . -name "*.jar" -delete find . -name "*.class" -delete rm -rf docs/*
+%patch0 -p0 %patch1 -p1
-# in fedora haven't gmaven yet. https://bugzilla.redhat.com/show_bug.cgi?id=841833 -cp -pr %{SOURCE1} build.xml -cp -pr %{SOURCE2} build.properties +sed -i 's#groupId>org.ow2.asm#groupId>asm#' pom.xml +sed -i 's#version>4.0#version>3#' pom.xml +sed -i 's#artifactId>groovy-all#artifactId>groovy#' pom.xml +sed -i 's#version>1.8.9#version>1.8#' pom.xml
+%pom_remove_plugin :maven-javadoc-plugin
chmod 644 README.txt for d in CHANGELOG.txt LICENSE.txt NOTICE.txt README.txt ; do sed -i 's/\r//' $d done
-%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='log4j']/pom:version" 1.2.17 - -%pom_remove_plugin org.codehaus.gmaven:gmaven-plugin - %mvn_file org.%{name}:%{oname} %{name} %{oname}
%build
-CLASSPATH=$( build-classpath groovy18-1.8 objectweb-asm3/asm-all-distroshaded commons-cli antlr) ant - -%mvn_artifact pom.xml target/%{oname}-%{version}.jar +%mvn_build
%install -%mvn_install -J target/site/apidocs +%mvn_install
%files -f .mfiles %doc CHANGELOG.txt README.txt @@ -86,6 +91,9 @@ CLASSPATH=$( build-classpath groovy18-1.8 objectweb-asm3/asm-all-distroshaded co %license LICENSE.txt NOTICE.txt
%changelog +* Fri Jan 30 2015 gil cattaneo puntogil@libero.it 0.17-11 +- re-base for use groovy 2 + * Fri Jan 30 2015 gil cattaneo puntogil@libero.it 0.17-10 - introduce license macro
java-sig-commits@lists.fedoraproject.org