rpms / plexus-interactivity

Clone
Source Code
GIT

#1 update to version 1.0
Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

file modified
+5 -1 
@@ -1,1 +1,5 @@
 

- plexus-interactivity-1.0-alpha-6-src.tar.xz
 

+ /results_*
 

+ /*.src.rpm
 

+ 

+ /plexus-interactivity-1.0-alpha-6-src.tar.xz
 

+ /plexus-interactivity-1.0.tar.gz

file removed
-85 
@@ -1,85 +0,0 @@
 

- <?xml version="1.0" encoding="UTF-8"?>
 

- 

- <!--build.xml generated by maven from project.xml version 1.0-alpha-5
 

-   on date November 4 2005, time 1150-->
 

- <project default="jar" name="plexus-interactivity-api" basedir=".">
 

-   <property name="defaulttargetdir" value="target"></property>
 

-   <property name="libdir" value="target/lib"></property>
 

-   <property name="classesdir" value="target/classes"></property>
 

-   <property name="testclassesdir" value="target/test-classes"></property>
 

-   <property name="distdir" value="dist"></property>
 

-   <property name="javadocdir" value="target/docs/apidocs"></property>
 

-   <property name="final.name" value="plexus-interactivity-api-1.0-alpha-5"></property>
 

-   <path id="build.classpath">
 

-     <fileset dir="${libdir}">
 

-       <include name="**/*.jar"></include>
 

-     </fileset>
 

-   </path>
 

-   <target name="init" description="o Initializes some properties">
 

-     <mkdir dir="${libdir}"></mkdir>
 

-     <condition property="noget">
 

-       <equals arg2="only" arg1="${build.sysclasspath}"></equals>
 

-     </condition>
 

-     <!--Test if JUNIT is present in ANT classpath-->
 

-     <available property="Junit.present" classname="junit.framework.Test"></available>
 

-   </target>
 

-   <target name="compile" description="o Compile the code" depends="get-deps">
 

-     <mkdir dir="${classesdir}"></mkdir>
 

-     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
 

-       <src>
 

-         <pathelement location="src/main/java"></pathelement>
 

-       </src>
 

-       <classpath refid="build.classpath"></classpath>
 

-     </javac>
 

-     <copy todir="${classesdir}">
 

-       <fileset dir="src/main/resources">
 

-         <include name="**/*"></include>
 

-       </fileset>
 

-     </copy>
 

-   </target>
 

-   <target name="jar" description="o Create the jar" depends="compile,test">
 

-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
 

-   </target>
 

-   <target name="clean" description="o Clean up the generated directories">
 

-     <delete dir="${defaulttargetdir}"></delete>
 

-     <delete dir="${distdir}"></delete>
 

-   </target>
 

-   <target name="dist" description="o Create a distribution" depends="jar, javadoc">
 

-     <mkdir dir="dist"></mkdir>
 

-     <copy todir="dist">
 

-       <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
 

-       <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
 

-     </copy>
 

-   </target>
 

-   <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
 

-     <fail message="There were test failures."></fail>
 

-   </target>
 

-   <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"></target>
 

-   <target name="junit-present" unless="Junit.present" depends="init">
 

-     <echo>================================= WARNING ================================</echo>
 

-     <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
 

-     <echo>==========================================================================</echo>
 

-   </target>
 

-   <target name="compile-tests" if="Junit.present" depends="junit-present,compile"></target>
 

-   <target name="javadoc" description="o Generate javadoc" depends="get-deps">
 

-     <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 Default Interactivity Handler 1.0-alpha-5 API"></property>
 

-     <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.components.interactivity.*">
 

-       <classpath>
 

-         <path refid="build.classpath"></path>
 

-       </classpath>
 

-     </javadoc>
 

-   </target>
 

-   <target name="get-deps" unless="noget" depends="init">
 

-     <!--Proxy settings works only with a JDK 1.2 and higher.-->
 

-     <setproxy></setproxy>
 

-   </target>
 

-   <target name="install-maven">
 

-     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
 

-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
 

-   </target>
 

- </project>

file removed
-85 
@@ -1,85 +0,0 @@
 

- <?xml version="1.0" encoding="UTF-8"?>
 

- 

- <!--build.xml generated by maven from project.xml version 1.0-alpha-5
 

-   on date November 4 2005, time 1202-->
 

- <project default="jar" name="plexus-interactivity-jline" basedir=".">
 

-   <property name="defaulttargetdir" value="target"></property>
 

-   <property name="libdir" value="target/lib"></property>
 

-   <property name="classesdir" value="target/classes"></property>
 

-   <property name="testclassesdir" value="target/test-classes"></property>
 

-   <property name="distdir" value="dist"></property>
 

-   <property name="javadocdir" value="target/docs/apidocs"></property>
 

-   <property name="final.name" value="plexus-interactivity-jline-1.0-alpha-5"></property>
 

-   <path id="build.classpath">
 

-     <fileset dir="${libdir}">
 

-       <include name="**/*.jar"></include>
 

-     </fileset>
 

-   </path>
 

-   <target name="init" description="o Initializes some properties">
 

-     <mkdir dir="${libdir}"></mkdir>
 

-     <condition property="noget">
 

-       <equals arg2="only" arg1="${build.sysclasspath}"></equals>
 

-     </condition>
 

-     <!--Test if JUNIT is present in ANT classpath-->
 

-     <available property="Junit.present" classname="junit.framework.Test"></available>
 

-   </target>
 

-   <target name="compile" description="o Compile the code" depends="get-deps">
 

-     <mkdir dir="${classesdir}"></mkdir>
 

-     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
 

-       <src>
 

-         <pathelement location="src/main/java"></pathelement>
 

-       </src>
 

-       <classpath refid="build.classpath"></classpath>
 

-     </javac>
 

-     <copy todir="${classesdir}">
 

-       <fileset dir="src/main/resources">
 

-         <include name="**/*"></include>
 

-       </fileset>
 

-     </copy>
 

-   </target>
 

-   <target name="jar" description="o Create the jar" depends="compile,test">
 

-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
 

-   </target>
 

-   <target name="clean" description="o Clean up the generated directories">
 

-     <delete dir="${defaulttargetdir}"></delete>
 

-     <delete dir="${distdir}"></delete>
 

-   </target>
 

-   <target name="dist" description="o Create a distribution" depends="jar, javadoc">
 

-     <mkdir dir="dist"></mkdir>
 

-     <copy todir="dist">
 

-       <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
 

-       <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
 

-     </copy>
 

-   </target>
 

-   <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
 

-     <fail message="There were test failures."></fail>
 

-   </target>
 

-   <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"></target>
 

-   <target name="junit-present" unless="Junit.present" depends="init">
 

-     <echo>================================= WARNING ================================</echo>
 

-     <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
 

-     <echo>==========================================================================</echo>
 

-   </target>
 

-   <target name="compile-tests" if="Junit.present" depends="junit-present,compile"></target>
 

-   <target name="javadoc" description="o Generate javadoc" depends="get-deps">
 

-     <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 JLine Interactivity Handler 1.0-alpha-5 API"></property>
 

-     <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.components.interactivity.jline.*">
 

-       <classpath>
 

-         <path refid="build.classpath"></path>
 

-       </classpath>
 

-     </javadoc>
 

-   </target>
 

-   <target name="get-deps" unless="noget" depends="init">
 

-     <!--Proxy settings works only with a JDK 1.2 and higher.-->
 

-     <setproxy></setproxy>
 

-   </target>
 

-   <target name="install-maven">
 

-     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
 

-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
 

-   </target>
 

- </project>

file removed
-16 
@@ -1,16 +0,0 @@
 

- diff --git a/plexus-interactivity-api/pom.xml b/plexus-interactivity-api/pom.xml
 

- index 84e659e..943d7e4 100644
 

- --- a/plexus-interactivity-api/pom.xml
 

- +++ b/plexus-interactivity-api/pom.xml
 

- @@ -11,6 +11,11 @@
 

-    <dependencies>
 

-      <dependency>
 

-        <groupId>org.codehaus.plexus</groupId>
 

- +      <artifactId>plexus-component-api</artifactId>
 

- +      <version>1.0-alpha-15</version>
 

- +    </dependency>
 

- +    <dependency>
 

- +      <groupId>org.codehaus.plexus</groupId>
 

-        <artifactId>plexus-utils</artifactId>
 

-        <version>1.4</version>
 

-      </dependency>

file removed
-33 
@@ -1,33 +0,0 @@
 

- diff --git a/plexus-interactivity-jline/pom.xml b/plexus-interactivity-jline/pom.xml
 

- index fc9b185..afffd1d 100644
 

- --- a/plexus-interactivity-jline/pom.xml
 

- +++ b/plexus-interactivity-jline/pom.xml
 

- @@ -12,7 +12,7 @@
 

-      <dependency>
 

-        <groupId>jline</groupId>
 

-        <artifactId>jline</artifactId>
 

- -      <version>0.9.1</version>
 

- +      <version>2.10</version>
 

-      </dependency>
 

-      <dependency>
 

-        <groupId>org.codehaus.plexus</groupId>
 

- @@ -20,4 +20,4 @@
 

-        <version>1.0-alpha-6</version>
 

-      </dependency>
 

-    </dependencies>
 

- -</project>
 

- \ No newline at end of file
 

- +</project>
 

- diff --git a/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java b/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
 

- index 69e7b78..2a23942 100755
 

- --- a/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
 

- +++ b/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
 

- @@ -24,7 +24,7 @@ package org.codehaus.plexus.components.interactivity.jline;
 

-   * SOFTWARE.
 

-   */
 

-  

- -import jline.ConsoleReader;
 

- +import jline.console.ConsoleReader;
 

-  import org.codehaus.plexus.components.interactivity.AbstractInputHandler;
 

-  import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 

-  import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;

file modified
+30 -17 
@@ -1,24 +1,20 @@
 

  Name:           plexus-interactivity
 

- Version:        1.0
 

- Release:        0.29.alpha6%{?dist}
 

- Epoch:          0
 

  Summary:        Plexus Interactivity Handler Component
 

+ Epoch:          0
 

+ Version:        1.0
 

+ Release:        1%{?dist}
 

  License:        MIT
 

+ 

  URL:            https://github.com/codehaus-plexus/plexus-interactivity
 

- BuildArch:      noarch
 

- # svn export \
 

- #   http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interactivity-1.0-alpha-6/
 

- # tar caf plexus-interactivity-1.0-alpha-6-src.tar.xz \
 

- #   plexus-interactivity-1.0-alpha-6
 

- Source0:        plexus-interactivity-1.0-alpha-6-src.tar.xz
 

+ Source0:        %{url}/archive/%{name}-%{version}.tar.gz
 

  Source1:        LICENSE.MIT
 

- Patch1:         plexus-interactivity-dependencies.patch
 

- Patch2:         plexus-interactivity-jline2.patch
 

+ 

+ BuildArch:      noarch
 

  

  BuildRequires:  maven-local
 

  BuildRequires:  mvn(jline:jline) >= 2
 

- BuildRequires:  mvn(org.codehaus.plexus:plexus-component-api)
 

  BuildRequires:  mvn(org.codehaus.plexus:plexus-components:pom:)
 

+ BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 

  BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 

  

  %description
 
@@ -29,45 +25,59 @@
 

  velocity, etc. Plexus also includes an application server which
 

  is like a J2EE application server, without all the baggage.
 

  

+ 

  %package javadoc
 

  Summary:        API documentation for %{name}
 

  

  %description javadoc
 

  This package provides %{summary}.
 

  

+ 

  %package api
 

  Summary:        API for %{name}
 

  

  %description api
 

  API module for %{name}.
 

  

+ 

  %package jline
 

  Summary:        jline module for %{name}
 

  

  %description jline
 

  jline module for %{name}.
 

  

+ 

  %prep
 

- %setup -q -n plexus-interactivity-1.0-alpha-6
 

- %patch1 -p1
 

- %patch2 -p1
 

+ %autosetup -n %{name}-%{name}-%{version} -p1
 

  

  cp %{SOURCE1} .
 

  

+ # use jline2, not jline1
 

+ %pom_change_dep jline:jline jline:jline:2.10 plexus-interactivity-jline
 

+ sed -i "s!jline.ConsoleReader!jline.console.ConsoleReader!" \
 

+     plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
 

+ 

+ %pom_remove_plugin :maven-site-plugin
 

+ 

  %mvn_file ":{plexus}-{*}" @1/@2
 

  

- %build
 

  %mvn_package ":plexus-interactivity"
 

  

- %mvn_build -f -s
 

+ 

+ %build
 

+ %mvn_build -s
 

+ 

  

  %install
 

  %mvn_install
 

  

+ 

  %files -f .mfiles
 

  %license LICENSE.MIT
 

+ 

  %files api -f .mfiles-plexus-interactivity-api
 

  %license LICENSE.MIT
 

+ 

  %files jline -f .mfiles-plexus-interactivity-jline
 

  %license LICENSE.MIT
 

  
@@ -76,6 +86,9 @@
 

  

  

  %changelog
 

+ * Fri Oct 11 2019 Fabio Valentini <decathorpe@gmail.com> - 0:1.0-1
 

+ - Update to version 1.0.
 

+ 

  * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.0-0.29.alpha6
 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

file modified
+1 -1 
@@ -1,1 +1,1 @@
 

- 8d18d894a2a393bf2dd6574b7beda32b  plexus-interactivity-1.0-alpha-6-src.tar.xz
 

+ SHA512 (plexus-interactivity-1.0.tar.gz) = 23d794cb73774274d4c02b421d3bd092303fc127b591889345b9cee1726ea42c4e917afad43c50442c9ce617b6b136c411fd0c4fa2d03a9ca00277e7e9356476

  • update to latest version (1.0~alpha6 → 1.0)
  • drop stray files from git
  • drop patches and convert changes to RPM macros and simple sed
  • updated BuildRequires
  • enabled test suite

Test rebuilds of dependent packages were done in COPR, and were successful:

https://copr.fedorainfracloud.org/coprs/decathorpe/plexus-interactivity-pr/monitor/

All build failures that occurred are already expected and not caused by this update.

ship it!

Pull-Request has been merged by decathorpe
4 years ago
Changes Summary 7
+5 -1
file changed
.gitignore
-85
file removed
plexus-interactivity-1.0-api-build.xml
-85
file removed
plexus-interactivity-1.0-jline-build.xml
-16
file removed
plexus-interactivity-dependencies.patch
-33
file removed
plexus-interactivity-jline2.patch
+30 -17
file changed
plexus-interactivity.spec
+1 -1
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.