Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit 21a4c96

Browse files
svenruppertsvenruppert
authored
Merge pull request #1 from RapidPM/release/04.07.04-RPM
Release/04.07.04 rpm
2 parents 8d71b92 + 75f54a9 commit 21a4c96

File tree

3 files changed

+100
-11
lines changed

3 files changed

+100
-11
lines changed

‎pom.xml

+22-11
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<parent>
2323
<groupId>org.rapidpm</groupId>
2424
<artifactId>rapidpm-dependencies</artifactId>
25-
<version>04.07.00-alpha-b46</version>
25+
<version>04.07.04-RPM</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

2929
<groupId>org.rapidpm</groupId>
3030
<artifactId>rapidpm-dependencies-core</artifactId>
31-
<version>04.07.00-alpha</version>
31+
<version>04.07.04</version>
3232

3333
<inceptionYear>2013</inceptionYear>
3434
<organization>
@@ -75,11 +75,7 @@
7575

7676

7777
<properties>
78-
<deploy-repo-url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release</deploy-repo-url>
79-
<deploy-repo-snapshots-url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot</deploy-repo-snapshots-url>
8078
<jdk.version>1.8</jdk.version>
81-
82-
8379
</properties>
8480

8581
<repositories>
@@ -89,7 +85,8 @@
8985
</snapshots>
9086
<id>central</id>
9187
<name>libs-release</name>
92-
<url>${deploy-repo-url}</url>
88+
<!-- <url>${deploy-repo-url}</url>-->
89+
<url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release</url>
9390
</repository>
9491
<repository>
9592
<snapshots>
@@ -98,7 +95,7 @@
9895
</snapshots>
9996
<id>snapshots</id>
10097
<name>libs-snapshot</name>
101-
<url>${deploy-repo-snapshots-url}</url>
98+
<url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot</url>
10299
</repository>
103100
</repositories>
104101
<pluginRepositories>
@@ -108,7 +105,8 @@
108105
</snapshots>
109106
<id>central</id>
110107
<name>libs-release</name>
111-
<url>${deploy-repo-url}</url>
108+
<url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release</url>
109+
<!-- <url>${deploy-repo-url}</url>-->
112110
</pluginRepository>
113111
<pluginRepository>
114112
<snapshots>
@@ -117,10 +115,23 @@
117115
</snapshots>
118116
<id>snapshots</id>
119117
<name>libs-snapshot</name>
120-
<url>${deploy-repo-snapshots-url}</url>
118+
<url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot</url>
121119
</pluginRepository>
122120
</pluginRepositories>
123-
121+
122+
<dependencies>
123+
<dependency>
124+
<groupId>org.rapidpm</groupId>
125+
<artifactId>rapidpm-functional-reactive</artifactId>
126+
<version>01.00.07-RPM</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.rapidpm</groupId>
130+
<artifactId>rapidpm-logger-adapter</artifactId>
131+
<version>01.00.10-RPM</version>
132+
</dependency>
133+
</dependencies>
134+
124135
<build>
125136
<plugins>
126137
<plugin>

‎src/main/java/org/rapidpm/dependencies/core/serviceprovider/ServiceProvider.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.rapidpm.dependencies.core.serviceprovider;
217

318
import org.rapidpm.dependencies.core.logger.HasLogger;

‎version-number-rules.xml

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<!--
2+
3+
Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
17+
-->
18+
<ruleset comparisonMethod="maven"
19+
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
21+
<ignoreVersions>
22+
<ignoreVersion type="regex">(?i).*[-_\.]CR[0-9\.]*</ignoreVersion>
23+
<ignoreVersion type="regex">(?i).*[-_\.]rc[0-9\.]*</ignoreVersion>
24+
<ignoreVersion type="regex">(?i).*[-_\.]beta[0-9\.-]*</ignoreVersion>
25+
<ignoreVersion type="regex">(?i).*[-_\.]alpha[0-9\.-]*</ignoreVersion>
26+
<ignoreVersion type="regex">(?i).*[-_\.]Alpha</ignoreVersion>
27+
<ignoreVersion type="regex">(?i).*[-_\.]nightly[0-9\.]*</ignoreVersion>
28+
<ignoreVersion type="regex">(?i).*[-_\.]jboss[0-9\.]*</ignoreVersion>
29+
<ignoreVersion type="regex">(?i).*-atlassian-[0-9\.]*</ignoreVersion>
30+
<ignoreVersion type="regex">(?i).*-jenkins-[0-9\.]*</ignoreVersion>
31+
<ignoreVersion type="regex">.*[-\.]redhat-[0-9]+</ignoreVersion>
32+
<ignoreVersion type="regex">\d{4,}.*</ignoreVersion> <!-- z.B. commons-collections:commons-collections ... 3.2.1.redhat-7 -> 20040117.000000 -->
33+
</ignoreVersions>
34+
<rules>
35+
<rule groupId="org.cache2k">
36+
<ignoreVersions>
37+
<ignoreVersion>1.3.1.Alpha</ignoreVersion>
38+
</ignoreVersions>
39+
</rule>
40+
<rule groupId="org.slf4j" comparisonMethod="maven">
41+
<ignoreVersions>
42+
<ignoreVersion type="regex">.*-xwiki</ignoreVersion>
43+
<ignoreVersion type="regex">.*-alpha*</ignoreVersion>
44+
</ignoreVersions>
45+
</rule>
46+
<rule groupId="org.apache.maven.plugins" artifactId="maven-surefire-plugin" comparisonMethod="maven">
47+
<ignoreVersions>
48+
<ignoreVersion>9c6abc2</ignoreVersion>
49+
</ignoreVersions>
50+
</rule>
51+
<rule groupId="org.codehaus.mojo" artifactId="properties-maven-plugin" comparisonMethod="maven">
52+
<ignoreVersions>
53+
<ignoreVersion type="regex">.*-tc</ignoreVersion>
54+
</ignoreVersions>
55+
</rule>
56+
<rule groupId="javax.portlet" artifactId="portlet-api" comparisonMethod="maven">
57+
<ignoreVersions>
58+
<ignoreVersion type="regex">.*-r\d+</ignoreVersion>
59+
<ignoreVersion type="regex">.*-Draft\d+</ignoreVersion>
60+
</ignoreVersions>
61+
</rule>
62+
</rules>
63+
</ruleset>

0 commit comments

Comments
 (0)