Compare commits
No commits in common. "c8-stream-201902" and "c10s" have entirely different histories.
c8-stream-
...
c10s
@ -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
|
|
||||||
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
||||||
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,3 +1,6 @@
|
|||||||
SOURCES/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
|
apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
|
||||||
SOURCES/apache-jar-resource-bundle-1.4-sources.jar
|
apache-jar-resource-bundle-1.4-sources.jar
|
||||||
SOURCES/apache-license-header-resource-bundle-1.1-sources.jar
|
apache-license-header-resource-bundle-1.1-sources.jar
|
||||||
|
/apache-resource-bundles-36.pom
|
||||||
|
/apache-resource-bundles-37.pom
|
||||||
|
/apache-resource-bundles-1.5-source-release.zip
|
||||||
|
|||||||
171
0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch
Normal file
171
0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch
Normal file
@ -0,0 +1,171 @@
|
|||||||
|
From af8542b406e06808ee416c93f2b2c550c688e9f5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
Date: Wed, 23 Aug 2023 20:19:06 +0200
|
||||||
|
Subject: [PATCH] Port ITs to Maven Verifier 2.0.0~M1
|
||||||
|
|
||||||
|
---
|
||||||
|
.../test/java/org/apache/its/IT_000_BasicArchiveCreation.java | 4 ++--
|
||||||
|
.../org/apache/its/IT_001_ExcludeBuildOutputDirectory.java | 4 ++--
|
||||||
|
.../its/IT_002_IncludeSrcDirWithBuildOutputDirName.java | 4 ++--
|
||||||
|
.../java/org/apache/its/IT_003_SharedResourceInclusion.java | 4 ++--
|
||||||
|
.../src/test/java/org/apache/its/IT_004_IdeExcludes.java | 4 ++--
|
||||||
|
.../java/org/apache/its/IT_005_MiscellaneousExcludes.java | 4 ++--
|
||||||
|
.../src/test/java/org/apache/its/IT_006_CiExcludes.java | 4 ++--
|
||||||
|
.../org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java | 4 ++--
|
||||||
|
.../java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java | 4 ++--
|
||||||
|
.../src/test/java/org/apache/its/IT_ZipAndTarCreation.java | 4 ++--
|
||||||
|
10 files changed, 20 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java
|
||||||
|
index effd007..d2bf3d4 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java
|
||||||
|
@@ -26,8 +26,8 @@ import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import junit.framework.Assert;
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java
|
||||||
|
index 966a8bc..b1353ff 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java
|
||||||
|
@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java
|
||||||
|
index 3adbdab..0c9af50 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java
|
||||||
|
@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java
|
||||||
|
index 3e90d5b..de54608 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java
|
||||||
|
@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java
|
||||||
|
index 760899a..e5b780f 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java
|
||||||
|
@@ -25,8 +25,8 @@ import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
|
||||||
|
index cb584c1..e692a95 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
|
||||||
|
@@ -25,8 +25,8 @@ import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java
|
||||||
|
index 5a5d0bd..9c5f406 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java
|
||||||
|
@@ -25,8 +25,8 @@ import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromProject;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
|
||||||
|
index 3e0f7c5..2762372 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
|
||||||
|
@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
|
||||||
|
index bc86d6f..77729e9 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
|
||||||
|
@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
diff --git a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
|
||||||
|
index 040beee..9ae94cd 100644
|
||||||
|
--- a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
|
||||||
|
+++ b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
|
||||||
|
@@ -26,8 +26,8 @@ import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import junit.framework.Assert;
|
||||||
|
-import org.apache.maven.it.VerificationException;
|
||||||
|
-import org.apache.maven.it.Verifier;
|
||||||
|
+import org.apache.maven.shared.verifier.VerificationException;
|
||||||
|
+import org.apache.maven.shared.verifier.Verifier;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.apache.its.util.TestUtils.archivePathFromChild;
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
||||||
@ -1,16 +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</groupId>
|
|
||||||
<artifactId>apache-resource-bundles</artifactId>
|
|
||||||
<version>2</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>apache-incubator-disclaimer-resource-bundle</artifactId>
|
|
||||||
<name>Apache Incubator Disclaimer Resource Bundle</name>
|
|
||||||
<version>1.1</version>
|
|
||||||
<inceptionYear>2006</inceptionYear>
|
|
||||||
<description>
|
|
||||||
An archive which contains the standard Apache Incubator disclaimer.
|
|
||||||
</description>
|
|
||||||
</project>
|
|
||||||
@ -1,22 +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</groupId>
|
|
||||||
<artifactId>apache-resource-bundles</artifactId>
|
|
||||||
<version>2</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>apache-jar-resource-bundle</artifactId>
|
|
||||||
<name>Apache JAR Resource Bundle</name>
|
|
||||||
<version>1.4</version>
|
|
||||||
<inceptionYear>2006</inceptionYear>
|
|
||||||
<description>
|
|
||||||
An archive which contains templates for generating the necessary license files and notices for all Apache releases.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<scm>
|
|
||||||
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</connection>
|
|
||||||
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</developerConnection>
|
|
||||||
<url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</url>
|
|
||||||
</scm>
|
|
||||||
</project>
|
|
||||||
@ -1,16 +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</groupId>
|
|
||||||
<artifactId>apache-resource-bundles</artifactId>
|
|
||||||
<version>2</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>apache-license-header-resource-bundle</artifactId>
|
|
||||||
<name>Apache License Header Resource Bundle</name>
|
|
||||||
<version>1.1</version>
|
|
||||||
<inceptionYear>2006</inceptionYear>
|
|
||||||
<description>
|
|
||||||
An archive which contains the notice file template.
|
|
||||||
</description>
|
|
||||||
</project>
|
|
||||||
@ -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>
|
|
||||||
@ -1,141 +0,0 @@
|
|||||||
%global jar_version 1.4
|
|
||||||
%global lh_version 1.1
|
|
||||||
%global id_version 1.1
|
|
||||||
|
|
||||||
Name: apache-resource-bundles
|
|
||||||
Version: 2
|
|
||||||
Release: 22%{?dist}
|
|
||||||
Summary: Apache Resource Bundles
|
|
||||||
License: ASL 2.0
|
|
||||||
URL: http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
|
|
||||||
BuildArch: 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
|
|
||||||
|
|
||||||
BuildRequires: maven-local
|
|
||||||
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
|
|
||||||
|
|
||||||
%description
|
|
||||||
An archive which contains templates for generating the necessary license files
|
|
||||||
and notices for all Apache releases.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -cT
|
|
||||||
cp -p %{SOURCE0} ./pom.xml
|
|
||||||
|
|
||||||
# jar
|
|
||||||
mkdir -p apache-jar-resource-bundle
|
|
||||||
pushd apache-jar-resource-bundle
|
|
||||||
jar xvf %{SOURCE1}
|
|
||||||
cp -p %{SOURCE2} ./pom.xml
|
|
||||||
mkdir -p src/main/resources
|
|
||||||
mv META-INF src/main/resources
|
|
||||||
popd
|
|
||||||
|
|
||||||
# license-header
|
|
||||||
mkdir -p apache-license-header-resource-bundle
|
|
||||||
pushd apache-license-header-resource-bundle
|
|
||||||
jar xvf %{SOURCE3}
|
|
||||||
cp -p %{SOURCE4} ./pom.xml
|
|
||||||
mkdir -p src/main/resources
|
|
||||||
mv META-INF src/main/resources
|
|
||||||
popd
|
|
||||||
|
|
||||||
# incubator-disclaimer
|
|
||||||
mkdir -p apache-incubator-disclaimer-resource-bundle
|
|
||||||
pushd apache-incubator-disclaimer-resource-bundle
|
|
||||||
jar xvf %{SOURCE5}
|
|
||||||
cp -p %{SOURCE6} ./pom.xml
|
|
||||||
mkdir -p src/main/resources
|
|
||||||
mv META-INF src/main/resources
|
|
||||||
popd
|
|
||||||
|
|
||||||
%mvn_file :apache-jar-resource-bundle apache-resource-bundles/jar
|
|
||||||
%mvn_file :apache-license-header-resource-bundle apache-resource-bundles/license-header
|
|
||||||
%mvn_file :apache-incubator-disclaimer-resource-bundle apache-resource-bundles/incubator-disclaimer
|
|
||||||
|
|
||||||
%build
|
|
||||||
%mvn_build
|
|
||||||
|
|
||||||
%install
|
|
||||||
%mvn_install
|
|
||||||
|
|
||||||
%files -f .mfiles
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-22
|
|
||||||
- Mass rebuild for javapackages-tools 201902
|
|
||||||
|
|
||||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-21
|
|
||||||
- Mass rebuild for javapackages-tools 201901
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-20
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-19
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-18
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2-17
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-16
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-15
|
|
||||||
- Cleanup spec file
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-14
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-13
|
|
||||||
- Use Requires: java-headless rebuild (#1067528)
|
|
||||||
|
|
||||||
* Wed Feb 19 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-12
|
|
||||||
- Fix unowned directory
|
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2-10
|
|
||||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
|
||||||
- Replace maven BuildRequires with maven-local
|
|
||||||
|
|
||||||
* Wed Jan 16 2013 Michal Srb <msrb@redhat.com> - 2-9
|
|
||||||
- Build with xmvn
|
|
||||||
|
|
||||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-5
|
|
||||||
- Fix pom file names and add_to_maven_depmap calls (Resolves rhbz#655790)
|
|
||||||
|
|
||||||
* Wed Sep 8 2010 Alexander Kurtakov <akurtako@redhat.com> 2-4
|
|
||||||
- Add maven-site-plugin BR.
|
|
||||||
- Use newer names of maven plugins.
|
|
||||||
|
|
||||||
* Mon Feb 1 2010 Mary Ellen Foster <mefoster at gmail.com> 2-3
|
|
||||||
- Fix license
|
|
||||||
|
|
||||||
* Tue Jan 19 2010 Mary Ellen Foster <mefoster at gmail.com> 2-2
|
|
||||||
- Add plugin dependencies from POMs
|
|
||||||
- Fix description
|
|
||||||
- Remove maven-release plugin (not on Fedora yet)
|
|
||||||
|
|
||||||
* Mon Jan 18 2010 Mary Ellen Foster <mefoster at gmail.com> 2-1
|
|
||||||
- Initial package
|
|
||||||
195
apache-resource-bundles.spec
Normal file
195
apache-resource-bundles.spec
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
|
Name: apache-resource-bundles
|
||||||
|
Epoch: 1
|
||||||
|
Version: 1.5
|
||||||
|
Release: 8%{?dist}
|
||||||
|
Summary: Apache Resource Bundles
|
||||||
|
License: Apache-2.0
|
||||||
|
URL: https://maven.apache.org/apache-resource-bundles/
|
||||||
|
BuildArch: noarch
|
||||||
|
ExclusiveArch: %{java_arches} noarch
|
||||||
|
|
||||||
|
Source0: https://repo1.maven.org/maven2/org/apache/apache/resources/apache-resource-bundles/%{version}/apache-resource-bundles-%{version}-source-release.zip
|
||||||
|
|
||||||
|
Patch0: 0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch
|
||||||
|
|
||||||
|
%if %{with bootstrap}
|
||||||
|
BuildRequires: javapackages-bootstrap
|
||||||
|
%else
|
||||||
|
BuildRequires: maven-local
|
||||||
|
BuildRequires: mvn(junit:junit)
|
||||||
|
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
|
||||||
|
BuildRequires: mvn(org.apache.maven.shared:maven-verifier)
|
||||||
|
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
||||||
|
BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
|
||||||
|
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description
|
||||||
|
An archive which contains templates for generating the necessary license files
|
||||||
|
and notices for all Apache releases.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
%pom_disable_module resources-bundles-sample
|
||||||
|
%mvn_alias :apache-jar-resource-bundle org.apache:
|
||||||
|
|
||||||
|
%build
|
||||||
|
# Use system version of apache-resource-bundles instead of reactor version
|
||||||
|
%mvn_build -- -Dversion.apache-resource-bundles=SYSTEM
|
||||||
|
|
||||||
|
%install
|
||||||
|
%mvn_install
|
||||||
|
|
||||||
|
%files -f .mfiles
|
||||||
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:1.5-8
|
||||||
|
- Bump release for October 2024 mass rebuild:
|
||||||
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
|
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:1.5-7
|
||||||
|
- Bump release for Aug 2024 java mass rebuild
|
||||||
|
|
||||||
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.5-6
|
||||||
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-3
|
||||||
|
- Convert License tag to SPDX format
|
||||||
|
|
||||||
|
* Wed Aug 23 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-2
|
||||||
|
- Port to maven-verifier 2.0.0~M1
|
||||||
|
|
||||||
|
* Fri Aug 11 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-1
|
||||||
|
- Update to upstream version 1.5
|
||||||
|
|
||||||
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 37-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 37-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Sep 07 2022 Marian Koncek <mkoncek@redhat.com> - 37-1
|
||||||
|
- Update to upstream version 37
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-19
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-18
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2-17
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-15
|
||||||
|
- Cleanup spec file
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-13
|
||||||
|
- Use Requires: java-headless rebuild (#1067528)
|
||||||
|
|
||||||
|
* Wed Feb 19 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-12
|
||||||
|
- Fix unowned directory
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2-10
|
||||||
|
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||||
|
- Replace maven BuildRequires with maven-local
|
||||||
|
|
||||||
|
* Wed Jan 16 2013 Michal Srb <msrb@redhat.com> - 2-9
|
||||||
|
- Build with xmvn
|
||||||
|
|
||||||
|
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-5
|
||||||
|
- Fix pom file names and add_to_maven_depmap calls (Resolves rhbz#655790)
|
||||||
|
|
||||||
|
* Wed Sep 8 2010 Alexander Kurtakov <akurtako@redhat.com> 2-4
|
||||||
|
- Add maven-site-plugin BR.
|
||||||
|
- Use newer names of maven plugins.
|
||||||
|
|
||||||
|
* Mon Feb 1 2010 Mary Ellen Foster <mefoster at gmail.com> 2-3
|
||||||
|
- Fix license
|
||||||
|
|
||||||
|
* Tue Jan 19 2010 Mary Ellen Foster <mefoster at gmail.com> 2-2
|
||||||
|
- Add plugin dependencies from POMs
|
||||||
|
- Fix description
|
||||||
|
- Remove maven-release plugin (not on Fedora yet)
|
||||||
|
|
||||||
|
* Mon Jan 18 2010 Mary Ellen Foster <mefoster at gmail.com> 2-1
|
||||||
|
- Initial package
|
||||||
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_contexts:
|
||||||
|
- osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
|
||||||
7
plans/javapackages.fmf
Normal file
7
plans/javapackages.fmf
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
summary: Run javapackages-specific tests
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
url: https://src.fedoraproject.org/tests/javapackages
|
||||||
|
ref: c10s
|
||||||
|
execute:
|
||||||
|
how: tmt
|
||||||
Loading…
Reference in New Issue
Block a user