You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/09 17:23:22 UTC
[maven-osgi] branch master created (now 0ce1f01)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git.
at 0ce1f01 Upgrade org.codehaus.plexus:plexus-component-metadata to 1.7.1 This will make them build with Java9
This branch includes the following new commits:
new 589db0e Promoting maven-osgi out of the sandbox
new 1021149 Add a test case for xercesImpl
new d0a5fa8 use major.minor.service always, filling with 0s if required
new 19f5c20 Upgrade parent
new ef34040 upgrade bndlib
new 077d8d8 update some released dependencies
new c5d115d Add another test based on jtidy version
new 0066076 Upgrade release plugin, previous is broken
new d49c107 [maven-release-plugin] prepare release maven-osgi-0.2.0
new bb3e15b [maven-release-plugin] prepare for next development iteration
new ddd10c0 Add license header
new 52eafc9 use the latest released parent
new dc54b39 o Tweaked the POM to workaround a deficiency in the Release Plugin which causes loss of the license header
new b32e3f6 o Inherited from maven-shared-components:10
new c744540 use the new parent
new 5d4bf4f o Inherited from maven-shared-components:11
new 000dca3 o Formatted POMs
new a05c663 o Used http://maven.apache.org/xsd/* for schema location
new 90563d5 removing one-off source release assemblies (and config), then upgrading parent version for all shared projects up to 12, so source-release will be automatic.
new 86a60e0 updated issue management urls to point precisely to the component in MSHARED
new 2701691 use last SNAPSHOT parent
new 7426924 fix relativePath
new 4923451 o Used released maven-shared-components:16
new 5c374ba fixed headers
new ca9aea9 added javadoc and jxr reports links in top-level menu
new d881414 upgrade parent version
new b4033bd use plexus-component-metadata instead of obsolete plexus-maven-plugin
new f9f49ce use last shared parent 19
new 94d7f3a Follow ASF branding rules.
new c4e13be configured site deploy to /shared-archives/<artifactId>-LATEST
new 522f26a updated parent pom
new 714b030 [MNGSITE-152] - Added appropriate links to download site and license location to fulfill the ASF requirements.
new fa74ed1 [MNGSITE-152] - Added missing links from overview to ASF License page and to download area.
new e9cf440 added license header
new 5dd5412 s/plugins/shared/
new b6d67e1 [MSHARED-371] Increased chance of java8 compliance by updating to asm5.x based plexus-component-*
new c64147f upgraded parent pom
new 792b7f7 changed svnpubsub url from /content to /components
new 50b3716 moved Jira from Codehaus to Apache
new 2b0e427 [MNGSITE-243] Fixed wrong link.
new 87a2870 [MPOM-95] updated parent pom location
new acdb4a3 updated Jira url
new 1daec9c Upgrade parent to org.apache.maven.shared:maven-shared-components:30
new 0ce1f01 Upgrade org.codehaus.plexus:plexus-component-metadata to 1.7.1 This will make them build with Java9
The 44 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].
[maven-osgi] 14/44: o Inherited from maven-shared-components:10
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit b32e3f6646ca008deb954b12330d94fb6dd44afe
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Mon Sep 22 22:21:01 2008 +0000
o Inherited from maven-shared-components:10
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@698021 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index af8c3a1..e326b4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>9</version>
+ <version>10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -53,7 +53,6 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.5</version>
<executions>
<execution>
<goals>
@@ -62,11 +61,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- </plugin>
</plugins>
</build>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 44/44: Upgrade
org.codehaus.plexus:plexus-component-metadata to 1.7.1 This will make them
build with Java9
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 0ce1f01b2213d8f6462b0673df8a32cc73fa3bb3
Author: Robert Scholte <rf...@apache.org>
AuthorDate: Wed Nov 30 19:50:11 2016 +0000
Upgrade org.codehaus.plexus:plexus-component-metadata to 1.7.1
This will make them build with Java9
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1772107 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 819d8a1..5e2de33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.6</version>
+ <version>1.7.1</version>
<executions>
<execution>
<goals>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 17/44: o Formatted POMs
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 000dca33ec9609bfc17e756b1792dce2156da740
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Feb 21 10:08:53 2009 +0000
o Formatted POMs
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@746478 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 65b0316..6ea09ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?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
@@ -17,15 +18,17 @@
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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
<version>11</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>maven-osgi</artifactId>
<version>0.3.0-SNAPSHOT</version>
+
<name>Maven OSGi integration</name>
<description>Library for Maven-OSGi integration</description>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 13/44: o Tweaked the POM to workaround a deficiency in
the Release Plugin which causes loss of the license header
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit dc54b39d99ade3e40ced0b7fe36035b1c01e42c7
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Aug 9 09:22:55 2008 +0000
o Tweaked the POM to workaround a deficiency in the Release Plugin which causes loss of the license header
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@684209 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13d456d..af8c3a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,7 @@
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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 33/44: [MNGSITE-152] - Added missing links from
overview to ASF License page and to download area.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit fa74ed197695ac18b1cd1f4803a7c02c2337370e
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed May 14 19:20:21 2014 +0000
[MNGSITE-152]
- Added missing links from overview to ASF License page
and to download area.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1594680 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/site.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/site/site.xml b/src/site/site.xml
index 0442da7..563b34c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -26,9 +26,12 @@ under the License.
<item name="JavaDocs" href="apidocs/index.html"/>
<item name="Source Xref" href="xref/index.html"/>
<!--item name="FAQ" href="faq.html"/-->
+ <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
+ <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="Download" href="download.html"/>
</menu>
<menu ref="parent"/>
<menu ref="reports"/>
</body>
-</project>
\ No newline at end of file
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 37/44: upgraded parent pom
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit c64147f061e67f3768b8835f17fee13c0a18bfb6
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Thu Oct 30 06:40:10 2014 +0000
upgraded parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1635405 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce2e59b..1d7d790 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
diff --git a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
index 9bc9949..08f40f7 100644
--- a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
+++ b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
@@ -56,6 +56,14 @@ public class DefaultMaven2OsgiConverter
/** pattern that matches strings that contain only numbers */
private static final Pattern ONLY_NUMBERS = Pattern.compile( "[0-9]+" );
+ private static final Pattern DATED_SNAPSHOT =
+ Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9]))?\\-([0-9]{8}\\.[0-9]{6}\\-[0-9]*)" );
+
+ private static final Pattern DOTS_IN_QUALIFIER =
+ Pattern.compile( "([0-9])(\\.[0-9])?\\.([0-9A-Za-z_-]+)\\.([0-9A-Za-z_-]+)" );
+
+ private static final Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9A-Za-z_-]+))?" );
+
private static final String FILE_SEPARATOR = System.getProperty( "file.separator" );
private String getBundleSymbolicName( String groupId, String artifactId )
@@ -251,7 +259,6 @@ public class DefaultMaven2OsgiConverter
osgiVersion = version;
/* check for dated snapshot versions with only major or major and minor */
- Pattern DATED_SNAPSHOT = Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9]))?\\-([0-9]{8}\\.[0-9]{6}\\-[0-9]*)" );
m = DATED_SNAPSHOT.matcher( osgiVersion );
if ( m.matches() )
{
@@ -272,7 +279,6 @@ public class DefaultMaven2OsgiConverter
}
/* remove dots in the middle of the qualifier */
- Pattern DOTS_IN_QUALIFIER = Pattern.compile( "([0-9])(\\.[0-9])?\\.([0-9A-Za-z_-]+)\\.([0-9A-Za-z_-]+)" );
m = DOTS_IN_QUALIFIER.matcher( osgiVersion );
if ( m.matches() )
{
@@ -298,8 +304,6 @@ public class DefaultMaven2OsgiConverter
* 1 -> 1.0.0
* 1.1 -> 1.1.0
*/
- //Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?\\.([0-9A-Za-z_-]+)" );
- Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9A-Za-z_-]+))?" );
m = NEED_TO_FILL_ZEROS.matcher( osgiVersion );
if ( m.matches() )
{
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 22/44: fix relativePath
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 74269242c8b506d15a67c8ad65fdf6afea4c8028
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Jan 31 00:37:28 2011 +0000
fix relativePath
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1065446 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 45d08b7..d77951d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
<version>16-SNAPSHOT</version>
+ <relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
<artifactId>maven-osgi</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 08/44: Upgrade release plugin, previous is broken
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 00660761f86a557567002b4b41c374da2ed7ab41
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Thu Nov 29 07:23:23 2007 +0000
Upgrade release plugin, previous is broken
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@599300 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pom.xml b/pom.xml
index 42d5008..6475e81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ </plugin>
</plugins>
</build>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 40/44: [MNGSITE-243] Fixed wrong link.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 2b0e42773e8cd58d6c7671e6e1f80aa961751a86
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Jun 19 23:25:50 2015 +0000
[MNGSITE-243] Fixed wrong link.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1686514 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/xdoc/download.xml.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 46ca4be..5d1650b 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -39,7 +39,7 @@ under the License.
<p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
- <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="./guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
+ <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="/guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
<a name="mirror"/>
<subsection name="Mirror">
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 30/44: configured site deploy to
/shared-archives/-LATEST
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit c4e13bed5da688aed1c855a78f461d916ad573c0
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Tue Nov 12 21:33:35 2013 +0000
configured site deploy to /shared-archives/<artifactId>-LATEST
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1541249 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pom.xml b/pom.xml
index 0dd9fbb..06d2b88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,16 @@
<system>jira</system>
<url>http://jira.codehaus.org/browse/MSHARED/component/13273</url>
</issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+ <maven.site.path>shared-archives/${project.artifactId}-LATEST</maven.site.path>
+ </properties>
<dependencies>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 09/44: [maven-release-plugin] prepare release
maven-osgi-0.2.0
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit d49c107fd04d5b67dcce9414234380d3645fc356
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Thu Nov 29 07:24:19 2007 +0000
[maven-release-plugin] prepare release maven-osgi-0.2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@599301 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6475e81..e8200fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,4 @@
-<!--
- 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
@@ -27,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-osgi</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<name>Maven OSGi integration</name>
<description>Library for Maven-OSGi integration</description>
@@ -71,4 +51,10 @@
</plugin>
</plugins>
</build>
-</project>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-osgi-0.2.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-osgi-0.2.0</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/shared/tags/maven-osgi-0.2.0</url>
+ </scm>
+</project>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 12/44: use the latest released parent
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 52eafc9f51abadd18e17030e47eaf65d6dd6b4e2
Author: Brian E Fox <br...@apache.org>
AuthorDate: Fri Apr 11 21:22:12 2008 +0000
use the latest released parent
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@647315 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ec6db43..13d456d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>8</version>
+ <version>9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 24/44: fixed headers
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 5c374ba276c4fcf125390b1a03d9e5c20e5e0235
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Mon Apr 11 22:15:41 2011 +0000
fixed headers
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1091231 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java | 3 ++-
.../java/org/apache/maven/shared/osgi/ManifestReadingException.java | 3 ++-
src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java | 3 ++-
.../java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
index 477cf58..9bc9949 100644
--- a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
+++ b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.osgi;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.osgi;
import java.io.File;
import java.io.IOException;
diff --git a/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java b/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java
index bf1b729..bc3c73b 100644
--- a/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java
+++ b/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.osgi;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.osgi;
/**
* Exception while reading the manifest. Encapsulates an IOException to make it runtime
diff --git a/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java
index 522472f..1a7d912 100644
--- a/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java
+++ b/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.osgi;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.osgi;
import org.apache.maven.artifact.Artifact;
diff --git a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
index 76be163..697e778 100644
--- a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
+++ b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.osgi;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.osgi;
import java.io.File;
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 06/44: update some released dependencies
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 077d8d80d8d4145ae08d4df3b6638a9901b141e6
Author: Brett Leslie Porter <br...@apache.org>
AuthorDate: Mon Oct 29 06:19:15 2007 +0000
update some released dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@589505 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d30f111..42d5008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 34/44: added license header
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit e9cf4400eac1b790366f8162d8a847593d0d51d8
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sun May 18 14:26:56 2014 +0000
added license header
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1595626 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/resources/download.cgi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/site/resources/download.cgi b/src/site/resources/download.cgi
index 495cde1..1b178d2 100644
--- a/src/site/resources/download.cgi
+++ b/src/site/resources/download.cgi
@@ -1,4 +1,22 @@
#!/bin/sh
+#
+# 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.
+#
# Just call the standard mirrors.cgi script. It will use download.html
# as the input template.
exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 25/44: added javadoc and jxr reports links in
top-level menu
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit ca9aea9bdbf7199f1d1c5e838fba307499f78edc
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Thu Sep 1 21:28:17 2011 +0000
added javadoc and jxr reports links in top-level menu
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1164282 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/site.xml | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..0442da7
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!--
+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/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 07/44: Add another test based on jtidy version
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit c5d115d3406a695c5e67579edd43764b08216f17
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Wed Oct 31 01:43:00 2007 +0000
Add another test based on jtidy version
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@590533 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
index 39f8188..76be163 100644
--- a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
+++ b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
@@ -143,6 +143,12 @@ public class Maven2OsgiConverterTest
osgiVersion = maven2Osgi.getVersion( "1.4.1-20070217.082013-7" );
assertEquals( "1.4.1.20070217_082013_7", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "0.0.0.4aug2000r7-dev" );
+ assertEquals( "0.0.0.4aug2000r7-dev", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "4aug2000r7-dev" );
+ assertEquals( "0.0.0.4aug2000r7_dev", osgiVersion );
}
private ArtifactStub getTestArtifact()
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 43/44: Upgrade parent to
org.apache.maven.shared:maven-shared-components:30
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 1daec9cf5a877231353825f8e54f20dc18150f2e
Author: Robert Scholte <rf...@apache.org>
AuthorDate: Tue Nov 29 21:51:30 2016 +0000
Upgrade parent to org.apache.maven.shared:maven-shared-components:30
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1771961 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 798d8fd..819d8a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>21</version>
+ <version>30</version>
<relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 28/44: use last shared parent 19
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit f9f49ce4df1ca3c29ba0b930c9f30641a048237d
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Mar 4 14:34:11 2013 +0000
use last shared parent 19
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1452330 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1fdcc77..ddbcf54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>18</version>
+ <version>19</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 42/44: updated Jira url
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit acdb4a378a5d50fc8c2bce07b9f6169cdbdc8f41
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sun May 15 09:15:59 2016 +0000
updated Jira url
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1743896 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/site.xml b/src/site/site.xml
index 563b34c..a18a2a6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -26,7 +26,7 @@ under the License.
<item name="JavaDocs" href="apidocs/index.html"/>
<item name="Source Xref" href="xref/index.html"/>
<!--item name="FAQ" href="faq.html"/-->
- <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
+ <!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
<item name="License" href="http://www.apache.org/licenses/"/>
<item name="Download" href="download.html"/>
</menu>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 26/44: upgrade parent version
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit d88141408bd0de6a52dd04ad3ce255aba3226c1e
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Aug 13 20:47:31 2012 +0000
upgrade parent version
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1372600 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 08356b6..7610697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>16</version>
+ <version>18</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 11/44: Add license header
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit ddd10c0734201d24fe1b500dac029f084c6b6704
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Thu Nov 29 07:35:06 2007 +0000
Add license header
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@599311 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d7d285..ec6db43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,24 @@
-<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">
+<!--
+ 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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
@@ -51,4 +71,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 41/44: [MPOM-95] updated parent pom location
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 87a2870e9ed184665f78cc90559a0060d4de2c76
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Tue Nov 17 21:02:09 2015 +0000
[MPOM-95] updated parent pom location
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714889 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 41b4253..798d8fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
<version>21</version>
- <relativePath>../maven-shared-components/pom.xml</relativePath>
+ <relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
</parent>
<artifactId>maven-osgi</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 27/44: use plexus-component-metadata instead of
obsolete plexus-maven-plugin
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit b4033bd659976555d83842dd59e38804887d3d17
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 7 16:20:18 2012 +0000
use plexus-component-metadata instead of obsolete plexus-maven-plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1395337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7610697..1fdcc77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,11 +66,11 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 16/44: o Inherited from maven-shared-components:11
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 5d4bf4f34bc0b83c1bd0a4aa61015f414136a849
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Feb 21 09:45:11 2009 +0000
o Inherited from maven-shared-components:11
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@746475 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1f26f17..65b0316 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>11</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 04/44: Upgrade parent
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 19f5c20aabfac3f2f4c6a379a9949a1946f8a27d
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Tue Oct 2 08:05:01 2007 +0000
Upgrade parent
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@581152 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 777a507..798b177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 36/44: [MSHARED-371] Increased chance of java8
compliance by updating to asm5.x based plexus-component-*
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit b6d67e1e88a99a2e71cf2c9277f7ab94e8dcc533
Author: Kristian Rosenvold <kr...@apache.org>
AuthorDate: Fri Oct 24 04:30:46 2014 +0000
[MSHARED-371] Increased chance of java8 compliance by updating to asm5.x based plexus-component-*
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1633997 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index c879b0a..ce2e59b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<goals>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 02/44: Add a test case for xercesImpl
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 1021149dd78004a4f3de8ee1784b4e116be1e81c
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Wed Aug 22 16:37:45 2007 +0000
Add a test case for xercesImpl
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@568694 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/shared/osgi/DefaultMaven2OsgiConverter.java | 8 +++++++-
.../maven/shared/osgi/Maven2OsgiConverterTest.java | 7 +++++++
src/test/resources/xercesImpl-2.6.2.jar | Bin 0 -> 1010675 bytes
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
index 6b0402d..8e44c60 100644
--- a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
+++ b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
@@ -122,7 +122,7 @@ public class DefaultMaven2OsgiConverter
}
if ( artifact.getArtifactId().startsWith( lastSection ) )
{
- String artifactId = artifact.getArtifactId().substring( lastSection.length() + 1 );
+ String artifactId = artifact.getArtifactId().substring( lastSection.length() );
if ( Character.isLetterOrDigit( artifactId.charAt( 0 ) ) )
{
return getBundleSymbolicName( artifact.getGroupId(), artifactId );
@@ -193,6 +193,12 @@ public class DefaultMaven2OsgiConverter
return null;
}
+ /* only one section as id doesn't seem enough, so ignore it */
+ if ( groupIdSections.length == 1 )
+ {
+ return null;
+ }
+
StringBuffer sb = new StringBuffer();
for ( int i = 0; i < groupIdSections.length; i++ )
{
diff --git a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
index 6923c6b..7582b91 100644
--- a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
+++ b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
@@ -51,6 +51,7 @@ public class Maven2OsgiConverterTest
artifact.setFile( getTestFile( "junit-3.8.2.jar" ) );
artifact.setGroupId( "junit" );
+ artifact.setArtifactId( "junit" );
s = maven2Osgi.getBundleSymbolicName( artifact );
assertEquals( "junit", s );
@@ -65,6 +66,12 @@ public class Maven2OsgiConverterTest
artifact.setArtifactId( "test" );
s = maven2Osgi.getBundleSymbolicName( artifact );
assertEquals( "test", s );
+
+ artifact.setFile( getTestFile( "xercesImpl-2.6.2.jar" ) );
+ artifact.setGroupId( "xerces" );
+ artifact.setArtifactId( "xercesImpl" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "xerces.Impl", s );
}
public void testGetBundleFileName()
diff --git a/src/test/resources/xercesImpl-2.6.2.jar b/src/test/resources/xercesImpl-2.6.2.jar
new file mode 100644
index 0000000..f0fb0e8
Binary files /dev/null and b/src/test/resources/xercesImpl-2.6.2.jar differ
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 19/44: removing one-off source release assemblies (and
config), then upgrading parent version for all shared projects up to 12,
so source-release will be automatic.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 90563d53297f286cc44b459dd973f55a29c325e5
Author: John Dennis Casey <jd...@apache.org>
AuthorDate: Wed Sep 16 17:12:28 2009 +0000
removing one-off source release assemblies (and config), then upgrading parent version for all shared projects up to 12, so source-release will be automatic.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@815892 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3096600..ac25412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -17,13 +17,13 @@
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">
+<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>11</version>
+ <version>12</version>
</parent>
<artifactId>maven-osgi</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 03/44: use major.minor.service always,
filling with 0s if required
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit d0a5fa84aa3fb71a700d6d9f698f7790698cf7b3
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Fri Sep 7 23:45:40 2007 +0000
use major.minor.service always, filling with 0s if required
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@573759 13f79535-47bb-0310-9956-ffa450edef68
---
.../shared/osgi/DefaultMaven2OsgiConverter.java | 61 +++++++++++++++++----
.../maven/shared/osgi/Maven2OsgiConverterTest.java | 25 +++++++--
src/test/resources/aopalliance-1.0.jar | Bin 0 -> 4467 bytes
3 files changed, 70 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
index 8e44c60..477cf58 100644
--- a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
+++ b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
@@ -48,7 +48,7 @@ public class DefaultMaven2OsgiConverter
/** Bundle-Version must match this pattern */
private static final Pattern OSGI_VERSION_PATTERN = Pattern
- .compile( "[0-9]+(\\.[0-9]+(\\.[0-9]+(\\.[0-9A-Za-z_-]+)?)?)?" );
+ .compile( "[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9A-Za-z_-]+)?" );
/** pattern used to change - to . */
// private static final Pattern P_VERSION = Pattern.compile("([0-9]+(\\.[0-9])*)-(.*)");
@@ -291,21 +291,47 @@ public class DefaultMaven2OsgiConverter
}
}
- /* convert 1.string into 1.0.0.string and 1.2.string into 1.2.0.string */
- Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?\\.([0-9A-Za-z_-]+)" );
+ /* convert
+ * 1.string -> 1.0.0.string
+ * 1.2.string -> 1.2.0.string
+ * 1 -> 1.0.0
+ * 1.1 -> 1.1.0
+ */
+ //Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?\\.([0-9A-Za-z_-]+)" );
+ Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9A-Za-z_-]+))?" );
m = NEED_TO_FILL_ZEROS.matcher( osgiVersion );
if ( m.matches() )
{
String major = m.group( 1 );
- String minor = ( m.group( 3 ) != null ) ? m.group( 3 ) : "0";
- String service = "0";
- String qualifier = m.group( 4 );
+ String minor = m.group( 3 );
+ String service = null;
+ String qualifier = m.group( 5 );
- Matcher qualifierMatcher = ONLY_NUMBERS.matcher( qualifier );
- /* if last portion is only numbers then it's not a qualifier */
- if ( !qualifierMatcher.matches() )
+ /* if there's no qualifier just fill with 0s */
+ if ( qualifier == null )
{
- osgiVersion = major + "." + minor + "." + service + "." + qualifier;
+ osgiVersion = getVersion( major, minor, service, qualifier );
+ }
+ else
+ {
+ /* if last portion is only numbers then it's not a qualifier */
+ Matcher qualifierMatcher = ONLY_NUMBERS.matcher( qualifier );
+ if ( qualifierMatcher.matches() )
+ {
+ if ( minor == null )
+ {
+ minor = qualifier;
+ }
+ else
+ {
+ service = qualifier;
+ }
+ osgiVersion = getVersion( major, minor, service, null );
+ }
+ else
+ {
+ osgiVersion = getVersion( major, minor, service, qualifier );
+ }
}
}
@@ -323,4 +349,19 @@ public class DefaultMaven2OsgiConverter
return osgiVersion;
}
+ private String getVersion( String major, String minor, String service, String qualifier )
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append( major != null ? major : "0" );
+ sb.append( '.' );
+ sb.append( minor != null ? minor : "0" );
+ sb.append( '.' );
+ sb.append( service != null ? service : "0" );
+ if ( qualifier != null )
+ {
+ sb.append( '.' );
+ sb.append( qualifier );
+ }
+ return sb.toString();
+ }
}
diff --git a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
index 7582b91..39f8188 100644
--- a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
+++ b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
@@ -38,7 +38,8 @@ public class Maven2OsgiConverterTest
public void testGetBundleSymbolicName()
{
ArtifactStub artifact = getTestArtifact();
- String s = maven2Osgi.getBundleSymbolicName( artifact );
+ String s;
+ s = maven2Osgi.getBundleSymbolicName( artifact );
assertEquals( "org.apache.commons.logging", s );
artifact.setGroupId( "org.apache.commons" );
@@ -72,20 +73,32 @@ public class Maven2OsgiConverterTest
artifact.setArtifactId( "xercesImpl" );
s = maven2Osgi.getBundleSymbolicName( artifact );
assertEquals( "xerces.Impl", s );
+
+ artifact.setFile( getTestFile( "aopalliance-1.0.jar" ) );
+ artifact.setGroupId( "org.aopalliance" );
+ artifact.setArtifactId( "aopalliance" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "org.aopalliance", s );
}
public void testGetBundleFileName()
{
ArtifactStub artifact = getTestArtifact();
- String s = maven2Osgi.getBundleFileName( artifact );
- assertEquals( "org.apache.commons.logging_1.1.jar", s );
+ String s;
+ s = maven2Osgi.getBundleFileName( artifact );
+ assertEquals( "org.apache.commons.logging_1.1.0.jar", s );
+
+ artifact.setGroupId( "org.aopalliance" );
+ artifact.setArtifactId( "aopalliance" );
+ s = maven2Osgi.getBundleFileName( artifact );
+ assertEquals( "org.aopalliance_1.1.0.jar", s );
}
public void testGetVersion()
{
ArtifactStub artifact = getTestArtifact();
String s = maven2Osgi.getVersion( artifact );
- assertEquals( "1.1", s );
+ assertEquals( "1.1.0", s );
}
public void testConvertVersionToOsgi()
@@ -102,10 +115,10 @@ public class Maven2OsgiConverterTest
assertEquals( "2.0.0.SNAPSHOT", osgiVersion );
osgiVersion = maven2Osgi.getVersion( "2" );
- assertEquals( "2", osgiVersion );
+ assertEquals( "2.0.0", osgiVersion );
osgiVersion = maven2Osgi.getVersion( "2.1" );
- assertEquals( "2.1", osgiVersion );
+ assertEquals( "2.1.0", osgiVersion );
osgiVersion = maven2Osgi.getVersion( "2.1.3" );
assertEquals( "2.1.3", osgiVersion );
diff --git a/src/test/resources/aopalliance-1.0.jar b/src/test/resources/aopalliance-1.0.jar
new file mode 100644
index 0000000..578b1a0
Binary files /dev/null and b/src/test/resources/aopalliance-1.0.jar differ
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 38/44: changed svnpubsub url from /content to
/components
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 792b7f7d73a956bb4a1815eba2504124e41a53c1
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Mon Mar 30 22:25:48 2015 +0000
changed svnpubsub url from /content to /components
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1670207 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1d7d790..0187ddc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
</site>
</distributionManagement>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 23/44: o Used released maven-shared-components:16
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 492345169d5a61e72fd6881493ba776c16beaf26
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Thu Feb 17 21:26:17 2011 +0000
o Used released maven-shared-components:16
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1071797 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d77951d..08356b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>16-SNAPSHOT</version>
+ <version>16</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 32/44: [MNGSITE-152] - Added appropriate links to
download site and license location to fulfill the ASF requirements.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 714b030ec9d1f9dde1e96f8ca8c8409b80983bcf
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed May 14 19:12:38 2014 +0000
[MNGSITE-152]
- Added appropriate links to download site and license location
to fulfill the ASF requirements.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1594676 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/resources/download.cgi | 4 ++
src/site/xdoc/download.xml.vm | 126 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/src/site/resources/download.cgi b/src/site/resources/download.cgi
new file mode 100644
index 0000000..495cde1
--- /dev/null
+++ b/src/site/resources/download.cgi
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Just call the standard mirrors.cgi script. It will use download.html
+# as the input template.
+exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
\ No newline at end of file
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
new file mode 100644
index 0000000..7186d93
--- /dev/null
+++ b/src/site/xdoc/download.xml.vm
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+
+<!--
+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.
+-->
+
+<document>
+ <properties>
+ <title>Download ${project.name} Source</title>
+ </properties>
+ <body>
+ <section name="Download ${project.name} ${project.version} Source">
+
+ <p>${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
+ ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.</p>
+
+ <p>You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
+ hours to reach all mirrors.<p/>
+
+ <p>In order to guard against corrupted downloads/installations, it is highly recommended to
+ <a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
+ of the release bundles against the public <a href="http://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
+ developers.</p>
+
+ <p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
+
+ <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="./guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
+
+ <a name="mirror"/>
+ <subsection name="Mirror">
+
+ <p>
+ [if-any logo]
+ <a href="[link]">
+ <img align="right" src="[logo]" border="0"
+ alt="logo"/>
+ </a>
+ [end]
+ The currently selected mirror is
+ <b>[preferred]</b>.
+ If you encounter a problem with this mirror,
+ please select another mirror.
+ If all mirrors are failing, there are
+ <i>backup</i>
+ mirrors
+ (at the end of the mirrors list) that should be available.
+ </p>
+
+ <form action="[location]" method="get" id="SelectMirror">
+ Other mirrors:
+ <select name="Preferred">
+ [if-any http]
+ [for http]
+ <option value="[http]">[http]</option>
+ [end]
+ [end]
+ [if-any ftp]
+ [for ftp]
+ <option value="[ftp]">[ftp]</option>
+ [end]
+ [end]
+ [if-any backup]
+ [for backup]
+ <option value="[backup]">[backup] (backup)</option>
+ [end]
+ [end]
+ </select>
+ <input type="submit" value="Change"/>
+ </form>
+
+ <p>
+ You may also consult the
+ <a href="http://www.apache.org/mirrors/">complete list of
+ mirrors.</a>
+ </p>
+
+ </subsection>
+
+ <subsection name="${project.name} ${project.version}">
+
+ <p>This is the current stable version of ${project.name}.</p>
+
+ <table>
+ <thead>
+ <tr>
+ <th></th>
+ <th>Link</th>
+ <th>Checksum</th>
+ <th>Signature</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>${project.name} ${project.version} (Source zip)</td>
+ <td><a href="[preferred]maven/plugins/${project.artifactId}-${project.version}-source-release.zip">maven/plugins/${project.artifactId}-${project.version}-source-release.zip</a></td>
+ <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
+ <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
+
+ <subsection name="Previous Versions">
+
+ <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/plugins/">archive site</a>.</p>
+
+ </subsection>
+ </section>
+ </body>
+</document>
+
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 21/44: use last SNAPSHOT parent
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 27016910aa6a799facd993d9e47cfdcbb3c5182a
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Jan 31 00:33:33 2011 +0000
use last SNAPSHOT parent
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1065445 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 31e49bc..45d08b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>12</version>
+ <version>16-SNAPSHOT</version>
</parent>
<artifactId>maven-osgi</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 39/44: moved Jira from Codehaus to Apache
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 50b3716d093c65f823f3f241cabbb734736e55ae
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Mon Apr 6 01:33:47 2015 +0000
moved Jira from Codehaus to Apache
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1671466 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0187ddc..41b4253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
</scm>
<issueManagement>
<system>jira</system>
- <url>http://jira.codehaus.org/browse/MSHARED/component/13273</url>
+ <url>https://issues.apache.org/jira/browse/MSHARED/component/12326435</url>
</issueManagement>
<distributionManagement>
<site>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 10/44: [maven-release-plugin] prepare for next
development iteration
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit bb3e15b21b2fd9d621fb33d3a17656f7cfc626d6
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Thu Nov 29 07:24:36 2007 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@599304 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index e8200fc..8d7d285 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-osgi</artifactId>
- <version>0.2.0</version>
+ <version>0.3.0-SNAPSHOT</version>
<name>Maven OSGi integration</name>
<description>Library for Maven-OSGi integration</description>
@@ -51,10 +51,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-osgi-0.2.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-osgi-0.2.0</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/shared/tags/maven-osgi-0.2.0</url>
- </scm>
</project>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 18/44: o Used http://maven.apache.org/xsd/* for schema
location
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit a05c6634a41e97e1fe821f04d89e1559427865b4
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Feb 28 12:41:44 2009 +0000
o Used http://maven.apache.org/xsd/* for schema location
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@748836 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6ea09ef..3096600 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
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/maven-v4_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>
<parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 31/44: updated parent pom
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 522f26a01d483243f102966bb9d7afd245604ef5
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Mon Mar 31 20:57:52 2014 +0000
updated parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1583459 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06d2b88..c879b0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>19</version>
+ <version>20</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
@@ -49,10 +49,6 @@
</site>
</distributionManagement>
- <properties>
- <maven.site.path>shared-archives/${project.artifactId}-LATEST</maven.site.path>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 01/44: Promoting maven-osgi out of the sandbox
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 589db0ef32f82cf7a165acbe2f6cfbc48e5a9a3d
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Tue Jul 10 16:03:03 2007 +0000
Promoting maven-osgi out of the sandbox
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@554988 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 69 +++++
.../shared/osgi/DefaultMaven2OsgiConverter.java | 320 +++++++++++++++++++++
.../shared/osgi/ManifestReadingException.java | 50 ++++
.../maven/shared/osgi/Maven2OsgiConverter.java | 58 ++++
.../maven/shared/osgi/Maven2OsgiConverterTest.java | 142 +++++++++
src/test/resources/commons-logging-1.1.jar | Bin 0 -> 52915 bytes
src/test/resources/junit-3.8.2.jar | Bin 0 -> 120640 bytes
src/test/resources/test-1.jar | Bin 0 -> 2426 bytes
src/test/resources/xml-apis-1.0.b2.jar | Bin 0 -> 109318 bytes
9 files changed, 639 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..777a507
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,69 @@
+<!--
+ 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/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-components</artifactId>
+ <version>7</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-osgi</artifactId>
+ <version>0.2.0-SNAPSHOT</version>
+ <name>Maven OSGi integration</name>
+ <description>Library for Maven-OSGi integration</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <version>0.0.145</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
new file mode 100644
index 0000000..6b0402d
--- /dev/null
+++ b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
@@ -0,0 +1,320 @@
+/*
+ * 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.
+ */
+package org.apache.maven.shared.osgi;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+
+import org.apache.maven.artifact.Artifact;
+
+import aQute.lib.osgi.Analyzer;
+
+/**
+ * Default implementation of {@link Maven2OsgiConverter}
+ *
+ * @plexus.component
+ *
+ * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
+ * @version $Id$
+ */
+public class DefaultMaven2OsgiConverter
+ implements Maven2OsgiConverter
+{
+
+ /** Bundle-Version must match this pattern */
+ private static final Pattern OSGI_VERSION_PATTERN = Pattern
+ .compile( "[0-9]+(\\.[0-9]+(\\.[0-9]+(\\.[0-9A-Za-z_-]+)?)?)?" );
+
+ /** pattern used to change - to . */
+ // private static final Pattern P_VERSION = Pattern.compile("([0-9]+(\\.[0-9])*)-(.*)");
+ /** pattern that matches strings that contain only numbers */
+ private static final Pattern ONLY_NUMBERS = Pattern.compile( "[0-9]+" );
+
+ private static final String FILE_SEPARATOR = System.getProperty( "file.separator" );
+
+ private String getBundleSymbolicName( String groupId, String artifactId )
+ {
+ return groupId + "." + artifactId;
+ }
+
+ /**
+ * Get the symbolic name as groupId + "." + artifactId, with the following exceptions
+ * <ul>
+ * <li>if artifact.getFile is not null and the jar contains a OSGi Manifest with
+ * Bundle-SymbolicName property then that value is returned</li>
+ * <li>if groupId has only one section (no dots) and artifact.getFile is not null then the
+ * first package name with classes is returned. eg. commons-logging:commons-logging ->
+ * org.apache.commons.logging</li>
+ * <li>if artifactId is equal to last section of groupId then groupId is returned. eg.
+ * org.apache.maven:maven -> org.apache.maven</li>
+ * <li>if artifactId starts with last section of groupId that portion is removed. eg.
+ * org.apache.maven:maven-core -> org.apache.maven.core</li>
+ * </ul>
+ */
+ public String getBundleSymbolicName( Artifact artifact )
+ {
+ if ( ( artifact.getFile() != null ) && artifact.getFile().exists() )
+ {
+ Analyzer analyzer = new Analyzer();
+
+ try
+ {
+ JarFile jar = new JarFile( artifact.getFile(), false );
+
+ if ( jar.getManifest() != null )
+ {
+ String symbolicNameAttribute = jar.getManifest().getMainAttributes()
+ .getValue( Analyzer.BUNDLE_SYMBOLICNAME );
+ Map bundleSymbolicNameHeader = analyzer.parseHeader( symbolicNameAttribute );
+
+ Iterator it = bundleSymbolicNameHeader.keySet().iterator();
+ if ( it.hasNext() )
+ {
+ return (String) it.next();
+ }
+ }
+ }
+ catch ( IOException e )
+ {
+ throw new ManifestReadingException( "Error reading manifest in jar "
+ + artifact.getFile().getAbsolutePath(), e );
+ }
+ }
+
+ int i = artifact.getGroupId().lastIndexOf( '.' );
+ if ( ( i < 0 ) && ( artifact.getFile() != null ) && artifact.getFile().exists() )
+ {
+ String groupIdFromPackage = getGroupIdFromPackage( artifact.getFile() );
+ if ( groupIdFromPackage != null )
+ {
+ return groupIdFromPackage;
+ }
+ }
+ String lastSection = artifact.getGroupId().substring( ++i );
+ if ( artifact.getArtifactId().equals( lastSection ) )
+ {
+ return artifact.getGroupId();
+ }
+ if ( artifact.getArtifactId().startsWith( lastSection ) )
+ {
+ String artifactId = artifact.getArtifactId().substring( lastSection.length() + 1 );
+ if ( Character.isLetterOrDigit( artifactId.charAt( 0 ) ) )
+ {
+ return getBundleSymbolicName( artifact.getGroupId(), artifactId );
+ }
+ else
+ {
+ return getBundleSymbolicName( artifact.getGroupId(), artifactId.substring( 1 ) );
+ }
+ }
+ return getBundleSymbolicName( artifact.getGroupId(), artifact.getArtifactId() );
+ }
+
+ private String getGroupIdFromPackage( File artifactFile )
+ {
+ try
+ {
+ /* get package names from jar */
+ Set packageNames = new HashSet();
+ JarFile jar = new JarFile( artifactFile, false );
+ Enumeration entries = jar.entries();
+ while ( entries.hasMoreElements() )
+ {
+ ZipEntry entry = (ZipEntry) entries.nextElement();
+ if ( entry.getName().endsWith( ".class" ) )
+ {
+ File f = new File( entry.getName() );
+ String packageName = f.getParent();
+ if ( packageName != null )
+ {
+ packageNames.add( packageName );
+ }
+ }
+ }
+
+ /* find the top package */
+ String[] groupIdSections = null;
+ for ( Iterator it = packageNames.iterator(); it.hasNext(); )
+ {
+ String packageName = (String) it.next();
+
+ String[] packageNameSections = packageName.split( "\\" + FILE_SEPARATOR );
+ if ( groupIdSections == null )
+ {
+ /* first candidate */
+ groupIdSections = packageNameSections;
+ }
+ else
+ // if ( packageNameSections.length < groupIdSections.length )
+ {
+ /*
+ * find the common portion of current package and previous selected groupId
+ */
+ int i;
+ for ( i = 0; ( i < packageNameSections.length ) && ( i < groupIdSections.length ); i++ )
+ {
+ if ( !packageNameSections[i].equals( groupIdSections[i] ) )
+ {
+ break;
+ }
+ }
+ groupIdSections = new String[i];
+ System.arraycopy( packageNameSections, 0, groupIdSections, 0, i );
+ }
+ }
+
+ if ( ( groupIdSections == null ) || ( groupIdSections.length == 0 ) )
+ {
+ return null;
+ }
+
+ StringBuffer sb = new StringBuffer();
+ for ( int i = 0; i < groupIdSections.length; i++ )
+ {
+ sb.append( groupIdSections[i] );
+ if ( i < groupIdSections.length - 1 )
+ {
+ sb.append( '.' );
+ }
+ }
+ return sb.toString();
+ }
+ catch ( IOException e )
+ {
+ /* we took all the precautions to avoid this */
+ throw new RuntimeException( e );
+ }
+ }
+
+ public String getBundleFileName( Artifact artifact )
+ {
+ return getBundleSymbolicName( artifact ) + "_" + getVersion( artifact.getVersion() ) + ".jar";
+ }
+
+ public String getVersion( Artifact artifact )
+ {
+ return getVersion( artifact.getVersion() );
+ }
+
+ public String getVersion( String version )
+ {
+ String osgiVersion;
+
+ // Matcher m = P_VERSION.matcher(version);
+ // if (m.matches()) {
+ // osgiVersion = m.group(1) + "." + m.group(3);
+ // }
+
+ /* TODO need a regexp guru here */
+
+ Matcher m;
+
+ /* if it's already OSGi compliant don't touch it */
+ m = OSGI_VERSION_PATTERN.matcher( version );
+ if ( m.matches() )
+ {
+ return version;
+ }
+
+ osgiVersion = version;
+
+ /* check for dated snapshot versions with only major or major and minor */
+ Pattern DATED_SNAPSHOT = Pattern.compile( "([0-9])(\\.([0-9]))?(\\.([0-9]))?\\-([0-9]{8}\\.[0-9]{6}\\-[0-9]*)" );
+ m = DATED_SNAPSHOT.matcher( osgiVersion );
+ if ( m.matches() )
+ {
+ String major = m.group( 1 );
+ String minor = ( m.group( 3 ) != null ) ? m.group( 3 ) : "0";
+ String service = ( m.group( 5 ) != null ) ? m.group( 5 ) : "0";
+ String qualifier = m.group( 6 ).replaceAll( "-", "_" ).replaceAll( "\\.", "_" );
+ osgiVersion = major + "." + minor + "." + service + "." + qualifier;
+ }
+
+ /* else transform first - to . and others to _ */
+ osgiVersion = osgiVersion.replaceFirst( "-", "\\." );
+ osgiVersion = osgiVersion.replaceAll( "-", "_" );
+ m = OSGI_VERSION_PATTERN.matcher( osgiVersion );
+ if ( m.matches() )
+ {
+ return osgiVersion;
+ }
+
+ /* remove dots in the middle of the qualifier */
+ Pattern DOTS_IN_QUALIFIER = Pattern.compile( "([0-9])(\\.[0-9])?\\.([0-9A-Za-z_-]+)\\.([0-9A-Za-z_-]+)" );
+ m = DOTS_IN_QUALIFIER.matcher( osgiVersion );
+ if ( m.matches() )
+ {
+ String s1 = m.group( 1 );
+ String s2 = m.group( 2 );
+ String s3 = m.group( 3 );
+ String s4 = m.group( 4 );
+
+ Matcher qualifierMatcher = ONLY_NUMBERS.matcher( s3 );
+ /*
+ * if last portion before dot is only numbers then it's not in the middle of the
+ * qualifier
+ */
+ if ( !qualifierMatcher.matches() )
+ {
+ osgiVersion = s1 + s2 + "." + s3 + "_" + s4;
+ }
+ }
+
+ /* convert 1.string into 1.0.0.string and 1.2.string into 1.2.0.string */
+ Pattern NEED_TO_FILL_ZEROS = Pattern.compile( "([0-9])(\\.([0-9]))?\\.([0-9A-Za-z_-]+)" );
+ m = NEED_TO_FILL_ZEROS.matcher( osgiVersion );
+ if ( m.matches() )
+ {
+ String major = m.group( 1 );
+ String minor = ( m.group( 3 ) != null ) ? m.group( 3 ) : "0";
+ String service = "0";
+ String qualifier = m.group( 4 );
+
+ Matcher qualifierMatcher = ONLY_NUMBERS.matcher( qualifier );
+ /* if last portion is only numbers then it's not a qualifier */
+ if ( !qualifierMatcher.matches() )
+ {
+ osgiVersion = major + "." + minor + "." + service + "." + qualifier;
+ }
+ }
+
+ m = OSGI_VERSION_PATTERN.matcher( osgiVersion );
+ /* if still its not OSGi version then add everything as qualifier */
+ if ( !m.matches() )
+ {
+ String major = "0";
+ String minor = "0";
+ String service = "0";
+ String qualifier = osgiVersion.replaceAll( "\\.", "_" );
+ osgiVersion = major + "." + minor + "." + service + "." + qualifier;
+ }
+
+ return osgiVersion;
+ }
+
+}
diff --git a/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java b/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java
new file mode 100644
index 0000000..bf1b729
--- /dev/null
+++ b/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+package org.apache.maven.shared.osgi;
+
+/**
+ * Exception while reading the manifest. Encapsulates an IOException to make it runtime
+ *
+ * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
+ * @version $Id$
+ */
+public class ManifestReadingException
+ extends RuntimeException
+{
+
+ public ManifestReadingException()
+ {
+ super();
+ }
+
+ public ManifestReadingException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
+ public ManifestReadingException( String message )
+ {
+ super( message );
+ }
+
+ public ManifestReadingException( Throwable cause )
+ {
+ super( cause );
+ }
+}
diff --git a/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java b/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java
new file mode 100644
index 0000000..522472f
--- /dev/null
+++ b/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+package org.apache.maven.shared.osgi;
+
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * Converter from Maven groupId,artifactId and versions to OSGi Bundle-SymbolicName and version
+ *
+ * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
+ * @version $Id$
+ */
+public interface Maven2OsgiConverter
+{
+
+ /**
+ * Get the OSGi symbolic name for the artifact
+ *
+ * @param artifact
+ * @return the Bundle-SymbolicName manifest property
+ */
+ String getBundleSymbolicName( Artifact artifact );
+
+ String getBundleFileName( Artifact artifact );
+
+ /**
+ * Convert a Maven version into an OSGi compliant version
+ *
+ * @param artifact Maven artifact
+ * @return the OSGi version
+ */
+ String getVersion( Artifact artifact );
+
+ /**
+ * Convert a Maven version into an OSGi compliant version
+ *
+ * @param version Maven version
+ * @return the OSGi version
+ */
+ String getVersion( String version );
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
new file mode 100644
index 0000000..6923c6b
--- /dev/null
+++ b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
@@ -0,0 +1,142 @@
+/*
+ * 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.
+ */
+package org.apache.maven.shared.osgi;
+
+import java.io.File;
+
+import org.apache.maven.plugin.testing.stubs.ArtifactStub;
+import org.codehaus.plexus.PlexusTestCase;
+
+/**
+ * Test for {@link DefaultMaven2OsgiConverter}
+ *
+ * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
+ * @version $Id$
+ */
+public class Maven2OsgiConverterTest
+ extends PlexusTestCase
+{
+
+ private Maven2OsgiConverter maven2Osgi = new DefaultMaven2OsgiConverter();
+
+ public void testGetBundleSymbolicName()
+ {
+ ArtifactStub artifact = getTestArtifact();
+ String s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "org.apache.commons.logging", s );
+
+ artifact.setGroupId( "org.apache.commons" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "org.apache.commons.logging", s );
+
+ artifact.setGroupId( "org.apache.commons.commons-logging" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "org.apache.commons.commons-logging", s );
+
+ artifact.setFile( getTestFile( "junit-3.8.2.jar" ) );
+ artifact.setGroupId( "junit" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "junit", s );
+
+ artifact.setFile( getTestFile( "xml-apis-1.0.b2.jar" ) );
+ artifact.setGroupId( "xml-apis" );
+ artifact.setArtifactId( "a" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "xml-apis.a", s );
+
+ artifact.setFile( getTestFile( "test-1.jar" ) );
+ artifact.setGroupId( "test" );
+ artifact.setArtifactId( "test" );
+ s = maven2Osgi.getBundleSymbolicName( artifact );
+ assertEquals( "test", s );
+ }
+
+ public void testGetBundleFileName()
+ {
+ ArtifactStub artifact = getTestArtifact();
+ String s = maven2Osgi.getBundleFileName( artifact );
+ assertEquals( "org.apache.commons.logging_1.1.jar", s );
+ }
+
+ public void testGetVersion()
+ {
+ ArtifactStub artifact = getTestArtifact();
+ String s = maven2Osgi.getVersion( artifact );
+ assertEquals( "1.1", s );
+ }
+
+ public void testConvertVersionToOsgi()
+ {
+ String osgiVersion;
+
+ osgiVersion = maven2Osgi.getVersion( "2.1.0-SNAPSHOT" );
+ assertEquals( "2.1.0.SNAPSHOT", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "2.1-SNAPSHOT" );
+ assertEquals( "2.1.0.SNAPSHOT", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "2-SNAPSHOT" );
+ assertEquals( "2.0.0.SNAPSHOT", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "2" );
+ assertEquals( "2", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "2.1" );
+ assertEquals( "2.1", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "2.1.3" );
+ assertEquals( "2.1.3", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "2.1.3.4" );
+ assertEquals( "2.1.3.4", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "4aug2000r7-dev" );
+ assertEquals( "0.0.0.4aug2000r7_dev", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "1.1-alpha-2" );
+ assertEquals( "1.1.0.alpha_2", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "1.0-alpha-16-20070122.203121-13" );
+ assertEquals( "1.0.0.alpha_16_20070122_203121_13", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "1.0-20070119.021432-1" );
+ assertEquals( "1.0.0.20070119_021432_1", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "1-20070119.021432-1" );
+ assertEquals( "1.0.0.20070119_021432_1", osgiVersion );
+
+ osgiVersion = maven2Osgi.getVersion( "1.4.1-20070217.082013-7" );
+ assertEquals( "1.4.1.20070217_082013_7", osgiVersion );
+ }
+
+ private ArtifactStub getTestArtifact()
+ {
+ ArtifactStub a = new ArtifactStub();
+ a.setGroupId( "commons-logging" );
+ a.setArtifactId( "commons-logging" );
+ a.setVersion( "1.1" );
+ a.setFile( getTestFile( "commons-logging-1.1.jar" ) );
+ return a;
+ }
+
+ public static File getTestFile( String fileName )
+ {
+ return PlexusTestCase.getTestFile( "src/test/resources/" + fileName );
+ }
+}
diff --git a/src/test/resources/commons-logging-1.1.jar b/src/test/resources/commons-logging-1.1.jar
new file mode 100644
index 0000000..2ff9bbd
Binary files /dev/null and b/src/test/resources/commons-logging-1.1.jar differ
diff --git a/src/test/resources/junit-3.8.2.jar b/src/test/resources/junit-3.8.2.jar
new file mode 100644
index 0000000..c8f711d
Binary files /dev/null and b/src/test/resources/junit-3.8.2.jar differ
diff --git a/src/test/resources/test-1.jar b/src/test/resources/test-1.jar
new file mode 100644
index 0000000..fb1d7f6
Binary files /dev/null and b/src/test/resources/test-1.jar differ
diff --git a/src/test/resources/xml-apis-1.0.b2.jar b/src/test/resources/xml-apis-1.0.b2.jar
new file mode 100644
index 0000000..ad33a5a
Binary files /dev/null and b/src/test/resources/xml-apis-1.0.b2.jar differ
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 29/44: Follow ASF branding rules.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 94d7f3a8eaf27b8f6b4d9448a91e906544c7c4ff
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Tue Jul 23 22:20:55 2013 +0000
Follow ASF branding rules.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1506336 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ddbcf54..0dd9fbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<artifactId>maven-osgi</artifactId>
<version>0.3.0-SNAPSHOT</version>
- <name>Maven OSGi integration</name>
+ <name>Apache Maven OSGi Integration</name>
<description>Library for Maven-OSGi integration</description>
<scm>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 05/44: upgrade bndlib
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit ef34040cd867169ae54bf899098fd04c6434e78a
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Mon Oct 22 18:24:31 2007 +0000
upgrade bndlib
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@587180 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 798b177..d30f111 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bndlib</artifactId>
- <version>0.0.145</version>
+ <version>0.0.203</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 20/44: updated issue management urls to point
precisely to the component in MSHARED
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 86a60e07ff713888747ad552855d6d72347e722c
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sat Aug 7 03:29:54 2010 +0000
updated issue management urls to point precisely to the component in MSHARED
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@983169 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pom.xml b/pom.xml
index ac25412..31e49bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,16 @@
<name>Maven OSGi integration</name>
<description>Library for Maven-OSGi integration</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-osgi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-osgi</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MSHARED/component/13273</url>
+ </issueManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 35/44: s/plugins/shared/
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit 5dd54121e2820bbcfd732627e3f4f5035de8654e
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sun May 18 16:07:51 2014 +0000
s/plugins/shared/
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1595631 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/xdoc/download.xml.vm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 7186d93..46ca4be 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -107,9 +107,9 @@ under the License.
<tbody>
<tr>
<td>${project.name} ${project.version} (Source zip)</td>
- <td><a href="[preferred]maven/plugins/${project.artifactId}-${project.version}-source-release.zip">maven/plugins/${project.artifactId}-${project.version}-source-release.zip</a></td>
- <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
- <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
+ <td><a href="[preferred]maven/shared/${project.artifactId}-${project.version}-source-release.zip">maven/shared/${project.artifactId}-${project.version}-source-release.zip</a></td>
+ <td><a href="http://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.md5">maven/shared/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
+ <td><a href="http://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc">maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
</tr>
</tbody>
</table>
@@ -117,7 +117,7 @@ under the License.
<subsection name="Previous Versions">
- <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/plugins/">archive site</a>.</p>
+ <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/shared/">archive site</a>.</p>
</subsection>
</section>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-osgi] 15/44: use the new parent
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-osgi.git
commit c744540aa4dc1abb63ce55e8f9e634082d258b41
Author: Brian E Fox <br...@apache.org>
AuthorDate: Sat Feb 14 01:13:32 2009 +0000
use the new parent
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@744336 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e326b4c..1f26f17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>10</version>
+ <version>11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.