[java-sig-commits] [janino] update to 2.6.1
gil
gil at fedoraproject.org
Mon Apr 16 14:38:31 UTC 2012
commit 421d718966c7595553c521822dda176b74b57691
Author: gil <puntogil at libero.it>
Date: Mon Apr 16 14:40:59 2012 +0200
update to 2.6.1
.gitignore | 1 +
commons-compiler-2.6.1.pom | 24 ++++
commons-compiler-jdk-2.6.1.pom | 36 +++++++
dead.package | 1 -
janino-2.6.1-aggregator-01.pom | 27 +++++
janino-2.6.1-pom.patch | 48 +++++++++
janino-2.6.1.pom | 34 ++++++
janino.spec | 227 ++++++++++++++++++++++++++++++++++++++++
sources | 1 +
9 files changed, 398 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd985a7..da21297 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
janino-2.5.15.zip
+/janino-2.6.1.zip
diff --git a/commons-compiler-2.6.1.pom b/commons-compiler-2.6.1.pom
new file mode 100644
index 0000000..97c0190
--- /dev/null
+++ b/commons-compiler-2.6.1.pom
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ </parent>
+
+ <artifactId>commons-compiler</artifactId>
+
+ <name>Commons Compiler</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/commons-compiler-jdk-2.6.1.pom b/commons-compiler-jdk-2.6.1.pom
new file mode 100644
index 0000000..1b3c01d
--- /dev/null
+++ b/commons-compiler-jdk-2.6.1.pom
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ </parent>
+
+ <artifactId>commons-compiler-jdk</artifactId>
+
+ <name>Commons Compiler Jdk</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/janino-2.6.1-aggregator-01.pom b/janino-2.6.1-aggregator-01.pom
new file mode 100644
index 0000000..cef06b5
--- /dev/null
+++ b/janino-2.6.1-aggregator-01.pom
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- This is a dummy POM added just to ease building in the RPM platforms: -->
+
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ </parent>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino-project</artifactId>
+ <packaging>pom</packaging>
+ <version>2.6.1</version>
+
+ <modules>
+ <module>commons-compiler</module>
+ <module>commons-compiler-jdk</module>
+ <module>janino</module>
+ </modules>
+
+</project>
diff --git a/janino-2.6.1-pom.patch b/janino-2.6.1-pom.patch
new file mode 100644
index 0000000..a716afd
--- /dev/null
+++ b/janino-2.6.1-pom.patch
@@ -0,0 +1,48 @@
+diff -Nru janino-2.6.1/commons-compiler-jdk/pom.xml janino-2.6.1-gil/commons-compiler-jdk/pom.xml
+--- janino-2.6.1/commons-compiler-jdk/pom.xml 2012-01-21 03:57:30.000000000 +0100
++++ janino-2.6.1-gil/commons-compiler-jdk/pom.xml 2012-04-10 16:45:27.713559909 +0200
+@@ -12,12 +12,15 @@
+
+ <artifactId>commons-compiler-jdk</artifactId>
+
++ <groupId>org.codehaus.janino</groupId>
+ <name>Commons Compiler Jdk</name>
++ <version>2.6.1</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
++ <version>2.6.1</version>
+ </dependency>
+ </dependencies>
+
+diff -Nru janino-2.6.1/janino/pom.xml janino-2.6.1-gil/janino/pom.xml
+--- janino-2.6.1/janino/pom.xml 2012-01-21 03:58:03.000000000 +0100
++++ janino-2.6.1-gil/janino/pom.xml 2012-04-10 16:44:23.553565965 +0200
+@@ -10,7 +10,9 @@
+ <version>2.6.1</version>
+ </parent>
+
++ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
++ <version>2.6.1</version>
+
+ <name>Janino</name>
+
+@@ -22,13 +24,14 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+- <artifactId>ant-nodeps</artifactId>
++ <artifactId>ant</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
++ <version>2.6.1</version>
+ </dependency>
+ </dependencies>
+ </project>
diff --git a/janino-2.6.1.pom b/janino-2.6.1.pom
new file mode 100644
index 0000000..e12cf14
--- /dev/null
+++ b/janino-2.6.1.pom
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ </parent>
+
+ <artifactId>janino</artifactId>
+
+ <name>Janino</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/janino.spec b/janino.spec
new file mode 100644
index 0000000..f107b28
--- /dev/null
+++ b/janino.spec
@@ -0,0 +1,227 @@
+# Copyright (c) 2000-2007, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+Name: janino
+Version: 2.6.1
+Release: 7%{?dist}
+Summary: An embedded Java compiler
+Group: Development/Tools
+License: BSD
+URL: http://docs.codehaus.org/display/JANINO/Home
+Source0: http://dist.codehaus.org/%{name}/%{name}-%{version}.zip
+Source1: %{name}-%{version}-aggregator-01.pom
+Source2: http://repo1.maven.org/maven2/org/codehaus/%{name}/commons-compiler/%{version}/commons-compiler-%{version}.pom
+Source3: http://repo1.maven.org/maven2/org/codehaus/%{name}/commons-compiler-jdk/%{version}/commons-compiler-jdk-%{version}.pom
+Source4: http://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}.pom
+
+# change artifactId ant-nodeps in ant
+Patch0: %{name}-%{version}-pom.patch
+
+BuildRequires: janino-parent
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+
+BuildRequires: ant
+BuildRequires: junit4
+
+BuildRequires: buildnumber-maven-plugin
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+
+Requires: ant
+Requires: commons-compiler = %{version}
+Requires: janino-parent
+
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+Janino is a super-small, super-fast Java compiler. Not only can it compile
+a set of source files to a set of class files like the JAVAC tool, but also
+can it compile a Java expression, block, class body or source file in
+memory, load the bytecode and execute it directly in the same JVM. Janino
+is not intended to be a development tool, but an embedded compiler for
+run-time compilation purposes, e.g. expression evaluators or "server pages"
+engines like JSP.
+
+%package -n commons-compiler
+Group: Development/Tools
+Summary: Interfaces for an embedded Java compiler
+Requires: janino-parent = %{version}
+Requires: jpackage-utils
+
+%description -n commons-compiler
+This package declares interfaces for the implementation of
+an org.codehaus.commons.compiler.IExpressionEvaluator,
+an org.codehaus.commons.compiler.IScriptEvaluator,
+an org.codehaus.commons.compiler.IClassBodyEvaluator
+and an org.codehaus.commons.compiler.ISimpleCompiler.
+All of these adhere to the syntax of the Java programming language.
+
+%package -n commons-compiler-jdk
+Group: Development/Tools
+Summary: Commons Compiler Jdk
+Requires: commons-compiler = %{version}
+Requires: janino-parent = %{version}
+Requires: jpackage-utils
+
+%description -n commons-compiler-jdk
+This package declares interfaces for the implementation of
+an org.codehaus.commons.compiler.jdk.ExpressionEvaluator.
+and consorts instead of org.codehaus.janino.ExpressionEvaluator;
+commons-compiler-jdk is an alternative of janino.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+
+find . -name "*.jar" -delete
+find . -name "*.class" -delete
+
+for m in commons-compiler \
+ commons-compiler-jdk \
+ %{name};do
+ mkdir -p ${m}/src
+ (
+ cd ${m}/src/
+ unzip -qq ../../${m}-src.zip
+ if [ -f org.codehaus.commons.compiler.properties ]; then
+ mkdir -p main/resources
+ mv org.codehaus.commons.compiler.properties main/resources
+ fi
+ )
+done
+
+cp -p %{SOURCE1} pom.xml
+cp -p %{SOURCE2} commons-compiler/pom.xml
+cp -p %{SOURCE3} commons-compiler-jdk/pom.xml
+cp -p %{SOURCE4} %{name}/pom.xml
+
+%patch0 -p1
+
+perl -pi -e 's/\r$//g' new_bsd_license.txt README.txt
+
+%build
+
+mvn-rpmbuild install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -m 644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -m 644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+for m in \
+ commons-compiler\
+ commons-compiler-jdk;do
+ install -m 644 ${m}/target/${m}-%{version}.jar %{buildroot}%{_javadir}/${m}.jar
+ install -m 644 ${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-${m}.pom
+ %add_maven_depmap -f ${m} JPP-${m}.pom ${m}.jar
+done
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc new_bsd_license.txt README.txt
+
+%files -n commons-compiler
+%{_javadir}/commons-compiler.jar
+%{_mavenpomdir}/JPP-commons-compiler.pom
+%{_mavendepmapfragdir}/%{name}-commons-compiler
+%doc new_bsd_license.txt
+
+%files -n commons-compiler-jdk
+%{_javadir}/commons-compiler-jdk.jar
+%{_mavenpomdir}/JPP-commons-compiler-jdk.pom
+%{_mavendepmapfragdir}/%{name}-commons-compiler-jdk
+%doc new_bsd_license.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc new_bsd_license.txt
+
+%changelog
+* Mon Apr 16 2012 gil cattaneo <puntogil at libero.it> 2.6.1-7
+- Remove commons-compiler as a BuildRequirement
+- Add janino-parent as a Requirement
+
+* Fri Apr 13 2012 gil cattaneo <puntogil at libero.it> 2.6.1-6
+- removed BR unzip
+
+* Fri Apr 13 2012 gil cattaneo <puntogil at libero.it> 2.6.1-5
+- commons-compiler spec file merged
+
+* Fri Apr 13 2012 gil cattaneo <puntogil at libero.it> 2.6.1-4
+- added missing BR maven-surefire-provider-junit4 for prevent mock build failure
+
+* Tue Apr 10 2012 gil cattaneo <puntogil at libero.it> 2.6.1-3
+- removed janino-parent commons-compiler modules.
+
+* Sun Mar 25 2012 gil cattaneo <puntogil at libero.it> 2.6.1-2
+- janino janino-parent commons-compiler spec file merged
+
+* Tue Mar 20 2012 Mary Ellen Foster <mefoster at gmail.com> - 2.6.1-1
+- Update to 2.6.1, with new build system and all
+- Prepare for re-review
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.15-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Oct 27 2009 Mary Ellen Foster <mefoster at gmail.com> - 2.5.15-3
+- Changed group tag on main package and sub-package
+- Fixed default attribute on files section
+
+* Mon Oct 26 2009 Mary Ellen Foster <mefoster at gmail.com> - 2.5.15-2
+- Removed gcj bits
+
+* Sun Oct 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 2.5.15-1
+- Initial package, based on Alexander Kurtakov's JPackage and Mandriva package
diff --git a/sources b/sources
new file mode 100644
index 0000000..ab354af
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+bd1f9d38b8329017e469503baf53cf5b janino-2.6.1.zip
More information about the java-sig-commits
mailing list