Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
This commit is contained in:
Jan Bartel
parent
9b94ab34ba
commit
b24928db81
|
|
@ -36,7 +36,7 @@
|
||||||
<Bundle-SymbolicName>${bundle-symbolic-name};singleton:=true</Bundle-SymbolicName>
|
<Bundle-SymbolicName>${bundle-symbolic-name};singleton:=true</Bundle-SymbolicName>
|
||||||
<Bundle-Name>Jetty OSGi NPN Fragment</Bundle-Name>
|
<Bundle-Name>Jetty OSGi NPN Fragment</Bundle-Name>
|
||||||
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
|
<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>
|
<Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</archive>
|
</archive>
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@
|
||||||
<felixversion>4.0.3</felixversion>
|
<felixversion>4.0.3</felixversion>
|
||||||
<injection.bundle.version>1.0</injection.bundle.version>
|
<injection.bundle.version>1.0</injection.bundle.version>
|
||||||
<runner.version>1.7.6</runner.version>
|
<runner.version>1.7.6</runner.version>
|
||||||
<npn-version>1.1.5.v20130313</npn-version>
|
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- Pax Exam Dependencies -->
|
<!-- Pax Exam Dependencies -->
|
||||||
|
|
@ -301,7 +300,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.mortbay.jetty.npn</groupId>
|
<groupId>org.mortbay.jetty.npn</groupId>
|
||||||
<artifactId>npn-boot</artifactId>
|
<artifactId>npn-boot</artifactId>
|
||||||
<version>${npn-version}</version>
|
<version>${npn.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -377,9 +376,9 @@
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- No point defining -Xbootclasspath as the actual OSGi VM is run as a forked process by pax-exam -->
|
<!-- 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 -->
|
<!-- 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>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
||||||
|
|
@ -12,120 +12,6 @@
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Jetty :: SPDY :: Parent</name>
|
<name>Jetty :: SPDY :: Parent</name>
|
||||||
<url>http://www.eclipse.org/jetty</url>
|
<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>
|
<modules>
|
||||||
<module>spdy-core</module>
|
<module>spdy-core</module>
|
||||||
|
|
|
||||||
109
pom.xml
109
pom.xml
|
|
@ -16,6 +16,7 @@
|
||||||
<build-support-version>1.1</build-support-version>
|
<build-support-version>1.1</build-support-version>
|
||||||
<slf4j-version>1.6.1</slf4j-version>
|
<slf4j-version>1.6.1</slf4j-version>
|
||||||
<jetty-test-policy-version>1.2</jetty-test-policy-version>
|
<jetty-test-policy-version>1.2</jetty-test-policy-version>
|
||||||
|
<npn.api.version>1.1.0.v20120525</npn.api.version>
|
||||||
</properties>
|
</properties>
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:http://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project.git</connection>
|
<connection>scm:git:http://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project.git</connection>
|
||||||
|
|
@ -779,6 +780,114 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</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>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue