Compare commits

...

No commits in common. "c8-stream-201902" and "c9-beta-stream-202201" have entirely different histories.

8 changed files with 181 additions and 68 deletions

View File

@ -1,3 +0,0 @@
1b81c0751b2131074eebce60c86289824c98615c SOURCES/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
392dfe3fd871d56d1edc48479fdff65013c801d9 SOURCES/apache-jar-resource-bundle-1.4-sources.jar
2b61357efc85d89ac1e96b6ac6309a6872819116 SOURCES/apache-license-header-resource-bundle-1.1-sources.jar

3
.gitignore vendored
View File

@ -1,3 +0,0 @@
SOURCES/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
SOURCES/apache-jar-resource-bundle-1.4-sources.jar
SOURCES/apache-license-header-resource-bundle-1.1-sources.jar

Binary file not shown.

View File

@ -1,52 +0,0 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>5</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
<groupId>org.apache</groupId>
<artifactId>apache-resource-bundles</artifactId>
<name>Apache Resource Bundles</name>
<version>2</version>
<inceptionYear>2006</inceptionYear>
<modules>
<module>apache-jar-resource-bundle</module>
<module>apache-license-header-resource-bundle</module>
<module>apache-incubator-disclaimer-resource-bundle</module>
</modules>
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</developerConnection>
<url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</url>
</scm>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-4</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- Turn this into a lifecycle -->
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>bundle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
~ regarding copyright ownership. The ASF licenses this file
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<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>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>36</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-resource-bundles</artifactId>
<packaging>pom</packaging>
<name>Apache Resource Bundles</name>
<inceptionYear>2006</inceptionYear>
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/MASFRES</url>
</issueManagement>
<ciManagement>
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-project-resources/</url>
<system>Jenkins</system>
</ciManagement>
<!-- There is no distributionManagement for this project. The site is a part of the main Maven site. -->
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<configuration>
<issueManagementSystems>
<issueManagementSystem>JIRA</issueManagementSystem>
</issueManagementSystems>
<maxEntries>1000</maxEntries>
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<versionPrefix>${project.artifactId}-</versionPrefix>
<!-- Used by announcement-generate goal -->
<!-- TODO Which template should we use for Apache Resource Bundles?
<templateDirectory>org/apache/maven/shared</templateDirectory>
-->
<!-- Used by announcement-mail goal -->
<subject>[ANN] ${project.name} ${project.version} Released</subject>
<toAddresses>
<toAddress implementation="java.lang.String">announce@apache.org</toAddress>
<toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
<toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
</toAddresses>
<ccAddresses>
<ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
</ccAddresses>
<!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
<fromDeveloperId>${apache.availid}</fromDeveloperId>
<smtpHost>${smtp.host}</smtpHost>
</configuration>
<dependencies>
<!-- Used by announcement-generate goal -->
<!-- Uncomment this when we have decided which template to use
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
<version>1</version>
</dependency>
-->
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- Turn this into a lifecycle -->
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>bundle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,26 +1,33 @@
%bcond_with bootstrap
%global jar_version 1.4
%global lh_version 1.1
%global id_version 1.1
Name: apache-resource-bundles
Version: 2
Release: 22%{?dist}
Version: 36
Release: 2%{?dist}
Summary: Apache Resource Bundles
License: ASL 2.0
URL: http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
URL: https://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom
Source1: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
Source2: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
Source3: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
Source4: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
Source5: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
Source6: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
Source0: https://repo1.maven.org/maven2/org/apache/apache/resources/%{name}/%{version}/%{name}-%{version}.pom
Source1: https://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
Source2: https://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
Source3: https://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
Source4: https://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
Source5: https://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
Source6: https://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
%endif
%description
An archive which contains templates for generating the necessary license files
@ -29,12 +36,22 @@ and notices for all Apache releases.
%prep
%setup -cT
cp -p %{SOURCE0} ./pom.xml
%pom_xpath_inject 'pom:project' '
<modules>
<module>apache-jar-resource-bundle</module>
<module>apache-license-header-resource-bundle</module>
<module>apache-incubator-disclaimer-resource-bundle</module>
</modules>'
%pom_xpath_set 'pom:project/pom:parent/pom:relativePath' '../pom/maven/pom.xml'
%pom_xpath_set 'pom:project/pom:groupId' 'org.apache'
# jar
mkdir -p apache-jar-resource-bundle
pushd apache-jar-resource-bundle
jar xvf %{SOURCE1}
cp -p %{SOURCE2} ./pom.xml
%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
mkdir -p src/main/resources
mv META-INF src/main/resources
popd
@ -44,6 +61,7 @@ mkdir -p apache-license-header-resource-bundle
pushd apache-license-header-resource-bundle
jar xvf %{SOURCE3}
cp -p %{SOURCE4} ./pom.xml
%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
mkdir -p src/main/resources
mv META-INF src/main/resources
popd
@ -53,6 +71,7 @@ mkdir -p apache-incubator-disclaimer-resource-bundle
pushd apache-incubator-disclaimer-resource-bundle
jar xvf %{SOURCE5}
cp -p %{SOURCE6} ./pom.xml
%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
mkdir -p src/main/resources
mv META-INF src/main/resources
popd
@ -70,12 +89,55 @@ popd
%files -f .mfiles
%changelog
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 36-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed May 04 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 36-1
- Update to upstream version 36
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 30-5
- Rebuilt for java-17-openjdk as system jdk
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 30-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 30-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30-2
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2-25
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 30-1
- Update to upstream version 30
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-22
- Mass rebuild for javapackages-tools 201902
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-21
- Mass rebuild for javapackages-tools 201901
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild