[Jpackage-commits] rpms/devel/maven-scala-plugin maven-scala-plugin-ScalaDocMojo.patch, NONE, 1.1 maven-scala-plugin-jpp-depmap.xml, NONE, 1.1 maven-scala-plugin-pom.patch, NONE, 1.1 maven-scala-plugin-settings.xml, NONE, 1.1 maven-scala-plugin.spec, NONE, 1.1 scala-tools-parent.pom, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Sat Nov 6 16:39:59 CET 2010


Update of /home/projects/jpackage/cvs/rpms/devel/maven-scala-plugin
In directory ryu.zarb.org:/tmp/QuLS11sCxO/rpms/devel/maven-scala-plugin

Added Files:
	maven-scala-plugin-ScalaDocMojo.patch 
	maven-scala-plugin-jpp-depmap.xml maven-scala-plugin-pom.patch 
	maven-scala-plugin-settings.xml maven-scala-plugin.spec 
	scala-tools-parent.pom 
Log Message:
2.11-1.jpp6

--- NEW FILE: maven-scala-plugin.spec ---
# Copyright (c) 2000-2010, 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:           maven-scala-plugin
Version:        2.11
Release:        1%{?dist}
Summary:        Scala Maven Plugin

Group:          Development/Libraries
License:        Apache Software License 2.0
URL:            http://scala-tools.org/mvnsites/maven-scala-plugin/

Source0:        davidB-maven-scala-plugin-2.11-0-g5b34bc4.tar.gz
# download  at http://github.com/davidB/maven-scala-plugin/tree/v2.11


Source1:       %{name}-settings.xml
Source2:       %{name}-jpp-depmap.xml 
Source3:       scala-tools-parent.pom
Patch0:        maven-scala-plugin-pom.patch
Patch1:        maven-scala-plugin-ScalaDocMojo.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  maven2 >= 2.0.8
BuildRequires:  maven2-plugin-release
BuildRequires:  maven-plugin-tools
BuildRequires:  maven-shared-dependency-analyzer
BuildRequires:  apache-commons-parent
BuildRequires:  java-devel >= 1.6.0
BuildRequires:  jpackage-utils >= 0:1.7.5
BuildPreReq:    libpng
BuildRequires:  apiviz

Requires:  java >= 1.6.0
Requires:  jpackage-utils >= 0:1.7.5
Requires:  maven2

Requires(post):    jpackage-utils >= 0:1.7.5
Requires(postun):  jpackage-utils >= 0:1.7.5

BuildArch:      noarch

%description
The maven-scala-plugin is used for 
compiling/testing/running/documenting 
scala code in maven.

%package javadoc 
Summary:        Javadocs for %{name} 
Group:          Documentation 
Requires:       %{name} = %{version}-%{release} 
 
%description javadoc 
%{summary}. 

%prep
%setup -q -n davidB-maven-scala-plugin-f355120
cp -p %{SOURCE1} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
%patch0 -b .sav0
%patch1 -b .sav1
mkdir external_repo
ln -s %{_javadir} external_repo/JPP

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p ${MAVEN_REPO_LOCAL}
mkdir -p ${MAVEN_REPO_LOCAL}/org/scala-tools/scala-tools-parent/1.4/
cp %{SOURCE3} ${MAVEN_REPO_LOCAL}/org/scala-tools/scala-tools-parent/1.4/scala-tools-parent-1.4.pom

export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE2} -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Djava.awt.headless=true -Daggregate=true"
%{_bindir}/mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        install javadoc:javadoc

%install
%__rm -rf %{buildroot}

# jar
%__mkdir_p %{buildroot}%{_javadir}
%__install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
%__ln_s ${jar} ${jar/-%{version}/}; done)

# poms
%__mkdir_p %{buildroot}%{_datadir}/maven2/poms
%__install -m 644 pom.xml \
               $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.scala-tools maven-scala-plugin %{version} JPP %{name}
%__install -m 644 %{SOURCE3} \
               $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-scala-tools-parent.pom
%add_to_maven_depmap org.scala-tools scala-tools-parent 1.3 JPP scala-tools-parent

# javadoc 
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version} 
%__cp -a target/site/apidocs/* \
               %{buildroot}%{_javadocdir}/%{name}-%{version}/
%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} 

%clean
%__rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc 
%defattr(-,root,root,-) 
%{_javadocdir}/%{name}-%{version} 
%{_javadocdir}/%{name} 

%changelog
* Sat Nov 06 2010 Ralph Apel <r.apel at r-apel.de> 2.11-1
- First release


--- NEW FILE: maven-scala-plugin-jpp-depmap.xml ---
<dependencies>
<!--

    <dependency>
        <maven>
            <groupId>net.java.dev.jsr-275</groupId>
            <artifactId>jsr-275</artifactId>
            <version>1.0-beta-2</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>jsr275</artifactId>
            <version>1.0.0.01</version>
        </jpp>
    </dependency>
-->

</dependencies>

--- NEW FILE: scala-tools-parent.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Copyright 2007 scala-tools.org

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

     http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions
  and limitations under the License.
-->
<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/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.scala-tools</groupId>
  <artifactId>scala-tools-parent</artifactId>
  <version>1.5</version>
  <packaging>pom</packaging>
  <name>${project.artifactId}</name>
  <url>http://github.com/davidB/${project.artifactId}</url>
  <inceptionYear>2009</inceptionYear>
  <organization>
    <name>Scala Tools</name>
    <url>http://scala-tools.org/</url>
  </organization>

  <licenses>
    <license>
      <name>the Apache License, ASL Version 2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
      <distribution>repo</distribution>
    </license>
  </licenses>

  <scm>
    <connection>scm:git:git://github.com/davidB/${project.artifactId}.git</connection>
    <developerConnection>scm:git:git at github.com:davidB/${project.artifactId}.git</developerConnection>
    <url>http://github.com/davidB/${project.artifactId}/</url>
  </scm>

  <issueManagement>
    <system>github</system>
    <url>http://github.com/davidB/${project.artifactId}/issues</url>
  </issueManagement>

  <mailingLists>
    <mailingList>
      <name>Scala announces</name>
      <post>scala-announce[at]listes.epfl.ch</post>
      <subscribe>http://listes.epfl.ch/cgi-bin/doc_en?liste=scala-announce</subscribe>
      <unsubscribe>http://listes.epfl.ch/cgi-bin/doc_en?liste=scala-announce</unsubscribe>
      <archive>http://dir.gmane.org/gmane.comp.lang.scala.announce</archive>
    </mailingList>
    <mailingList>
      <name>Maven and Scala</name>
      <post>maven-and-scala at googlegroups.com</post>
      <subscribe>http://groups.google.com/group/maven-and-scala</subscribe>
      <unsubscribe>http://groups.google.com/group/maven-and-scala</unsubscribe>
      <archive>http://groups.google.com/group/maven-and-scala</archive>
    </mailingList>
  </mailingLists>

  <properties>
    <java.src.version>1.5</java.src.version>
  </properties>

  <repositories>
    <repository>
      <id>scala-tools.org</id>
      <name>Scala tools Repository</name>
      <url>http://scala-tools.org/repo-releases</url>
    </repository>
    <repository>
      <id>jboss.releases</id>
      <name>JBoss releases</name>
      <url>http://repository.jboss.org/maven2</url>
      <releases>
        <enabled>true</enabled>
      </releases>
      <snapshots>
        <enabled>false</enabled>
      </snapshots>
    </repository>
  </repositories>

  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-resources-plugin</artifactId>
        <configuration>
          <encoding>UTF-8</encoding>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>${java.src.version}</source>
          <target>${java.src.version}</target>
          <optimise>true</optimise>
          <debug>true</debug>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-jar-plugin</artifactId>
        <configuration>
          <archive>
            <index>true</index>
            <manifest>
              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
            </manifest>
            <manifestEntries />
          </archive>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <reporting>
    <plugins>
      <plugin>
        <artifactId>maven-project-info-reports-plugin</artifactId>
      </plugin>
      <plugin>
        <artifactId>maven-javadoc-plugin</artifactId>
        <configuration>
          <minmemory>128m</minmemory>
          <maxmemory>512m</maxmemory>
          <encoding>UTF-8</encoding>
          <docencoding>UTF-8</docencoding>
          <charset>UTF-8</charset>
          <breakiterator>true</breakiterator>
          <version>true</version>
          <author>true</author>
          <keywords>true</keywords>
<!--
          <doclet>org.jboss.apiviz.APIviz</doclet>
          <docletArtifact>
            <groupId>org.jboss.apiviz</groupId>
            <artifactId>apiviz</artifactId>
            <version>1.3.0.GA</version>
          </docletArtifact>
          <useStandardDocletOptions>true</useStandardDocletOptions>
          <additionalparam>
            -sourceclasspath ${project.build.outputDirectory}
          </additionalparam>
-->
          <links>
            <link>http://java.sun.com/j2se/${java.src.version}/docs/api/</link>
            <link>http://slf4j.org/api/</link>
            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
            <link>http://logging.apache.org/log4j/docs/api/</link>
            <link>http://people.apache.org/~tobrien/wicket/apidocs/</link>
            <link>http://commons.apache.org/lang/api-release/</link>
            <link>http://commons.apache.org/io/api-release/</link>
            <link>http://testng.org/javadocs/</link>
            <link>http://junit.sourceforge.net/javadoc/</link>
          </links>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-jxr-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>taglist-maven-plugin</artifactId>
        <configuration>
          <tags>
            <tag>TODO</tag>
            <tag>FIXME</tag>
            <tag>@todo</tag>
            <tag>@deprecated</tag>
          </tags>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-changes-plugin</artifactId>
        <version>2.0-beta-2</version>
        <reportSets>
          <reportSet>
            <reports>
              <report>changes-report</report>
            </reports>
          </reportSet>
        </reportSets>
      </plugin>
    </plugins>
  </reporting>

  <distributionManagement>
    <snapshotRepository>
      <id>scala-tools.org</id>
      <url>http://nexus.scala-tools.org/content/repositories/snapshots</url>
      <uniqueVersion>false</uniqueVersion>
    </snapshotRepository>
  </distributionManagement>

  <profiles>
    <profile>
      <id>release</id>
      <build>
        <plugins>
<!--
          <plugin>
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>rat-maven-plugin</artifactId>
            <version>1.0-alpha-3</version>
            <executions>
              <execution>
                <phase>validate</phase>
                <goals>
                  <goal>check</goal>
                </goals>
              </execution>
            </executions>
            <configuration>
              <includes>
                <include>src/**</include>
              </includes>
              <excludes>
                <exclude>**/*.xml</exclude>
                <exclude>src/site/**</exclude>
                <exclude>src/main/resources/**</exclude>
                <exclude>src/test/**</exclude>
              </excludes>
            </configuration>
          </plugin>
-->
          <plugin>
            <artifactId>maven-site-plugin</artifactId>
          </plugin>
          <plugin>
            <artifactId>maven-assembly-plugin</artifactId>
            <configuration>
              <descriptorRefs>
                <descriptorRef>project</descriptorRef>
              </descriptorRefs>
            </configuration>
            <executions>
              <execution>
                <id>make-assembly</id>
                <phase>package</phase>
                <goals>
                  <goal>attached</goal>
                </goals>
              </execution>
            </executions>
          </plugin>
        </plugins>
      </build>
      <distributionManagement>
        <repository>
          <id>scala-tools.org</id>
          <url>http://nexus.scala-tools.org/content/repositories/releases</url>
        </repository>
        <site>
          <!--
          <id>scala-tools.org</id>
          <url>dav:http://dav.scala-tools.org/mvnsites</url>

          dav protocol isn't optimized for site-deploy (very long for api)
          So
          * deploy on local file system
          * manually : archive tar -cjvf ....
          * manually : put the archives to http://dav.scala-tools.org/mvnsites
          * manually (request admin) : unarchives on remote server
          -->
          <id>local</id>
          <url>file://${user.home}/.m2/mvnsites/${project.groupId}/</url>
        </site>
      </distributionManagement>
    </profile>
  </profiles>
</project>

--- NEW FILE: maven-scala-plugin-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: maven-scala-plugin-pom.patch ---
--- pom.xml.sav0	2009-06-29 16:22:10.000000000 +0200
+++ pom.xml	2010-07-05 13:52:00.797305258 +0200
@@ -49,7 +49,7 @@
   </contributors>
 
   <properties>
-    <maven.version>2.0.9</maven.version>
+    <maven.version>2.0.8</maven.version>
   </properties>
 
   <prerequisites>
@@ -114,6 +114,7 @@
   </reporting>
   <build>
     <plugins>
+<!--
       <plugin>
         <artifactId>maven-invoker-plugin</artifactId>
         <version>1.3</version>
@@ -140,6 +141,7 @@
           </execution>
         </executions>
       </plugin>
+-->
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <version>2.0-beta-9</version>

--- NEW FILE: maven-scala-plugin-ScalaDocMojo.patch ---
--- src/main/java/org/scala_tools/maven/ScalaDocMojo.java.sav1	2009-06-29 16:22:10.000000000 +0200
+++ src/main/java/org/scala_tools/maven/ScalaDocMojo.java	2010-07-05 18:55:27.000000000 +0200
@@ -24,7 +24,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 import org.scala_tools.maven.executions.JavaCommand;
 import org.scala_tools.maven.executions.JavaMainCaller;




More information about the JPackage-commits mailing list