From be2ecca5995af99bd990abb796fa70c0ac9966b8 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@intalio.com>
Date: Thu, 12 Sep 2013 10:06:01 +1000
Subject: [PATCH] Move npn profiles to parent pom so that npn.version is
 available to other modules (eg osgi)

---
 jetty-osgi/jetty-osgi-npn/pom.xml  |   2 +-
 jetty-osgi/test-jetty-osgi/pom.xml |   7 +-
 jetty-spdy/pom.xml                 | 114 -----------------------------
 pom.xml                            | 109 +++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 119 deletions(-)

diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml
index 1f62e2bca71..450ade2fa93 100644
--- a/jetty-osgi/jetty-osgi-npn/pom.xml
+++ b/jetty-osgi/jetty-osgi-npn/pom.xml
@@ -36,7 +36,7 @@
               <Bundle-SymbolicName>${bundle-symbolic-name};singleton:=true</Bundle-SymbolicName>
               <Bundle-Name>Jetty OSGi NPN Fragment</Bundle-Name>
               <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-              <Export-Package>org.eclipse.jetty.npn;version="1.1.5"</Export-Package>
+              <Export-Package>org.eclipse.jetty.npn</Export-Package>
               <Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
             </manifestEntries>
           </archive>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 03af2c19d20..2ad2b44bfaf 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -20,7 +20,6 @@
     <felixversion>4.0.3</felixversion>
     <injection.bundle.version>1.0</injection.bundle.version>
     <runner.version>1.7.6</runner.version>
-    <npn-version>1.1.5.v20130313</npn-version>
   </properties>
   <dependencies>
     <!-- Pax Exam Dependencies -->
@@ -289,7 +288,7 @@
     <dependency>
       <groupId>org.mortbay.jetty.npn</groupId>
       <artifactId>npn-boot</artifactId>
-      <version>${npn-version}</version>
+      <version>${npn.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -360,9 +359,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <!-- No point defining -Xbootclasspath as the actual OSGi VM is run as a forked process by pax-exam -->
-          <!--argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn-version}/npn-boot-${npn-version}.jar</argLine-->
+          <!--argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${npn.version}.jar</argLine-->
           <!-- But we do pass the sys property of the npn-boot jar -->
-          <argLine>-Dmortbay-npn-boot=${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn-version}/npn-boot-${npn-version}.jar</argLine>
+          <argLine>-Dmortbay-npn-boot=${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${npn.version}.jar</argLine>
         </configuration>
       </plugin>
       <plugin>
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index b944d871347..e9bd0436a6b 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -12,120 +12,6 @@
     <packaging>pom</packaging>
     <name>Jetty :: SPDY :: Parent</name>
     <url>http://www.eclipse.org/jetty</url>
-    <properties>
-        <npn.api.version>1.1.0.v20120525</npn.api.version>
-    </properties>
-
-    <profiles>
-        <profile>
-            <id>7u9</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_9</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.3.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>7u10</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_10</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.3.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>7u11</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_11</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.3.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>7u13</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_13</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.4.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>7u15</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_15</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.5.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>7u17</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_17</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.5.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>7u21</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_21</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.5.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-           <id>7u25</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_25</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.5.v20130313</npn.version>
-            </properties>
-        </profile>
-        <profile>
-           <id>7u40</id>
-            <activation>
-                <property>
-                    <name>java.version</name>
-                    <value>1.7.0_40</value>
-                </property>
-            </activation>
-            <properties>
-                <npn.version>1.1.6.v20130911</npn.version>
-            </properties>
-        </profile>
-    </profiles>
 
     <modules>
         <module>spdy-core</module>
diff --git a/pom.xml b/pom.xml
index d89dea31026..b59c7d599ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
     <build-support-version>1.1</build-support-version>
     <slf4j-version>1.6.1</slf4j-version>
     <jetty-test-policy-version>1.2</jetty-test-policy-version>
+    <npn.api.version>1.1.0.v20120525</npn.api.version>
   </properties>
   <scm>
     <connection>scm:git:http://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project.git</connection>
@@ -740,6 +741,114 @@
         </plugins>
       </build>
     </profile>
+ <profile>
+            <id>7u9</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_9</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.3.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>7u10</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_10</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.3.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>7u11</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_11</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.3.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>7u13</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_13</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.4.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>7u15</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_15</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.5.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>7u17</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_17</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.5.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>7u21</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_21</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.5.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+           <id>7u25</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_25</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.5.v20130313</npn.version>
+            </properties>
+        </profile>
+        <profile>
+           <id>7u40</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_40</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.6.v20130911</npn.version>
+            </properties>
+        </profile>
   </profiles>
 </project>