You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2018/05/16 08:00:05 UTC
[1/6] servicemix-specs git commit: Add contract to annotation-1.2
Repository: servicemix-specs
Updated Branches:
refs/heads/master e7f9b4d78 -> 17d8bbe54
Add contract to annotation-1.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix-specs/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-specs/commit/af6898fc
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-specs/tree/af6898fc
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-specs/diff/af6898fc
Branch: refs/heads/master
Commit: af6898fc1d46c237f4c3c3529587642ca3d66389
Parents: e7f9b4d
Author: Carlos Sierra <ca...@liferay.com>
Authored: Thu May 3 17:09:45 2018 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Thu May 3 17:09:45 2018 +0200
----------------------------------------------------------------------
annotation-api-1.2/pom.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/af6898fc/annotation-api-1.2/pom.xml
----------------------------------------------------------------------
diff --git a/annotation-api-1.2/pom.xml b/annotation-api-1.2/pom.xml
index 1a1a57d..5d9b88a 100644
--- a/annotation-api-1.2/pom.xml
+++ b/annotation-api-1.2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>specs-pom</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
<relativePath>../specs-pom/pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.locator</artifactId>
- <version>2.10-SNAPSHOT</version>
+ <version>2.10</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -61,6 +61,9 @@
<Private-Package />
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
+ <Provide-Capability>
+ <![CDATA[osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.2,1.1,1"]]>
+ </Provide-Capability>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
[3/6] servicemix-specs git commit: Add generated uses header
Posted by jb...@apache.org.
Add generated uses header
Project: http://git-wip-us.apache.org/repos/asf/servicemix-specs/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-specs/commit/c5728d06
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-specs/tree/c5728d06
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-specs/diff/c5728d06
Branch: refs/heads/master
Commit: c5728d06c72585c52884eeea67f26c612606e65d
Parents: 7253275
Author: Carlos Sierra <ca...@liferay.com>
Authored: Thu May 3 17:20:53 2018 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Thu May 3 17:20:53 2018 +0200
----------------------------------------------------------------------
annotation-api-1.2/pom.xml | 2 +-
annotation-api-1.3/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/c5728d06/annotation-api-1.2/pom.xml
----------------------------------------------------------------------
diff --git a/annotation-api-1.2/pom.xml b/annotation-api-1.2/pom.xml
index 5d9b88a..b78b3a1 100644
--- a/annotation-api-1.2/pom.xml
+++ b/annotation-api-1.2/pom.xml
@@ -62,7 +62,7 @@
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Provide-Capability>
- <![CDATA[osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.2,1.1,1"]]>
+ <![CDATA[osgi.contract;osgi.contract=JavaAnnotation;uses:="${packages;NAMED;javax.*}";version:List<Version>="1.2,1.1,1"]]>
</Provide-Capability>
</instructions>
<unpackBundle>true</unpackBundle>
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/c5728d06/annotation-api-1.3/pom.xml
----------------------------------------------------------------------
diff --git a/annotation-api-1.3/pom.xml b/annotation-api-1.3/pom.xml
index b613e0e..7d1ee55 100644
--- a/annotation-api-1.3/pom.xml
+++ b/annotation-api-1.3/pom.xml
@@ -62,7 +62,7 @@
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Provide-Capability>
- <![CDATA[osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.3,1.2,1.1,1"]]>
+ <![CDATA[osgi.contract;osgi.contract=JavaAnnotation;uses:="${packages;NAMED;javax.*}";version:List<Version>="1.3,1.2,1.1,1"]]>
</Provide-Capability>
</instructions>
<unpackBundle>true</unpackBundle>
[5/6] servicemix-specs git commit: This closes #14
Posted by jb...@apache.org.
This closes #14
Project: http://git-wip-us.apache.org/repos/asf/servicemix-specs/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-specs/commit/7fa582d0
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-specs/tree/7fa582d0
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-specs/diff/7fa582d0
Branch: refs/heads/master
Commit: 7fa582d042a2149aa879e6fb970858aae6f09b06
Parents: e7f9b4d 42dfff6
Author: Jean-Baptiste Onofré <jb...@nanthrax.net>
Authored: Wed May 16 09:58:57 2018 +0200
Committer: Jean-Baptiste Onofré <jb...@nanthrax.net>
Committed: Wed May 16 09:58:57 2018 +0200
----------------------------------------------------------------------
annotation-api-1.2/pom.xml | 9 ++-
annotation-api-1.3/pom.xml | 173 ++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
3 files changed, 180 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/6] servicemix-specs git commit: Fix annotation-api bundles version
Posted by jb...@apache.org.
Fix annotation-api bundles version
Project: http://git-wip-us.apache.org/repos/asf/servicemix-specs/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-specs/commit/42dfff63
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-specs/tree/42dfff63
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-specs/diff/42dfff63
Branch: refs/heads/master
Commit: 42dfff6352fc1fb004255892a5f67985a7622192
Parents: c5728d0
Author: Jean-Baptiste Onofré <jb...@nanthrax.net>
Authored: Wed May 16 09:57:39 2018 +0200
Committer: Jean-Baptiste Onofré <jb...@nanthrax.net>
Committed: Wed May 16 09:57:39 2018 +0200
----------------------------------------------------------------------
annotation-api-1.2/pom.xml | 2 +-
annotation-api-1.3/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/42dfff63/annotation-api-1.2/pom.xml
----------------------------------------------------------------------
diff --git a/annotation-api-1.2/pom.xml b/annotation-api-1.2/pom.xml
index b78b3a1..d1a38cd 100644
--- a/annotation-api-1.2/pom.xml
+++ b/annotation-api-1.2/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.annotation-api-1.2</artifactId>
<packaging>bundle</packaging>
- <version>2.10-SNAPSHOT</version>
+ <version>1.2_1-SNAPSHOT</version>
<name>Apache ServiceMix :: Specs :: Annotation API 1.2</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/42dfff63/annotation-api-1.3/pom.xml
----------------------------------------------------------------------
diff --git a/annotation-api-1.3/pom.xml b/annotation-api-1.3/pom.xml
index 7d1ee55..0be3688 100644
--- a/annotation-api-1.3/pom.xml
+++ b/annotation-api-1.3/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.annotation-api-1.3</artifactId>
<packaging>bundle</packaging>
- <version>2.10-SNAPSHOT</version>
+ <version>1.3_1-SNAPSHOT</version>
<name>Apache ServiceMix :: Specs :: Annotation API 1.3</name>
<dependencies>
[2/6] servicemix-specs git commit: Add annotation-1.3
Posted by jb...@apache.org.
Add annotation-1.3
Project: http://git-wip-us.apache.org/repos/asf/servicemix-specs/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-specs/commit/72532754
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-specs/tree/72532754
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-specs/diff/72532754
Branch: refs/heads/master
Commit: 7253275428cd57567344408f947007d32ea1dbd9
Parents: af6898f
Author: Carlos Sierra <ca...@liferay.com>
Authored: Thu May 3 17:10:31 2018 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Thu May 3 17:10:31 2018 +0200
----------------------------------------------------------------------
annotation-api-1.3/pom.xml | 173 ++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 174 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/72532754/annotation-api-1.3/pom.xml
----------------------------------------------------------------------
diff --git a/annotation-api-1.3/pom.xml b/annotation-api-1.3/pom.xml
new file mode 100644
index 0000000..b613e0e
--- /dev/null
+++ b/annotation-api-1.3/pom.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>specs-pom</artifactId>
+ <version>1</version>
+ <relativePath>../specs-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.annotation-api-1.3</artifactId>
+ <packaging>bundle</packaging>
+ <version>2.10-SNAPSHOT</version>
+ <name>Apache ServiceMix :: Specs :: Annotation API 1.3</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.locator</artifactId>
+ <version>2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Description>${project.description}</Bundle-Description>
+ <Export-Package>javax.annotation*;version=1.3;-split-package:=merge-first;-noimport:=true</Export-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package />
+ <Implementation-Title>Apache ServiceMix</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Provide-Capability>
+ <![CDATA[osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.3,1.2,1.1,1"]]>
+ </Provide-Capability>
+ </instructions>
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>javax.annotation:javax.annotation-api</include>
+ <include>${project.groupId}:${project.artifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>javax.annotation:javax.annotation-api</artifact>
+ <excludes>
+ <exclude>javax/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <createSourcesJar>${createSourcesJar}</createSourcesJar>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <properties>
+ <createSourcesJar>true</createSourcesJar>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.locator</artifactId>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/sources</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+ <sourcepath>${project.build.directory}/sources</sourcepath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/72532754/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 54af885..34032ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
<module>json-api-1.1</module>
<module>javax-el-api-3.0.0</module>
<module>javax-el-api-2.2.5</module>
+ <module>annotation-api-1.3</module>
</modules>
</project>
[6/6] servicemix-specs git commit: Update main pom.xml for the release
Posted by jb...@apache.org.
Update main pom.xml for the release
Project: http://git-wip-us.apache.org/repos/asf/servicemix-specs/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-specs/commit/17d8bbe5
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-specs/tree/17d8bbe5
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-specs/diff/17d8bbe5
Branch: refs/heads/master
Commit: 17d8bbe549e37370bb26480c3edc0501d0fe1847
Parents: 7fa582d
Author: Jean-Baptiste Onofré <jb...@nanthrax.net>
Authored: Wed May 16 09:59:34 2018 +0200
Committer: Jean-Baptiste Onofré <jb...@nanthrax.net>
Committed: Wed May 16 09:59:34 2018 +0200
----------------------------------------------------------------------
pom.xml | 42 ------------------------------------------
1 file changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/17d8bbe5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 34032ad..8f4d7b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,49 +36,7 @@
<!-- This pom is not supposed to be released, it's just the list of next specs modules we plan to include in next release cycle -->
<modules>
- <module>specs-pom</module>
- <module>locator</module>
- <module>activator</module>
- <module>saaj-api-1.3</module>
- <module>stax-api-1.0</module>
- <module>stax-api-1.2</module>
- <module>jain-sip-api-1.2</module>
- <module>jain-sip-api-1.2.1</module>
- <module>jaxb-api-2.0</module>
- <module>jaxb-api-2.1</module>
- <module>jaxb-api-2.2</module>
- <module>jaxp-api-1.3</module>
- <module>jaxp-api-1.4</module>
- <module>jaxws-api-2.0</module>
- <module>jaxws-api-2.1</module>
- <module>jaxws-api-2.2</module>
- <module>jbi-api-1.0</module>
- <module>scripting-api-1.0</module>
- <module>jsr250-1.0</module>
- <module>jsr311-api-0.8</module>
- <module>jsr311-api-1.0</module>
- <module>jsr311-api-1.1</module>
- <module>jsr311-api-1.1.1</module>
- <module>jsr339-api-m10</module>
- <module>jsr339-api-m13</module>
- <module>jsr339-api-rc3</module>
- <module>jsr339-api-2.0</module>
- <module>jsr339-api-2.0.1</module>
- <module>javamail-api-1.4</module>
- <module>activation-api-1.1</module>
<module>annotation-api-1.2</module>
- <module>java-persistence-api-1.1.1</module>
- <module>java-persistence-api-2.0</module>
- <module>jsr303-api-1.0.0</module>
- <module>jsr303-api-1.1.0</module>
- <module>jcr-api-2.0</module>
- <module>jsr370-api-m1</module>
- <module>jsr370-api-m4</module>
- <module>jsr370-api-m5</module>
- <module>jaxrs-api-2.1</module>
- <module>json-api-1.1</module>
- <module>javax-el-api-3.0.0</module>
- <module>javax-el-api-2.2.5</module>
<module>annotation-api-1.3</module>
</modules>