Compare commits

...

No commits in common. "c8-stream-201902" and "c8-stream-201801" have entirely different histories.

2 changed files with 117 additions and 97 deletions

View File

@ -1,36 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?> <?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/xsd/maven-4.0.0.xsd"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId> <artifactId>plexus</artifactId>
<version>4.0</version> <version>3.3.1</version>
<relativePath>../pom/pom.xml</relativePath> <relativePath>../pom/pom.xml</relativePath>
</parent> </parent>
<artifactId>plexus-components</artifactId> <artifactId>plexus-components</artifactId>
<version>4.0</version> <version>1.3.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Plexus Components</name> <name>Plexus Components</name>
<url>http://plexus.codehaus.org/plexus-components</url>
<!--modules>
<module>plexus-cli</module>
<module>plexus-digest</module>
<module>plexus-i18n</module>
<module>plexus-interactivity</module>
<module>plexus-resources</module>
<module>plexus-velocity</module>
</modules-->
<!--
<module>plexus-swizzle</module>
-->
<scm> <scm>
<connection>scm:git:git@github.com:codehaus-plexus/plexus-components.git</connection> <connection>scm:git:git@github.com:sonatype/plexus-components.git</connection>
<developerConnection>scm:git:git@github.com:codehaus-plexus/plexus-components.git</developerConnection> <developerConnection>scm:git:git@github.com:sonatype/plexus-components.git</developerConnection>
<url>http://github.com/codehaus-plexus/plexus-components</url> <url>http://github.com/sonatype/plexus-components</url>
<tag>plexus-components-4.0</tag> <tag>plexus-components-1.3.1</tag>
</scm> </scm>
<issueManagement> <issueManagement>
<system>github</system> <system>JIRA</system>
<url>http://github.com/codehaus-plexus/plexus-components/issues</url> <url>http://jira.codehaus.org/browse/PLXCOMP</url>
</issueManagement> </issueManagement>
<distributionManagement>
<site>
<id>github:gh-pages</id>
<url>scm:git:git@github.com:codehaus-plexus</url><!-- url used only for inheritance -->
</site>
</distributionManagement>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@ -42,7 +51,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
<version>3.0.22</version> <version>3.0.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -69,6 +78,22 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>parent-release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<arguments>-N -Pplexus-release</arguments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<repositories> <repositories>
<repository> <repository>
<id>plexus.snapshots</id> <id>plexus.snapshots</id>
@ -81,4 +106,6 @@
</snapshots> </snapshots>
</repository> </repository>
</repositories> </repositories>
</project> </project>

View File

@ -1,12 +1,14 @@
Name: plexus-components-pom %global short_name plexus-components
Version: 4.0
Release: 2%{?dist} Name: %{short_name}-pom
Version: 1.3.1
Release: 10%{?dist}
Summary: Plexus Components POM Summary: Plexus Components POM
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/codehaus-plexus/plexus-components URL: https://github.com/codehaus-plexus/plexus-components
BuildArch: noarch BuildArch: noarch
Source0: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/%{version}/plexus-components-%{version}.pom Source0: http://repo.maven.apache.org/maven2/org/codehaus/plexus/%{short_name}/%{version}/%{short_name}-%{version}.pom
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: maven-local BuildRequires: maven-local
@ -32,15 +34,6 @@ cp -p %{SOURCE1} LICENSE
%doc LICENSE %doc LICENSE
%changelog %changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0-2
- Mass rebuild for javapackages-tools 201902
* Thu May 30 2019 Marian Koncek <mkoncek@redhat.com> - 4.0-1
- Update to upstream version 4.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.1-11
- Mass rebuild for javapackages-tools 201901
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-10 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild