gil pushed to tesla-polyglot (master). "update to 0.1.6"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 17 00:38:58 UTC 2015
>From c95ea4f6ef7e646d8a2c9e8e2332b99eba496685 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Fri, 17 Apr 2015 02:38:39 +0200
Subject: update to 0.1.6
diff --git a/.gitignore b/.gitignore
index 4572efd..343e914 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/tesla-polyglot-0.1.0.tar.gz
+/polyglot-0.1.6.tar.gz
diff --git a/sources b/sources
index 86771fc..a7df08d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad7969f7f445f90771ad28365282f7f6 tesla-polyglot-0.1.0.tar.gz
+d2badf353167b7f97ca7c6a0b0531be2 polyglot-0.1.6.tar.gz
diff --git a/tesla-polyglot-0.1.0-antrun-plugin.patch b/tesla-polyglot-0.1.0-antrun-plugin.patch
deleted file mode 100644
index 5eea8bc..0000000
--- a/tesla-polyglot-0.1.0-antrun-plugin.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- tesla-polyglot-groovy/pom.xml 2014-05-16 15:48:58.000000000 +0200
-+++ tesla-polyglot-groovy/pom.xml-gil 2015-02-13 02:32:04.437582324 +0100
-@@ -29,7 +29,7 @@
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
-- <version>1.7.3</version>
-+ <version>2.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>jline</groupId>
-@@ -60,6 +60,79 @@
- <build>
- <plugins>
- <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version>1.7</version>
-+ <dependencies>
-+ <dependency>
-+ <groupId>org.codehaus.groovy</groupId>
-+ <artifactId>groovy-all</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>antlr</groupId>
-+ <artifactId>antlr</artifactId>
-+ <version>any</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>commons-cli</groupId>
-+ <artifactId>commons-cli</artifactId>
-+ <version>any</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.ow2.asm</groupId>
-+ <artifactId>asm-all</artifactId>
-+ <version>any</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-nop</artifactId>
-+ <version>any</version>
-+ </dependency>
-+ </dependencies>
-+ <executions>
-+ <execution>
-+ <id>compile</id>
-+ <phase>compile</phase>
-+ <configuration>
-+ <tasks>
-+ <taskdef name="groovyc"
-+ classname="org.codehaus.groovy.ant.Groovyc">
-+ <classpath refid="maven.compile.classpath"/>
-+ </taskdef>
-+ <groovyc destdir="${project.build.outputDirectory}"
-+ srcdir="${basedir}/src/main/groovy/" listfiles="true">
-+ <classpath refid="maven.compile.classpath"/>
-+ </groovyc>
-+ </tasks>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution>
-+ <!-- Failed to execute goal org.apache.maven.plugins:maven-antrun-plugin:1.7:run (test-compile) on project pmaven-groovy: An Ant BuildException has occured: java.lang.NoClassDefFoundError: junit.framework.TestCase execution>
-+ <id>test-compile</id>
-+ <phase>test-compile</phase>
-+ <configuration>
-+ <tasks>
-+ <taskdef name="groovyc"
-+ classname="org.codehaus.groovy.ant.Groovyc">
-+ <classpath refid="maven.compile.classpath"/>
-+ </taskdef>
-+ <mkdir dir="${project.build.testOutputDirectory}"/>
-+ <groovyc destdir="${project.build.testOutputDirectory}"
-+ srcdir="${basedir}/src/test/groovy/" listfiles="true">
-+ <classpath refid="maven.test.classpath"/>
-+ </groovyc>
-+ </tasks>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution-->
-+ </executions>
-+ </plugin>
-+ <plugin>
- <groupId>io.tesla.maven.plugins</groupId>
- <artifactId>tesla-license-plugin</artifactId>
- <configuration>
diff --git a/tesla-polyglot.spec b/tesla-polyglot.spec
index f3a721b..d751734 100644
--- a/tesla-polyglot.spec
+++ b/tesla-polyglot.spec
@@ -1,73 +1,68 @@
Name: tesla-polyglot
-Version: 0.1.0
-Release: 3%{?dist}
+Version: 0.1.6
+Release: 1%{?dist}
Summary: Modules to enable Maven usage in other JVM languages
License: EPL
URL: https://github.com/takari/maven-polyglot
-Source0: https://github.com/takari/maven-polyglot/archive/%{name}-%{version}.tar.gz
+Source0: https://github.com/takari/maven-polyglot/archive/polyglot-%{version}.tar.gz
Source1: eclipse-1.0.txt
-# Force clojure-compat usage
-Source2: %{name}-0.1.0-depmap
-# Compile source code with groovy 2 ant task
-Patch0: %{name}-0.1.0-antrun-plugin.patch
-# clojure-maven-plugin dont work with clojure 1.5.1
-# BuildRequires: mvn(org.clojure:clojure)
-# Disable clojure support
-# https://bugzilla.redhat.com/show_bug.cgi?id=1106061
-#BuildRequires: clojure-compat
-#BuildRequires: mvn(com.theoryinpractise:clojure-maven-plugin)
+BuildRequires: maven-local
+BuildRequires: mvn(antlr:antlr)
+BuildRequires: mvn(commons-cli:commons-cli)
BuildRequires: mvn(commons-logging:commons-logging)
-BuildRequires: mvn(org.apache.maven:maven-embedder)
+BuildRequires: mvn(io.takari:takari:pom:)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.ant:ant-junit)
+BuildRequires: mvn(org.apache.ant:ant-launcher)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-model-builder)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.codehaus.groovy:groovy-all)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
-# BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject.tests)
-BuildRequires: mvn(org.apache.santuario:xmlsec)
-
-BuildRequires: maven-local
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-plugin-plugin
-
-# groovy deps
-BuildRequires: mvn(antlr:antlr)
-BuildRequires: mvn(asm:asm-all)
-BuildRequires: mvn(commons-cli:commons-cli)
-BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
+BuildRequires: mvn(org.ow2.asm:asm-all)
+BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-nop)
-BuildRequires: mvn(org.apache.ant:ant-junit)
%if 0
+# clojure-maven-plugin dont work with clojure 1.5.1
+# BuildRequires: mvn(org.clojure:clojure)
+
+# Disable clojure module
+# https://bugzilla.redhat.com/show_bug.cgi?id=1106061
+BuildRequires: clojure-compat
+BuildRequires: mvn(com.theoryinpractise:clojure-maven-plugin)
+
# Ruby module
-BuildRequires: mvn(org.jruby:jruby)
-BuildRequires: mvn(rubygems:maven-tools)
+BuildRequires: mvn(org.jruby:jruby-noasm:1.7.19)
+BuildRequires: mvn(rubygems:maven-tools:1.0.8)
# https://bugzilla.redhat.com/show_bug.cgi?id=859711
-BuildRequires: mvn(de.saumya.mojo:gem-maven-plugin)
+BuildRequires: mvn(de.saumya.mojo:gem-maven-plugin:1.0.8)
# Scala module
BuildRequires: mvn(com.twitter:util-core_2.10:6.3.8)
BuildRequires: mvn(com.twitter:util-eval_2.10:6.3.8)
BuildRequires: mvn(com.googlecode.kiama:kiama_2.10:1.5.1)
-BuildRequires: mvn(jline:jline)
BuildRequires: mvn(net.alchim31.maven:scala-maven-plugin:3.1.5)
-BuildRequires: mvn(org.bitbucket.inkytonik.dsinfo:dsinfo_2.10)
-BuildRequires: mvn(org.bitbucket.inkytonik.dsprofile:dsprofile_2.10)
-BuildRequires: mvn(org.scala-lang:scala-compiler)
BuildRequires: mvn(org.scala-lang:scala-library)
-BuildRequires: mvn(org.scala-lang:scala-reflect)
BuildRequires: mvn(org.specs2:specs2_2.10:2.1.1)
# YAML module
BuildRequires: mvn(org.yaml:snakeyaml:1.4)
# test deps
-BuildRequires: mvn(junit:junit)
# No more available retired
BuildRequires: mvn(org.easytesting:fest-assert)
%endif
+Obsoletes: %{name}-cli
Obsoletes: %{name}-clojure
BuildArch: noarch
@@ -84,12 +79,6 @@ Summary: Polyglot Tesla :: Atom
%description atom
Polyglot Tesla :: Atom.
-%package cli
-Summary: Polyglot Tesla :: CLI
-
-%description cli
-Polyglot Tesla :: CLI.
-
%package common
Summary: Polyglot Tesla :: Common
@@ -108,6 +97,18 @@ Summary: Polyglot Tesla :: Maven Plugin
%description maven-plugin
This package contains Polyglot Tesla Maven Plugin.
+%package scala
+Summary: Polyglot Tesla :: Scala
+
+%description scala
+Polyglot Tesla :: Scala.
+
+%package translate-plugin
+Summary: Polyglot :: Translate Plugin
+
+%description translate-plugin
+This package contains Polyglot Translate Plugin.
+
%if 0
%package clojure
Summary: Polyglot Tesla :: Clojure
@@ -123,12 +124,6 @@ Summary: Polyglot Tesla :: Ruby
%description ruby
Polyglot Tesla :: Ruby.
-%package scala
-Summary: Polyglot Tesla :: Scala
-
-%description scala
-Polyglot Tesla :: Scala.
-
%package yaml
Summary: Polyglot Tesla :: YAML
@@ -143,118 +138,114 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
-%setup -q -n maven-polyglot-%{name}-%{version}
+%setup -q -n maven-polyglot-polyglot-%{version}
find -name "*.class" -delete
find -name "*.jar" -delete
-%patch0 -p0
-
-# Doesn't really need the parent
-%pom_remove_parent
-
-# Remove unavailable plugin
-%pom_remove_plugin io.tesla.maven.plugins:tesla-license-plugin
-%pom_remove_plugin :tesla-license-plugin %{name}-atom
-%pom_remove_plugin :tesla-license-plugin %{name}-cli
-%pom_remove_plugin :tesla-license-plugin %{name}-clojure
-%pom_remove_plugin :tesla-license-plugin %{name}-common
-%pom_remove_plugin :tesla-license-plugin %{name}-groovy
-%pom_remove_plugin :tesla-license-plugin %{name}-maven-plugin
-%pom_remove_plugin :tesla-license-plugin %{name}-ruby
-%pom_remove_plugin :tesla-license-plugin %{name}-scala
-%pom_remove_plugin :tesla-license-plugin %{name}-yaml
-# Remove unwanted plugin
-%pom_remove_plugin :maven-dependency-plugin %{name}-cli
-%pom_remove_plugin :maven-assembly-plugin %{name}-cli
-
# Unavailable build deps/tools
-%pom_disable_module %{name}-ruby
-%pom_disable_module %{name}-scala
-%pom_disable_module %{name}-yaml
-
-# Remove unbuilt modules references
-# TODO load ${maven.home}/conf/logging ...not clear...
-sed -i '/ruby/d' %{name}-cli/src/main/underlay/bin/m2.conf
-sed -i '/ruby/d' %{name}-cli/src/main/underlay/bin/translate.conf
-sed -i '/scala/d' %{name}-cli/src/main/underlay/bin/m2.conf
-sed -i '/scala/d' %{name}-cli/src/main/underlay/bin/translate.conf
-sed -i '/yaml/d' %{name}-cli/src/main/underlay/bin/m2.conf
-sed -i '/yaml/d' %{name}-cli/src/main/underlay/bin/translate.conf
-%pom_remove_dep :%{name}-ruby %{name}-cli
-%pom_remove_dep :%{name}-scala %{name}-cli
-%pom_remove_dep :%{name}-yaml %{name}-cli
-
-# Fix deps
-%pom_remove_dep xml-security:xmlsec %{name}-cli
-%pom_add_dep org.apache.santuario:xmlsec %{name}-cli
-
-%pom_remove_dep org.eclipse.sisu:org.eclipse.sisu.inject.tests %{name}-atom
-%pom_remove_dep org.eclipse.sisu:org.eclipse.sisu.inject.tests %{name}-ruby
+%pom_disable_module polyglot-clojure
+%pom_disable_module polyglot-ruby
+%pom_remove_dep :polyglot-ruby polyglot-translate-plugin
+%pom_disable_module polyglot-scala
+%pom_remove_dep :polyglot-scala polyglot-translate-plugin
+%pom_disable_module polyglot-yaml
+%pom_remove_dep :polyglot-yaml polyglot-translate-plugin
+
%pom_remove_dep org.eclipse.sisu:org.eclipse.sisu.inject.tests
-# Update guava library references
-%pom_remove_dep com.google.collections:google-collections %{name}-clojure
-%pom_add_dep com.google.guava:guava %{name}-clojure
+%pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin:1.7 polyglot-groovy '
+<dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.4.0</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>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+</dependencies>
+<executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="groovyc"
+ classname="org.codehaus.groovy.ant.Groovyc">
+ <classpath refid="maven.plugin.classpath"/>
+ </taskdef>
+ <groovyc destdir="target/classes"
+ srcdir="src/main/groovy/" listfiles="true">
+ <classpath refid="maven.compile.classpath"/>
+ </groovyc>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+</executions>'
+
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:version" 2.4.0 polyglot-groovy
+
+# test skipped for unavailable dependency org.easytesting:fest-assert:1.1
+rm -rf polyglot-clojure/src/test/java/*
cp -p %{SOURCE1} .
sed -i 's/\r//' eclipse-1.0.txt
-sed -i.classworlds -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-\*.jar':'-classpath "${M2_HOME}"/boot/plexus-classworlds.jar':g %{name}-cli/src/main/underlay/bin/translate
-
-%pom_disable_module %{name}-clojure
-%pom_remove_dep :%{name}-clojure %{name}-cli
-sed -i '/clojure/d' %{name}-cli/src/main/underlay/bin/m2.conf
-sed -i '/clojure/d' %{name}-cli/src/main/underlay/bin/translate.conf
+%mvn_alias ':polyglot-{*}' io.tesla.polyglot:tesla-polyglot- at 1
+%mvn_alias ':polyglot-{*}' org.sonatype.pmaven:pmaven- at 1
%build
-%mvn_alias ':tesla-polyglot-{*}' org.sonatype.pmaven:pmaven- at 1
-# test skipped for unavailable dependency org.easytesting:fest-assert:1.1
-%mvn_build -f -s -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.local.depmap.file="%{SOURCE2}"
+%mvn_build -s -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
-# TODO
-# link tesla-polyglot-common tesla-polyglot-cli in /usr/share/maven/lib
-# link tesla-polyglot-atom in /usr/share/maven/ext/atom
-# link in /usr/share/maven/lib/ext/groovy
-# tesla-polyglot-groovy
-# org.codehaus.groovy:groovy
-# antlr:antlr
-# asm:asm
-# asm:asm-util
-# asm:asm-analysis
-# asm:asm-tree
-# link in /usr/share/maven/lib/ext/clojure
-# tesla-polyglot-clojure clojure-compat (see comments above)
-# install tesla-polyglot-cli/src/main/underlay/bin/translate
-# tesla-polyglot-cli/src/main/underlay/bin/m2.conf
-# tesla-polyglot-cli/src/main/underlay/bin/translate.conf
-# in /usr/share/maven/bin
-
-%files -f .mfiles-%{name}
+%files -f .mfiles-polyglot
%dir %{_javadir}/%{name}
%doc poms
%license eclipse-1.0.txt license-header.txt
-%files atom -f .mfiles-%{name}-atom
-%files cli -f .mfiles-%{name}-cli
-%files common -f .mfiles-%{name}-common
-%files groovy -f .mfiles-%{name}-groovy
+%files atom -f .mfiles-polyglot-atom
+%files common -f .mfiles-polyglot-common
+%files groovy -f .mfiles-polyglot-groovy
%if 0
-%files clojure -f .mfiles-%{name}-clojure
-%files jruby -f .mfiles-%{name}-ruby
-%files scala -f .mfiles-%{name}-scala
-%files yaml -f .mfiles-%{name}-yaml
+%files clojure -f .mfiles-polyglot-clojure
+%files jruby -f .mfiles-polyglot-ruby
+%files scala -f .mfiles-polyglot-scala
+%files yaml -f .mfiles-polyglot-yaml
%endif
-%files maven-plugin -f .mfiles-%{name}-maven-plugin
+%files maven-plugin -f .mfiles-polyglot-maven-plugin
+%files translate-plugin -f .mfiles-polyglot-translate-plugin
%files javadoc -f .mfiles-javadoc
%license eclipse-1.0.txt license-header.txt
%changelog
+* Mon Apr 13 2015 gil cattaneo <puntogil at libero.it> 0.1.6-1
+- update to 0.1.6
+
* Thu Feb 12 2015 gil cattaneo <puntogil at libero.it> 0.1.0-3
- introduce license macro
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/tesla-polyglot.git/commit/?h=master&id=c95ea4f6ef7e646d8a2c9e8e2332b99eba496685
More information about the scm-commits
mailing list