oltu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1608385 - in /oltu/trunk: commons/encodedtoken/ commons/json/ jose/jws/ oauth-2.0/authzserver/ oauth-2.0/client/ oauth-2.0/common/ oauth-2.0/dynamicreg-client/ oauth-2.0/dynamicreg-common/ oauth-2.0/dynamicreg-server/ oauth-2.0/httpclient4...
Date Mon, 07 Jul 2014 09:19:14 GMT
Author: simonetripodi
Date: Mon Jul  7 09:19:13 2014
New Revision: 1608385

URL: http://svn.apache.org/r1608385
Log:
OLTU-134 - Broken OSGi metadata

applied patch submitted by Łukasz Dywicki


Modified:
    oltu/trunk/commons/encodedtoken/pom.xml
    oltu/trunk/commons/json/pom.xml
    oltu/trunk/jose/jws/pom.xml
    oltu/trunk/oauth-2.0/authzserver/pom.xml
    oltu/trunk/oauth-2.0/client/pom.xml
    oltu/trunk/oauth-2.0/common/pom.xml
    oltu/trunk/oauth-2.0/dynamicreg-client/pom.xml
    oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml
    oltu/trunk/oauth-2.0/dynamicreg-server/pom.xml
    oltu/trunk/oauth-2.0/httpclient4/pom.xml
    oltu/trunk/oauth-2.0/jwt/pom.xml
    oltu/trunk/oauth-2.0/resourceserver-filter/pom.xml
    oltu/trunk/oauth-2.0/resourceserver/pom.xml
    oltu/trunk/openid-connect/client/pom.xml
    oltu/trunk/openid-connect/common/pom.xml
    oltu/trunk/parent/pom.xml

Modified: oltu/trunk/commons/encodedtoken/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/commons/encodedtoken/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/commons/encodedtoken/pom.xml (original)
+++ oltu/trunk/commons/encodedtoken/pom.xml Mon Jul  7 09:19:13 2014
@@ -26,6 +26,7 @@
 
   <artifactId>org.apache.oltu.commons.encodedtoken</artifactId>
   <version>1.0.1-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - Commons - Encoded Token</name>
   <description>Apache Oltu Encoded Token shared utility</description>

Modified: oltu/trunk/commons/json/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/commons/json/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/commons/json/pom.xml (original)
+++ oltu/trunk/commons/json/pom.xml Mon Jul  7 09:19:13 2014
@@ -26,6 +26,7 @@
 
   <artifactId>org.apache.oltu.commons.json</artifactId>
   <version>1.0.1-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - Commons - JSON</name>
   <description>Apache Oltu JSON shared utility</description>

Modified: oltu/trunk/jose/jws/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/jws/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/jose/jws/pom.xml (original)
+++ oltu/trunk/jose/jws/pom.xml Mon Jul  7 09:19:13 2014
@@ -26,6 +26,7 @@
 
   <artifactId>org.apache.oltu.jose.jws</artifactId>
   <version>1.0.1-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - JOSE - JWS</name>
   <description>JWS specification implemented in Apache Oltu</description>

Modified: oltu/trunk/oauth-2.0/authzserver/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/authzserver/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/authzserver/pom.xml (original)
+++ oltu/trunk/oauth-2.0/authzserver/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Authorization Server</name>
 

Modified: oltu/trunk/oauth-2.0/client/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/pom.xml (original)
+++ oltu/trunk/oauth-2.0/client/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.client</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Client</name>
 

Modified: oltu/trunk/oauth-2.0/common/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/common/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/common/pom.xml (original)
+++ oltu/trunk/oauth-2.0/common/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.common</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Common</name>
   <description>OAuth 2.0 library - Common</description>

Modified: oltu/trunk/oauth-2.0/dynamicreg-client/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/dynamicreg-client/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/dynamicreg-client/pom.xml (original)
+++ oltu/trunk/oauth-2.0/dynamicreg-client/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.dynamicreg.client</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Dynamic Registration Client</name>
 

Modified: oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml (original)
+++ oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.dynamicreg.common</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Dynamic Registration Common</name>
 

Modified: oltu/trunk/oauth-2.0/dynamicreg-server/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/dynamicreg-server/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/dynamicreg-server/pom.xml (original)
+++ oltu/trunk/oauth-2.0/dynamicreg-server/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.dynamicreg.server</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Dynamic Registration Server</name>
 

Modified: oltu/trunk/oauth-2.0/httpclient4/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/httpclient4/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/httpclient4/pom.xml (original)
+++ oltu/trunk/oauth-2.0/httpclient4/pom.xml Mon Jul  7 09:19:13 2014
@@ -24,6 +24,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.httpclient4</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - HttpClient</name>
 

Modified: oltu/trunk/oauth-2.0/jwt/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/jwt/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/jwt/pom.xml (original)
+++ oltu/trunk/oauth-2.0/jwt/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.jwt</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - JWT</name>
   <description>OAuth 2.0 library - JWT</description>

Modified: oltu/trunk/oauth-2.0/resourceserver-filter/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/resourceserver-filter/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/resourceserver-filter/pom.xml (original)
+++ oltu/trunk/oauth-2.0/resourceserver-filter/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.resourceserver-filter</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Resource Server Filter</name>
 

Modified: oltu/trunk/oauth-2.0/resourceserver/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/resourceserver/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/resourceserver/pom.xml (original)
+++ oltu/trunk/oauth-2.0/resourceserver/pom.xml Mon Jul  7 09:19:13 2014
@@ -25,6 +25,7 @@
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OAuth 2.0 - Resource Server</name>
 

Modified: oltu/trunk/openid-connect/client/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/client/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/openid-connect/client/pom.xml (original)
+++ oltu/trunk/openid-connect/client/pom.xml Mon Jul  7 09:19:13 2014
@@ -26,6 +26,7 @@
 
   <artifactId>org.apache.oltu.openidconnect.client</artifactId>
   <version>0.0.1-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OpenId Connect - Client</name>
   <description>OpenId Connect library - Client</description>

Modified: oltu/trunk/openid-connect/common/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/common/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/openid-connect/common/pom.xml (original)
+++ oltu/trunk/openid-connect/common/pom.xml Mon Jul  7 09:19:13 2014
@@ -26,6 +26,7 @@
 
   <artifactId>org.apache.oltu.openidconnect.common</artifactId>
   <version>0.0.1-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>Apache Oltu - OpenId Connect - Common</name>
   <description>OpenId Connect library - Common</description>

Modified: oltu/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/parent/pom.xml?rev=1608385&r1=1608384&r2=1608385&view=diff
==============================================================================
--- oltu/trunk/parent/pom.xml (original)
+++ oltu/trunk/parent/pom.xml Mon Jul  7 09:19:13 2014
@@ -500,6 +500,12 @@
             <tryUpdate>true</tryUpdate>
           </configuration>
         </plugin>
+
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.3.7</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -576,24 +582,13 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
         <configuration>
-          <!--
-           | dummy entry to stop bundle plugin from picking up jar config and reporting
-           | WARNING: Duplicate name in Manifest
-           | See http://markmail.org/message/mpkl24wk3jrjhhjg
-          -->
-          <archive>
-            <forced>true</forced>
-          </archive>
-          <excludeDependencies>true</excludeDependencies>
-          <manifestLocation>${project.build.directory}/osgi</manifestLocation>
           <instructions>
             <!--
              | Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd
             -->
-            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME</_removeheaders>
-            <Bundle-Name>${project.artifactId}</Bundle-Name>
+            <_removeheaders>Include-Resource,JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME</_removeheaders>
+            <Bundle-Name>${project.name}</Bundle-Name>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Description>${project.description}</Bundle-Description>
             <Export-Package>${osgi.export}</Export-Package>
@@ -603,38 +598,12 @@
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
             <!-- Bundle-RequiredExecutionEnvironment>J2SE-${javac.target.version}</Bundle-RequiredExecutionEnvironment-->
             <Bundle-Activator>${osgi.activator}</Bundle-Activator>
+            <Implementation-Build>${implementation.build}</Implementation-Build>
+            <Implementation-Build-Date>${maven.build.timestamp}</Implementation-Build-Date>
+            <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
+            <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
           </instructions>
         </configuration>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-            <manifestEntries>
-              <Implementation-Build>${implementation.build}</Implementation-Build>
-              <Implementation-Build-Date>${maven.build.timestamp}</Implementation-Build-Date>
-              <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
-              <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
-            </manifestEntries>
-          </archive>
-        </configuration>
       </plugin>
 
       <plugin>



Mime
View raw message