Repository: jena Updated Branches: refs/heads/master 4c1fbcf0b -> 639889537
Fixing JENA-1283 by using Maven properties to control versions Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/26f6da76 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/26f6da76 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/26f6da76 Branch: refs/heads/master Commit: 26f6da7640cbe89cd6d58a3eed9ac8472dbdeab9 Parents: 4c1fbcf Author: ajs6f <[email protected]> Authored: Mon Jan 30 11:01:33 2017 -0500 Committer: ajs6f <[email protected]> Committed: Mon Jan 30 11:01:33 2017 -0500 ---------------------------------------------------------------------- .../src/main/resources/features.xml | 28 ++++++++++---------- jena-parent/pom.xml | 17 +++++++----- 2 files changed, 25 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/26f6da76/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml index f32bf43..3201fa2 100644 --- a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml +++ b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml @@ -18,24 +18,24 @@ <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";> - <feature name="jena" version="3"> - <bundle>mvn:org.apache.jena/jena-osgi/3.1.0-SNAPSHOT</bundle> - <feature version="3">jena_osgi_dependencies</feature> + <feature name="jena" version="${project.version}"> + <bundle>mvn:org.apache.jena/jena-osgi/${project.version}</bundle> + <feature version="${project.version}">jena_osgi_dependencies</feature> <!-- This is normally exposed by Apache Karaf via root classloader --> <!--<feature version="2.11.0">xerces</feature>--> </feature> - <feature name="jena_osgi_dependencies" version="3"> - <bundle>mvn:com.github.andrewoma.dexx/collection/0.6</bundle> - <bundle>mvn:com.github.jsonld-java/jsonld-java/0.8.2</bundle> - <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.7.3</bundle> - <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.7.3</bundle> - <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.7.3</bundle> - <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4</bundle> - <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle> - <bundle>mvn:org.apache.commons/commons-csv/1.2</bundle> - <bundle>mvn:org.apache.commons/commons-lang3/3.4</bundle> - <bundle>mvn:org.apache.thrift/libthrift/0.9.3</bundle> + <feature name="jena_osgi_dependencies" version="${project.version}"> + <bundle>mvn:com.github.andrewoma.dexx/collection/${ver.dexxcollection}</bundle> + <bundle>mvn:com.github.jsonld-java/jsonld-java/${ver.jsonldjava}</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${ver.jackson}</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${ver.jackson}</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${ver.jackson}</bundle> + <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${ver.httpcore-osgi}</bundle> + <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle> + <bundle>mvn:org.apache.commons/commons-csv/${ver.commonscsv}</bundle> + <bundle>mvn:org.apache.commons/commons-lang3/${ver.commonslang}</bundle> + <bundle>mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle> </feature> <feature name="xerces" version="2.11.0"> http://git-wip-us.apache.org/repos/asf/jena/blob/26f6da76/jena-parent/pom.xml ---------------------------------------------------------------------- diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml index 2c8120b..127757a 100644 --- a/jena-parent/pom.xml +++ b/jena-parent/pom.xml @@ -51,9 +51,14 @@ <ver.log4j>1.2.17</ver.log4j> <ver.junit>4.12</ver.junit> <ver.xerces>2.11.0</ver.xerces> - + <ver.libthrift>0.9.3</ver.libthrift> + <!-- the following two versions must work together, consult jsonld-java's POM for the correct Jackson version --> <ver.jsonldjava>0.9.0</ver.jsonldjava> - + <ver.jackson>2.7.4</ver.jackson> + <ver.commonslang3>3.4</ver.commonslang3> + <ver.commonscsv>1.3</ver.commonscsv> + <ver.dexxcollection>0.6</ver.dexxcollection> + <!-- These are connected because solr4j depends on httpclient as well --> <ver.httpclient>4.5.2</ver.httpclient> <ver.httpcore>4.4.4</ver.httpcore> @@ -152,7 +157,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.9.3</version> + <version>${ver.libthrift}</version> <exclusions> <!-- Use whatever version Jena is using --> <exclusion> @@ -169,13 +174,13 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>1.3</version> + <version>${ver.commonscsv}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.4</version> + <version>${ver.commonslang3}</version> </dependency> <dependency> @@ -194,7 +199,7 @@ <dependency> <groupId>com.github.andrewoma.dexx</groupId> <artifactId>collection</artifactId> - <version>0.6</version> + <version>${ver.dexxcollection}</version> </dependency> <dependency>
