pool/maven-filtering
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1109286 from Java:packages

Browse Source 
3.3.1

OBS-URL: https://build.opensuse.org/request/show/1109286
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-filtering?expand=0&rev=6
This commit is contained in:
Ana Guerrero 2023-09-06 17:00:07 +00:00 committed by Git OBS Bridge
commit 486d52a8e7
5 changed files with 66 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-filtering-3.2.0-source-release.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7655bfb5c653ab04289efbf63e9606bf1fa44f3a0b9e07bc5ad76118c33e13b
size 161793

BIN
maven-filtering-3.3.1-source-release.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

44
maven-filtering-build.xml
View File

@ -10,11 +10,11 @@
<property name="project.groupId" value="org.apache.maven.shared"/>
<property name="project.artifactId" value="maven-filtering"/>
<property name="project.version" value="3.2.0"/>
<property name="project.version" value="3.3.1"/>
<property name="project.name" value="Apache Maven Filtering"/>
<property name="project.organization.name" value="The Apache Software Foundation"/>
<property name="spec.version" value="3.2"/>
<property name="spec.version" value="3.3"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
@ -69,31 +69,25 @@
</target>
<!-- ====================================================================== -->
<!-- Target to generate Plexus component.xml -->
<!-- Sisu javax.inject.Named generation target -->
<!-- ====================================================================== -->
<target name="plexus"
<target name="sisu"
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>
description="Generate javax.inject.Name index">
<sequential>
<java classname="org.eclipse.sisu.space.SisuIndex"
failonerror="true"
fork="true">
<classpath>
<path refid="build.classpath"/>
</classpath>
<arg value="${build.outputDir}"/>
</java>
<move todir="${build.outputDir}/META-INF">
<fileset dir="META-INF"/>
</move>
</sequential>
</target>
<!-- ====================================================================== -->
@ -129,7 +123,7 @@
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="plexus" description="Package the application">
<target name="package" depends="sisu" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"

22
maven-filtering.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Wed Sep 6 13:00:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 3.3.1
* Changes of 3.3.1
+ MSHARED-1175: Copying x resources from rel/path to rel/path
+ MSHARED-1213: Bug: filtering existing but 0 byte file
+ MSHARED-1199: Upgrade parent pom to 39
+ MSHARED-1112: Ignore setting permissions on non existing dest
files/symlinks
+ MSHARED-1144: remove rendundant error message
* Changes of 3.3.0
+ fixed cloning of MavenResourcesExecution's instances using
copyOf() method
+ MRESOURCES-258: Copying and filtering logic is delegated to
FileUtils
+ replace deprecated methods
+ replace deprecated code in favor of Java 7 core and apache
commons libraries
declare dependencies
+ MSHARED-1080: Parent POM 36, Java8, drop legacy.
-------------------------------------------------------------------
Thu Apr 28 11:53:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>

63
maven-filtering.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven-filtering
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: maven-filtering
Version: 3.2.0
Version: 3.3.1
Release: 0
Summary: Shared component providing resource filtering
License: Apache-2.0
@ -26,32 +26,17 @@ URL: https://maven.apache.org/shared/%{name}/index.html
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
BuildRequires: ant
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-io
BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: google-guice
BuildRequires: guava
BuildRequires: javapackages-local
BuildRequires: jdom2
BuildRequires: jsr-305
BuildRequires: javapackages-local >= 6
BuildRequires: maven-lib
BuildRequires: maven-shared-utils
BuildRequires: objectweb-asm
BuildRequires: plexus-build-api
BuildRequires: plexus-classworlds
BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-interpolation
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
BuildRequires: qdox
BuildRequires: sisu-inject
BuildRequires: sisu-plexus
BuildRequires: slf4j
BuildRequires: unzip
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildArch: noarch
%description
@ -70,47 +55,43 @@ This package contains the API documentation for %{name}.
%setup -q
cp %{SOURCE1} build.xml
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%build
mkdir -p lib
build-jar-repository -s lib \
atinject \
commons-io \
maven/maven-core \
maven/maven-model \
maven/maven-settings \
org.eclipse.sisu.plexus \
plexus-containers/plexus-component-annotations \
maven-shared-utils/maven-shared-utils \
org.eclipse.sisu.inject \
plexus/utils \
plexus/interpolation \
plexus/plexus-build-api \
commons-io \
jsr-305 \
\
atinject \
commons-cli \
guava/guava \
guice/google-guice-no_aop \
jdom2/jdom2 \
objectweb-asm/asm \
org.eclipse.sisu.inject \
plexus-classworlds \
plexus-metadata-generator \
plexus/cli \
qdox
slf4j/api
# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
%{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}
%{mvn_install_pom} 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 NOTICE
%files javadoc -f .mfiles-javadoc
%files javadoc
%{_javadocdir}/%{name}
%license LICENSE NOTICE
%changelog