[Jpackage-commits] dist/plexus-compiler/devel plexus-compiler.spec, 1.5, 1.6 plexus-components-1.1.18.pom, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Tue Dec 21 10:47:22 CET 2010


Update of /home/projects/jpackage/cvs/dist/plexus-compiler/devel
In directory ryu.zarb.org:/tmp/cvs-serv17478

Modified Files:
	plexus-compiler.spec 
Added Files:
	plexus-components-1.1.18.pom 
Log Message:
1.8.1-1

Index: plexus-compiler.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-compiler/devel/plexus-compiler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** plexus-compiler.spec	14 Dec 2010 21:21:36 -0000	1.5
--- plexus-compiler.spec	21 Dec 2010 09:47:19 -0000	1.6
***************
*** 58,62 ****
  Source2:        plexus-compiler-1.8.1-autogenerated-files.tar.gz
  Source3:        plexus-compiler-1.8.1-jpp-depmap.xml
! 
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
--- 58,62 ----
  Source2:        plexus-compiler-1.8.1-autogenerated-files.tar.gz
  Source3:        plexus-compiler-1.8.1-jpp-depmap.xml
! Source4:        http://mirrors.ibiblio.org/pub/mirrors/maven2/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
***************
*** 85,98 ****
  BuildRequires:  aspectj >= 0:1.5.3
  BuildRequires:  classworlds
! BuildRequires:  ecj
  BuildRequires:  maven2-bootstrap
  BuildRequires:  maven-wagon
! BuildRequires:  plexus-containers-component-annotations
! BuildRequires:  plexus-containers-component-metadata
! BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils
  Requires:  aspectj >= 0:1.5.3
  Requires:  classworlds
! Requires:  ecj
  Requires:  plexus-container-default
  Requires:  plexus-utils
--- 85,96 ----
  BuildRequires:  aspectj >= 0:1.5.3
  BuildRequires:  classworlds
! BuildRequires:  ecj3
  BuildRequires:  maven2-bootstrap
  BuildRequires:  maven-wagon
! BuildRequires:  plexus-containers-container-default
  BuildRequires:  plexus-utils
  Requires:  aspectj >= 0:1.5.3
  Requires:  classworlds
! Requires:  ecj3
  Requires:  plexus-container-default
  Requires:  plexus-utils
***************
*** 127,141 ****
  %endif
  
- #%patch0 -b .sav0
- 
  %build
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
  export M2_SETTINGS=$(pwd)/settings.xml
! cp $M2_SETTINGS .m2
  %if %{with_maven}
  mvn-jpp -e \
      -s $M2_SETTINGS \
-     -Duser.home=$(pwd) \
      -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
      -Dmaven2.jpp.depmap.file=%{SOURCE3} \
--- 125,140 ----
  %endif
  
  %build
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
! cp %{SOURCE4} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/JPP.plexus-components.pom
! 
  export M2_SETTINGS=$(pwd)/settings.xml
! mkdir external_repo
! ln -s %{_javadir} external_repo/JPP
! 
  %if %{with_maven}
  mvn-jpp -e \
      -s $M2_SETTINGS \
      -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
      -Dmaven2.jpp.depmap.file=%{SOURCE3} \
***************
*** 343,346 ****
--- 342,349 ----
  
  %changelog
+ * Tue Dec 21 2010 Ralph Apel <r.apel at r-apel.de> - 0:1.8.1-1
+ - 1.8.1
+ - (B)R ecj3
+ 
  * Mon Mar 02 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.5.3-3.jpp5
  - Rebuild once with ant

--- NEW FILE: plexus-components-1.1.18.pom ---
<?xml version="1.0" encoding="UTF-8"?>

<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>
    <artifactId>plexus</artifactId>
    <groupId>org.codehaus.plexus</groupId>
    <version>2.0.7</version>
    <relativePath>../pom/pom.xml</relativePath>
  </parent>

  <groupId>org.codehaus.plexus</groupId>
  <artifactId>plexus-components</artifactId>
  <version>1.1.18</version>
  <packaging>pom</packaging>

  <name>Plexus Components</name>
  <url>http://plexus.codehaus.org/plexus-components</url>


  <modules>
    <module>plexus-archiver</module>
    <module>plexus-cli</module>
    <module>plexus-compiler</module>
    <module>plexus-digest</module>
    <module>plexus-i18n</module>
    <module>plexus-interactivity</module>
    <module>plexus-interpolation</module>
    <module>plexus-io</module>
    <module>plexus-resources</module>
    <!--
    <module>plexus-swizzle</module>
    -->
    <module>plexus-velocity</module>
  </modules>

  <scm>
    <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-components/tags/plexus-components-1.1.18</connection>
    <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-components/tags/plexus-components-1.1.18</developerConnection>
    <url>http://fisheye.codehaus.org/browse/plexus/plexus-components/tags/plexus-components-1.1.18</url>
  </scm>
  <issueManagement>
    <system>JIRA</system>
    <url>http://jira.codehaus.org/browse/PLXCOMP</url>
  </issueManagement>

  <dependencyManagement>
    <dependencies>
      <dependency>
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-container-default</artifactId>
        <version>1.0-alpha-9-stable-1</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-utils</artifactId>
        <version>1.5.5</version>
      </dependency>
      <dependency>
        <groupId>junit</groupId>
        <artifactId>junit</artifactId>
        <version>3.8.2</version>
        <scope>test</scope>
      </dependency>
    </dependencies>
  </dependencyManagement>

  <build>
    <plugins>
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.4</source>
          <target>1.4</target>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-component-metadata</artifactId>
        <version>1.5.4</version>
        <executions>
          <execution>
            <goals>
              <goal>generate-metadata</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
    </plugins>
  </build>
  
  <profiles>
    <profile>
      <id>parent-release</id>
      <build>
        <plugins>
          <plugin>
            <artifactId>maven-release-plugin</artifactId>
            <configuration>
              <arguments>-N -Pplexus-release</arguments>
            </configuration>
          </plugin>
        </plugins>
      </build>
    </profile>
    <profile>
      <id>maven-3</id>
      <activation>
        <file>
          <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
          <exists>${basedir}</exists>
        </file>
      </activation>
      <build>
        <plugins>
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-site-plugin</artifactId>
            <version>2.1</version>
            <inherited>false</inherited>
            <executions>
              <execution>
                <id>attach-descriptor</id>
                <goals>
                  <goal>attach-descriptor</goal>
                </goals>
              </execution>
            </executions>
          </plugin>
        </plugins>
      </build>
    </profile>  
    <profile>
      <id>m2e</id>
      <activation>
        <property>
          <name>m2e.version</name>
        </property>
      </activation>
      <properties>
        <m2BuildDirectory>target</m2BuildDirectory>
      </properties>
      <build>
        <directory>${m2BuildDirectory}</directory>
        <plugins>
          <plugin>
            <groupId>org.maven.ide.eclipse</groupId>
            <artifactId>lifecycle-mapping</artifactId>
            <version>0.10.0</version>
            <configuration>
              <mappingId>customizable</mappingId>
              <configurators>
                <configurator id="org.maven.ide.eclipse.jdt.javaConfigurator" />
                <configurator id="org.maven.ide.eclipse.plexus.annotations.plexusConfigurator" />
                <configurator id="org.maven.ide.eclipse.modello.modelloConfigurator" />
              </configurators>
              <mojoExecutions>
                <mojoExecution>org.apache.maven.plugins:maven-resources-plugin::</mojoExecution>
              </mojoExecutions>
            </configuration>
          </plugin>
        </plugins>
      </build>
    </profile>  
  </profiles>
  
</project>




More information about the JPackage-commits mailing list