[java-sig-commits] [janino] merged commons-compiler, commons-compiler-jdk and janino-parent in main package
gil
gil at fedoraproject.org
Sat Apr 28 09:32:42 UTC 2012
commit 7ba5ebefb61ea20fc4a80d4e3eeee1170f17059a
Author: gil <puntogil at libero.it>
Date: Sat Apr 28 09:34:40 2012 +0200
merged commons-compiler, commons-compiler-jdk and janino-parent in main package
janino-2.6.1-aggregator-01.pom | 27 ----
janino-2.6.1-pom.patch | 48 -------
janino-2.6.1-poms.patch | 100 +++++++++++++++
janino-parent-2.6.1.pom | 265 ++++++++++++++++++++++++++++++++++++++++
janino.spec | 84 ++++---------
5 files changed, 392 insertions(+), 132 deletions(-)
---
diff --git a/janino-2.6.1-poms.patch b/janino-2.6.1-poms.patch
new file mode 100644
index 0000000..7b3cb64
--- /dev/null
+++ b/janino-2.6.1-poms.patch
@@ -0,0 +1,100 @@
+diff -Nru janino-2.6.1/commons-compiler/pom.xml janino-2.6.1-gil/commons-compiler/pom.xml
+--- janino-2.6.1/commons-compiler/pom.xml 2012-01-21 03:57:03.000000000 +0100
++++ janino-2.6.1-gil/commons-compiler/pom.xml 2012-04-18 14:33:09.198316607 +0200
+@@ -9,9 +9,9 @@
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ </parent>
+-
++ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+-
++ <version>2.6.1</version>
+ <name>Commons Compiler</name>
+
+ <dependencies>
+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-18 14:33:09.199316607 +0200
+@@ -9,15 +9,16 @@
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ </parent>
+-
++ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler-jdk</artifactId>
+-
++ <version>2.6.1</version>
+ <name>Commons Compiler Jdk</name>
+
+ <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-18 14:33:09.199316607 +0200
+@@ -9,9 +9,11 @@
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ </parent>
+-
++
++ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+-
++ <version>2.6.1</version>
++
+ <name>Janino</name>
+
+ <dependencies>
+@@ -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 -Nru janino-2.6.1/pom.xml janino-2.6.1-gil/pom.xml
+--- janino-2.6.1/pom.xml 2012-01-21 03:56:49.000000000 +0100
++++ janino-2.6.1-gil/pom.xml 2012-04-18 14:33:37.549315690 +0200
+@@ -109,7 +109,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+- <artifactId>ant-nodeps</artifactId>
++ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ </dependencies>
+@@ -243,7 +243,7 @@
+ <inputEncoding>${project.build.sourceEncoding}</inputEncoding><!-- not needed in 2.2 -->
+ </configuration>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.1.1</version>
+@@ -257,7 +257,7 @@
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0</version>
+- </plugin>
++ </plugin-->
+ </plugins>
+ </reporting>
+ </profile>
diff --git a/janino-parent-2.6.1.pom b/janino-parent-2.6.1.pom
new file mode 100644
index 0000000..4d0c455
--- /dev/null
+++ b/janino-parent-2.6.1.pom
@@ -0,0 +1,265 @@
+<?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</groupId>
+ <artifactId>codehaus-parent</artifactId>
+ <version>4</version>
+ </parent>
+
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino-parent</artifactId>
+ <version>2.6.1</version>
+ <packaging>pom</packaging>
+
+ <name>Janino Parent</name>
+ <description>
+ Janino is a compiler that reads a JavaTM expression, block, class body, source file or a set of source files, and
+ generates JavaTM bytecode that is loaded and executed directly. 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.
+ </description>
+ <url>http://docs.codehaus.org/display/JANINO/Home</url>
+ <inceptionYear>2001</inceptionYear>
+ <licenses>
+ <license>
+ <name>New BSD License</name>
+ <url>http://dist.codehaus.org/janino/new_bsd_license.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <mailingLists>
+ <mailingList>
+ <name>Development List</name>
+ <subscribe>dev-subscribe at janino.codehaus.org</subscribe>
+ <unsubscribe>dev-unsubscribe at janino.codehaus.org</unsubscribe>
+ <post>dev at janino.codehaus.org</post>
+ <archive>http://archive.janino.codehaus.org/dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>user-subscribe at janino.codehaus.org</subscribe>
+ <unsubscribe>user-unsubscribe at janino.codehaus.org</unsubscribe>
+ <post>user at janino.codehaus.org</post>
+ <archive>http://archive.janino.codehaus.org/user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits List</name>
+ <subscribe>scm-subscribe at janino.codehaus.org</subscribe>
+ <unsubscribe>scm-unsubscribe at janino.codehaus.org</unsubscribe>
+ <archive>http://archive.janino.codehaus.org/scm/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <developers>
+ <developer>
+ <id>aunkrig</id>
+ <name>Arno Unkrig</name>
+ <roles>
+ <role>Despot</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>matt.fowles</id>
+ <name>Matt Fowles</name>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <modules>
+ <module>commons-compiler</module>
+ <module>commons-compiler-jdk</module>
+ <module>janino</module>
+ </modules>
+
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/janino/tags/V_2_6_1/</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/janino/tags/V_2_6_1/</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/janino/tags/V_2_6_1/</url>
+ </scm>
+ <issueManagement>
+ <system>Jira</system>
+ <url>http://jira.codehaus.org/browse/JANINO</url>
+ </issueManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler-jdk</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>tests</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <source>1.2</source>
+ <target>1.1</target>
+ <testSource>1.6</testSource>
+ <testTarget>1.6</testTarget>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <test>**/*Tests</test>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <configuration>
+ <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <inputEncoding>${project.build.sourceEncoding}</inputEncoding><!-- not needed in 2.2 -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+</project>
diff --git a/janino.spec b/janino.spec
index f107b28..38225c6 100644
--- a/janino.spec
+++ b/janino.spec
@@ -29,21 +29,20 @@
#
Name: janino
Version: 2.6.1
-Release: 7%{?dist}
+Release: 11%{?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
+Source1: http://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}-parent/%{version}/%{name}-parent-%{version}.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
-
+# remove org.codehaus.mojo findbugs-maven-plugin 1.1.1, javancss-maven-plugin 2.0, jdepend-maven-plugin 2.0-beta-2
# change artifactId ant-nodeps in ant
-Patch0: %{name}-%{version}-pom.patch
+Patch0: %{name}-%{version}-poms.patch
-BuildRequires: janino-parent
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
@@ -63,8 +62,6 @@ 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
@@ -79,33 +76,6 @@ 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}
@@ -149,47 +119,47 @@ 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
+install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
+%add_maven_depmap JPP.%{name}-parent.pom
+
+mkdir -p %{buildroot}%{_javadir}/%{name}
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
+ commons-compiler-jdk \
+ %{name};do
+ install -m 644 ${m}/target/${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
+ install -m 644 ${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom
+ %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
done
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
+%{_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
+* Thu Apr 19 2012 gil cattaneo <puntogil at libero.it> 2.6.1-11
+- Remove janino-parent as a BuildRequirement
+
+* Wed Apr 18 2012 gil cattaneo <puntogil at libero.it> 2.6.1-10
+- moved all of the jar files into janino subdirectory
+
+* Wed Apr 18 2012 gil cattaneo <puntogil at libero.it> 2.6.1-9
+- merged commons-compiler, commons-compiler-jdk and janino-parent in main package
+
+* Wed Apr 18 2012 gil cattaneo <puntogil at libero.it> 2.6.1-8
+- add janino-parent
+
* 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
More information about the java-sig-commits
mailing list