[parboiled] update to 1.1.6
gil
gil at fedoraproject.org
Tue Nov 26 16:50:05 UTC 2013
commit 6fe087b97de72ca741bc8126c41473baa0b798c9
Author: gil <puntogil at libero.it>
Date: Tue Nov 26 17:49:28 2013 +0100
update to 1.1.6
.gitignore | 1 +
parboiled-core-1.0.2.pom | 35 ----------
parboiled-core-1.1.6.pom | 47 ++++++++++++++
parboiled-java-1.0.2.pom | 67 -------------------
parboiled-java-1.1.6.pom | 72 +++++++++++++++++++++
parboiled-1.0.2-pom.xml => parboiled-pom.xml | 2 +-
parboiled.spec | 89 +++++++++++++++++++++-----
sources | 2 +-
8 files changed, 194 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9ccb36..1b7010f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/parboiled-1.0.2-src-git.tar.xz
/1.0.2.tar.gz
+/1.1.6.tar.gz
diff --git a/parboiled-core-1.1.6.pom b/parboiled-core-1.1.6.pom
new file mode 100644
index 0000000..249f790
--- /dev/null
+++ b/parboiled-core-1.1.6.pom
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.parboiled</groupId>
+ <artifactId>parboiled-core</artifactId>
+ <packaging>bundle</packaging>
+ <description>Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful</description>
+ <url>http://parboiled.org</url>
+ <version>1.1.6</version>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <name>parboiled-core</name>
+ <inceptionYear>2009</inceptionYear>
+ <organization>
+ <name>org.parboiled</name>
+ <url>http://parboiled.org</url>
+ </organization>
+ <scm>
+ <url>git at github.com:sirthias/parboiled.git</url>
+ <connection>scm:git:git at github.com:sirthias/parboiled.git</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>sirthias</id>
+ <name>Mathias Doenitz</name>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.14.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_2.9.3</artifactId>
+ <version>1.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/parboiled-java-1.1.6.pom b/parboiled-java-1.1.6.pom
new file mode 100644
index 0000000..83f89da
--- /dev/null
+++ b/parboiled-java-1.1.6.pom
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.parboiled</groupId>
+ <artifactId>parboiled-java</artifactId>
+ <packaging>bundle</packaging>
+ <description>Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful</description>
+ <url>http://parboiled.org</url>
+ <version>1.1.6</version>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <name>parboiled-java</name>
+ <inceptionYear>2009</inceptionYear>
+ <organization>
+ <name>org.parboiled</name>
+ <url>http://parboiled.org</url>
+ </organization>
+ <scm>
+ <url>git at github.com:sirthias/parboiled.git</url>
+ <connection>scm:git:git at github.com:sirthias/parboiled.git</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>sirthias</id>
+ <name>Mathias Doenitz</name>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.parboiled</groupId>
+ <artifactId>parboiled-core</artifactId>
+ <version>1.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.14.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_2.9.3</artifactId>
+ <version>1.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>4.1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/parboiled-1.0.2-pom.xml b/parboiled-pom.xml
similarity index 97%
rename from parboiled-1.0.2-pom.xml
rename to parboiled-pom.xml
index 39e896e..4ea8a69 100644
--- a/parboiled-1.0.2-pom.xml
+++ b/parboiled-pom.xml
@@ -11,7 +11,7 @@
<groupId>org.parboiled</groupId>
<artifactId>parboiled-project</artifactId>
<packaging>pom</packaging>
- <version>1.0.2</version>
+ <version>@VERSION@</version>
<modules>
<!-- These are not all the modules, only those that we can currently build: -->
diff --git a/parboiled.spec b/parboiled.spec
index 48d8730..6cafd33 100644
--- a/parboiled.spec
+++ b/parboiled.spec
@@ -1,38 +1,31 @@
Name: parboiled
-Version: 1.0.2
-Release: 6%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
Summary: Java/Scala library providing parsing of input text based on PEGs
License: ASL 2.0
URL: http://parboiled.org/
Source0: https://github.com/sirthias/parboiled/archive/%{version}.tar.gz
# for build see https://github.com/sirthias/parboiled/wiki/Building-parboiled
-Source1: http://repo1.maven.org/maven2/org/%{name}/%{name}-core/%{version}/%{name}-core-%{version}.pom
-Source2: http://repo1.maven.org/maven2/org/%{name}/%{name}-java/%{version}/%{name}-java-%{version}.pom
+Source1: http://repo1.maven.org/maven2/org/parboiled/%{name}-core/%{version}/%{name}-core-%{version}.pom
+Source2: http://repo1.maven.org/maven2/org/parboiled/%{name}-java/%{version}/%{name}-java-%{version}.pom
# customized aggregator pom
-Source3: %{name}-%{version}-pom.xml
+Source3: %{name}-pom.xml
BuildRequires: java-devel
-BuildRequires: mvn(asm:asm)
-BuildRequires: mvn(asm:asm-analysis)
-BuildRequires: mvn(asm:asm-tree)
-BuildRequires: mvn(asm:asm-util)
+BuildRequires: mvn(org.ow2.asm:asm)
+BuildRequires: mvn(org.ow2.asm:asm-analysis)
+BuildRequires: mvn(org.ow2.asm:asm-tree)
+BuildRequires: mvn(org.ow2.asm:asm-util)
%if 0
-# TODO
BuildRequires: mvn(org.scala-lang:scala-library)
# test deps
-BuildRequires: mvn(org.scalatest:scalatest_2.10)
+BuildRequires: mvn(org.scalatest:scalatest_2.9.3)
BuildRequires: mvn(org.testng:testng)
-
-# use https://github.com/davidB/scala-maven-plugin
-BuildRequires: scala-maven-plugin
-BuildRequires: maven-surefire-provider-testng
%endif
BuildRequires: maven-local
-
-
BuildArch: noarch
%description
@@ -57,8 +50,67 @@ find . -name "*.jar" -delete
cp -p %{SOURCE1} %{name}-core/pom.xml
cp -p %{SOURCE2} %{name}-java/pom.xml
+
+for m in core java; do
+%pom_xpath_inject "pom:project" "
+<build>
+ <plugins>
+
+ </plugins>
+</build>" %{name}-${m}
+
+%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin %{name}-${m} "
+<configuration>
+ <archive>
+ <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+</configuration>"
+done
+
+%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-core "
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.parboiled.core</Bundle-SymbolicName>
+ <Bundle-Name>org.parboiled.core</Bundle-Name>
+ <Bundle-Version>\${project.version}</Bundle-Version>
+ <Private-Package>org.parboiled.core.*</Private-Package>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
+
+%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-java "
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.parboiled.java</Bundle-SymbolicName>
+ <Bundle-Name>org.parboiled.java</Bundle-Name>
+ <Bundle-Version>\${project.version}</Bundle-Version>
+ <Fragment-Host>org.parboiled.core</Fragment-Host>
+ <Private-Package>org.parboiled.java.*</Private-Package>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
+
#cp -p %%{SOURCE?} %%{name}-scala/pom.xml
cp -p %{SOURCE3} pom.xml
+sed -i "s|@VERSION@|%{version}|" pom.xml
%mvn_file :%{name}-core %{name}/core
%mvn_file :%{name}-java %{name}/java
@@ -79,6 +131,9 @@ cp -p %{SOURCE3} pom.xml
%doc LICENSE
%changelog
+* Tue Nov 26 2013 gil cattaneo <puntogil at libero.it> 1.1.6-1
+- update to 1.1.6 rhbz#1034875
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index b1b4071..1e9b667 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6f250aa70e4a891eb96f549eb08db6d 1.0.2.tar.gz
+70585bd417ea7ffaf39c9902554f4743 1.1.6.tar.gz
More information about the scm-commits
mailing list