rpms/plexus-containers
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 1.6

Browse Source
This commit is contained in:
Mikolaj Izdebski 2014-10-27 12:38:27 +01:00
parent c3bca4d25e
commit 440b2aeda9
6 changed files with 13 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/.project
/*.src.rpm
/noarch
/plexus-containers-1.6.tar.gz

76
plexus-component-annotations-build.xml
View File

@ -1,76 +0,0 @@
<project name="plexus-component-annotations" default="jar" basedir=".">
<property name="maven.build.output" value="target/classes"/>
<property name="maven.build.directory" value="target"/>
<property name="maven.build.final.name" value="plexus-component-annotations-1.0-alpha-30"/>
<property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
<property name="maven.test.output" value="target/test-classes"/>
<property name="javadocdir" value="target/site/annotationsdocs"></property>
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.directory}"/>
</target>
<target name="compile" description="Compile the code">
<mkdir dir="${maven.build.output}"/>
<javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/main/java"/>
</src>
</javac>
</target>
<target name="jar" depends="compile,test" description="Clean the JAR">
<jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
</target>
<target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
<mkdir dir="${maven.test.output}"/>
<javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/test/java"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
</classpath>
</javac>
</target>
<target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
<pathelement location="${maven.test.output}"/>
</classpath>
<batchtest todir="${maven.test.reports}">
<fileset dir="src/test/java">
<include name="**/*Test.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="junit-present" depends="test-junit-present" unless="junit.present">
<echo>================================= WARNING ================================</echo>
<echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
<echo>==========================================================================</echo>
</target>
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${build.sysclasspath}" arg2="only"/>
</condition>
</target>
<target name="javadoc" description="o Generate javadoc" >
<mkdir dir="${javadocdir}"></mkdir>
<tstamp>
<format pattern="-yyyy" property="year"></format>
</tstamp>
<property name="copyright" value="Copyright &amp;copy; . All Rights Reserved."></property>
<property name="title" value="Plexus Component 1.0 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
</javadoc>
</target>
</project>

82
plexus-container-default-build.xml
View File

@ -1,82 +0,0 @@
<project name="plexus-container-default" default="jar" basedir=".">
<property name="maven.build.output" value="target/classes"/>
<property name="maven.build.directory" value="target"/>
<property name="maven.build.final.name" value="plexus-container-default-1.0-alpha-30"/>
<property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
<property name="maven.test.output" value="target/test-classes"/>
<property name="javadocdir" value="target/site/apidocs"></property>
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.directory}"/>
</target>
<target name="compile" description="Compile the code">
<mkdir dir="${maven.build.output}"/>
<javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/main/java"/>
</src>
</javac>
<copy todir="${maven.build.output}">
<fileset dir="src/main/resources"/>
</copy>
</target>
<target name="jar" depends="compile,test" description="Clean the JAR">
<jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
</target>
<target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
<mkdir dir="${maven.test.output}"/>
<javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/test/java"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
</classpath>
</javac>
<copy todir="${maven.test.output}">
<fileset dir="src/test/resources"/>
</copy>
</target>
<target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="false" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
<pathelement location="${maven.test.output}"/>
</classpath>
<batchtest todir="${maven.test.reports}">
<fileset dir="src/test/java">
<include name="**/*Test.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="junit-present" depends="test-junit-present" unless="junit.present">
<echo>================================= WARNING ================================</echo>
<echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
<echo>==========================================================================</echo>
</target>
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${build.sysclasspath}" arg2="only"/>
</condition>
</target>
<target name="javadoc" description="o Generate javadoc" >
<mkdir dir="${javadocdir}"></mkdir>
<tstamp>
<format pattern="-yyyy" property="year"></format>
</tstamp>
<property name="copyright" value="Copyright &amp;copy; . All Rights Reserved."></property>
<property name="title" value="Plexus Container Default 1.0 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
</javadoc>
</target>
</project>

47
plexus-containers-settings.xml
View File

@ -1,47 +0,0 @@
<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>

47
plexus-containers.spec
View File

@ -1,29 +1,13 @@
%global with_maven 1
%global parent plexus
%global subname containers
Name: %{parent}-%{subname}
Version: 1.5.5
Release: 20%{?dist}
Name: plexus-containers
Version: 1.6
Release: 1%{?dist}
Summary: Containers for Plexus
License: ASL 2.0 and MIT
URL: http://plexus.codehaus.org/
# svn export \
# http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.5.5
# tar caf plexus-containers-1.5.5.tar.xz plexus-containers-1.5.5
Source0: %{name}-%{version}.tar.xz
Source1: plexus-container-default-build.xml
Source2: plexus-component-annotations-build.xml
Source3: plexus-containers-settings.xml
Patch0: 0001-Fix-test-oom.patch
Patch1: 0002-Update-to-Plexus-Classworlds-2.5.patch
Patch2: 0003-Port-to-objectweb-asm-5.patch
BuildArch: noarch
Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
BuildRequires: maven-local
BuildRequires: maven-invoker-plugin
BuildRequires: maven-resources-plugin
@ -37,12 +21,7 @@ BuildRequires: plexus-cli
BuildRequires: xbean >= 3.14
BuildRequires: guava
BuildRequires: objectweb-asm >= 5.0.2
Requires: plexus-classworlds >= 2.5
Requires: plexus-utils
Requires: xbean >= 3.14
Requires: guava
Requires: objectweb-asm >= 5.0.2
BuildRequires: qdox >= 2.0
%description
@ -95,19 +74,12 @@ Obsoletes: %{name}-container-default-javadoc < %{version}-%{release}
%{summary}.
%prep
%setup -q -n plexus-containers-%{version}
cp %{SOURCE1} plexus-container-default/build.xml
cp %{SOURCE2} plexus-component-annotations/build.xml
%patch0 -p1
%patch1 -p1
%patch2 -p1
%setup -q -n %{name}-%{name}-%{version}
# For Maven 3 compat
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
# OpenJDK7 compatibility
%pom_remove_dep com.sun:tools plexus-component-javadoc
%pom_add_dep com.sun:tools plexus-component-javadoc
# Generate OSGI info
@ -158,6 +130,9 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
%files javadoc -f .mfiles-javadoc
%changelog
* Mon Oct 27 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-1
- Update to upstream version 1.6
* Mon Oct 6 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.5-20
- Obsolete plexus-container-default

2
sources
View File

@ -1 +1 @@
78e22c30a99ed7b4e7ac77f37c991b1d plexus-containers-1.5.5.tar.xz
714aacab3f96df34dffa2d2e9db6d3b1 plexus-containers-1.6.tar.gz