Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.2.x' 

Conflicts:
	jetty-osgi/jetty-osgi-alpn/pom.xml
	pom.xml
This commit is contained in:
Greg Wilkins 2015-05-22 21:06:03 +10:00
parent 4028df12ca 43780f6c78
commit cc40282a7d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetty-osgi/jetty-osgi-alpn/pom.xml
View File

@ -13,6 +13,22 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>parse-version</id>
<goals>
<goal>parse-version</goal>
</goals>
<configuration>
<versionString>${alpn.api.version}</versionString>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

2
pom.xml
View File

@ -16,7 +16,7 @@
<build-support-version>1.1</build-support-version>
<slf4j-version>1.6.6</slf4j-version>
<jetty-test-policy-version>1.2</jetty-test-policy-version>
<alpn.api.version>1.1.1.v20150508</alpn.api.version>
<alpn.api.version>1.1.2.v20150522</alpn.api.version>
<jsp.version>8.0.20.M0</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version>