Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-script-interpreter for
openSUSE:Factory checked in at 2022-04-30 00:45:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-script-interpreter (Old)
and /work/SRC/openSUSE:Factory/.maven-script-interpreter.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-script-interpreter"
Sat Apr 30 00:45:15 2022 rev:4 rq:973693 version:1.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-script-interpreter/maven-script-interpreter.changes
2022-03-21 20:11:21.560399935 +0100
+++
/work/SRC/openSUSE:Factory/.maven-script-interpreter.new.1538/maven-script-interpreter.changes
2022-04-30 00:46:00.314975721 +0200
@@ -1,0 +2,19 @@
+Thu Apr 28 11:43:55 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Upgrade to version 1.3
+ * Improvement
+ + [MSHARED-828] - Require Java 7
+ + [MSHARED-879] - make build Reproducible
+ + [MSHARED-906] - Add GitHub Action to confirm build PR
+ + [MSHARED-907] - Output build log from script to maven mojo log
+ + [MSHARED-910] - Redundant option failOnException
+ + [MSHARED-911] - Replace AntClassLoader by RootLoader
+ + [MSHARED-914] - Detailed message from failed script evaluation
+ shouldn't be propagated
+ + [MSHARED-917] - Remove dependency to
+ plexus-component-annotations
+ + [MSHARED-939] - Remove Apache Ivy from dependency
+ * Task
+ + [MSHARED-960] - document how to use Grapes in a Groovy script
+
+-------------------------------------------------------------------
Old:
----
maven-script-interpreter-1.2-source-release.zip
New:
----
maven-script-interpreter-1.3-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-script-interpreter.spec ++++++
--- /var/tmp/diff_new_pack.vUtPo7/_old 2022-04-30 00:46:00.798976141 +0200
+++ /var/tmp/diff_new_pack.vUtPo7/_new 2022-04-30 00:46:00.806976147 +0200
@@ -16,45 +16,26 @@
#
-%bcond_with tests
Name: maven-script-interpreter
-Version: 1.2
+Version: 1.3
Release: 0
Summary: Maven Script Interpreter
License: Apache-2.0
Group: Development/Libraries/Java
-URL: http://maven.apache.org/shared/maven-script-interpreter/
-Source0:
http://central.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+URL: https://maven.apache.org/shared/maven-script-interpreter/
+Source0:
https://dlcdn.apache.org/maven/shared/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
BuildRequires: ant
-BuildRequires: apache-commons-cli
-BuildRequires: atinject
+BuildRequires: apache-commons-io
BuildRequires: bsh2
BuildRequires: fdupes
-BuildRequires: google-guice
-BuildRequires: guava
BuildRequires: javapackages-local
-BuildRequires: jdom2
-BuildRequires: maven-lib
-BuildRequires: maven-shared-utils
-BuildRequires: objectweb-asm
-BuildRequires: plexus-classworlds
-BuildRequires: plexus-cli
-BuildRequires: plexus-containers-component-annotations
-BuildRequires: plexus-metadata-generator
-BuildRequires: plexus-utils
-BuildRequires: qdox
-BuildRequires: sisu-inject
-BuildRequires: sisu-plexus
+BuildRequires: slf4j
BuildRequires: unzip
-BuildRequires: xbean
-BuildRequires: xmvn-install
-BuildRequires: xmvn-resolve
-BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
+Requires: mvn(commons-io:commons-io)
+Requires: mvn(org.apache-extras.beanshell:bsh)
+Requires: mvn(org.slf4j:slf4j-api)
BuildArch: noarch
-%if %{with tests}
-BuildRequires: ant-junit
-%endif
%description
This component provides some utilities to interpret/execute some scripts for
@@ -73,6 +54,9 @@
%setup -q
cp %{SOURCE1} build.xml
+%pom_remove_parent
+%pom_xpath_inject pom:project "<groupId>org.apache.maven.shared</groupId>"
+
%pom_remove_dep :groovy
rm
src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
rm
src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
@@ -82,41 +66,35 @@
%build
mkdir -p lib
build-jar-repository -s lib \
- atinject \
bsh2/bsh \
- commons-cli \
- guava/guava \
- guice/google-guice-no_aop \
- jdom2/jdom2 \
- maven/maven-plugin-api \
- maven-shared-utils/maven-shared-utils \
- objectweb-asm/asm \
- org.eclipse.sisu.inject \
- org.eclipse.sisu.plexus \
- plexus-classworlds \
- plexus/cli \
- plexus-containers/plexus-component-annotations \
- plexus-metadata-generator \
- plexus/utils \
- qdox \
- xbean/xbean-reflect
+ commons-io \
+ slf4j/api \
+ slf4j/simple
-%ant \
- -Dtest.skip=true \
+%{ant} \
jar javadoc
-%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
-
%install
-%mvn_install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}/%{name}.jar
+
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
+
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
-%license LICENSE
-%doc DEPENDENCIES NOTICE
+%license LICENSE NOTICE
+%doc DEPENDENCIES
-%files javadoc -f .mfiles-javadoc
-%license LICENSE
-%doc NOTICE
+%files javadoc
+%{_javadocdir}/%{name}
+%license LICENSE NOTICE
%changelog
++++++ maven-script-interpreter-build.xml ++++++
--- /var/tmp/diff_new_pack.vUtPo7/_old 2022-04-30 00:46:00.846976182 +0200
+++ /var/tmp/diff_new_pack.vUtPo7/_new 2022-04-30 00:46:00.850976185 +0200
@@ -10,7 +10,7 @@
<property name="project.groupId" value="org.apache.maven.shared"/>
<property name="project.artifactId" value="maven-script-interpreter"/>
- <property name="project.version" value="1.2"/>
+ <property name="project.version" value="1.3"/>
<property name="project.name" value="Apache Maven Script Interpreter"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
@@ -22,10 +22,7 @@
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
- <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
- <property name="build.testDir" value="src/test/java"/>
- <property name="build.testResourceDir" value="src/test/resources"/>
- <property name="test.reports" value="${build.dir}/test-reports"/>
+
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ======================================================================
-->
@@ -37,11 +34,6 @@
<include name="**/*.jar"/>
</fileset>
</path>
- <path id="build.test.classpath">
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
<!-- ======================================================================
-->
<!-- Cleaning up target
-->
@@ -75,129 +67,6 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
- <!-- ======================================================================
-->
-
- <target name="plexus"
- depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <!-- <jvmarg value="-verbose"/> -->
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Test-compilation target
-->
- <!-- ======================================================================
-->
-
- <target name="compile-tests"
- depends="plexus"
- description="Compile the test code"
- unless="test.skip">
- <mkdir dir="${build.testOutputDir}"/>
- <javac destdir="${build.testOutputDir}"
- nowarn="false"
- debug="true"
- encoding="UTF-8"
- optimize="false"
- deprecation="true"
- target="${compiler.target}"
- verbose="false"
- fork="false"
- source="${compiler.source}">
- <src>
- <pathelement location="${build.testDir}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- </javac>
- <copy todir="${build.testOutputDir}">
- <fileset dir="${build.testResourceDir}"/>
- </copy>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Run all tests
-->
- <!-- ======================================================================
-->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${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.test.classpath"/>
- <pathelement location="${build.outputDir}"/>
- <pathelement location="${build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${test.reports}" unless="test">
- <fileset dir="${build.testDir}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${test.reports}" if="test">
- <fileset dir="${build.testDir}">
- <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"
classpathref="build.test.classpath"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING
===================================</echo>
- <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib
directory. Tests not executed.</echo>
-
<echo>===============================================================================</echo>
- </target>
-
- <!-- ======================================================================
-->
<!-- Javadoc target
-->
<!-- ======================================================================
-->
@@ -230,7 +99,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus,test" description="Package the
application">
+ <target name="package" depends="compile" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
