Repository: jena Updated Branches: refs/heads/master f76fb8dfd -> bfb357849
Remove tabs Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bfb35784 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bfb35784 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bfb35784 Branch: refs/heads/master Commit: bfb3578495feaa6d3a3813ea20474fdd9c719724 Parents: f76fb8d Author: Andy Seaborne <[email protected]> Authored: Mon Feb 9 22:28:08 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Mon Feb 9 22:28:08 2015 +0000 ---------------------------------------------------------------------- apache-jena-osgi/jena-osgi-test/pom.xml | 278 +++++++++++++-------------- 1 file changed, 137 insertions(+), 141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/bfb35784/apache-jena-osgi/jena-osgi-test/pom.xml ---------------------------------------------------------------------- diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml index 5d46020..5f2e4d0 100644 --- a/apache-jena-osgi/jena-osgi-test/pom.xml +++ b/apache-jena-osgi/jena-osgi-test/pom.xml @@ -1,109 +1,107 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.jena</groupId> - <artifactId>jena-parent</artifactId> - <version>12-SNAPSHOT</version> - <relativePath>../jena-parent</relativePath> - </parent> - - <artifactId>jena-osgi-test</artifactId> - <version>2.13.0-SNAPSHOT</version> - <name>Apache Jena - OSGi bundle tests</name> - <description>Tests for jena-osgi as a bundle</description> - <packaging>bundle</packaging> - - <properties> - <felix.version>4.6.0</felix.version> - <pax.exam.version>4.4.0</pax.exam.version> - <pax.url.version>1.6.0</pax.url.version> - <pax.logging.version>1.8.1</pax.logging.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-osgi</artifactId> - <version>${project.version}</version> - <type>bundle</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>5.0.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-log4j2</artifactId> - <version>${pax.logging.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-api</artifactId> - <version>${pax.logging.version}</version> - </dependency> - - - - - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-native</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - <version>${pax.url.version}</version> - <scope>test</scope> - </dependency> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.jena</groupId> + <artifactId>jena-parent</artifactId> + <version>12-SNAPSHOT</version> + <relativePath>../jena-parent</relativePath> + </parent> + + <artifactId>jena-osgi-test</artifactId> + <version>2.13.0-SNAPSHOT</version> + <name>Apache Jena - OSGi bundle tests</name> + <description>Tests for jena-osgi as a bundle</description> + <packaging>bundle</packaging> + + <properties> + <felix.version>4.6.0</felix.version> + <pax.exam.version>4.4.0</pax.exam.version> + <pax.url.version>1.6.0</pax.url.version> + <pax.logging.version>1.8.1</pax.logging.version> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>jena-osgi</artifactId> + <version>${project.version}</version> + <type>bundle</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>5.0.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-log4j2</artifactId> + <version>${pax.logging.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <version>${pax.logging.version}</version> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-native</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-link-mvn</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-aether</artifactId> + <version>${pax.url.version}</version> + <scope>test</scope> + </dependency> <!-- OSGi Frameworks --> <dependency> @@ -113,45 +111,43 @@ <scope>test</scope> </dependency> <!-- NOTE: Make sure eclipse-osgi (equinox) is first --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>${felix.version}</version> - <scope>test</scope> - </dependency> - - - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <!-- <Import-Package>com.hp.hpl.jena</Import-Package> --> - <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> --> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>exam-maven-plugin</artifactId> - <version>${pax.exam.version}</version> - <executions> - <execution> - <id>generate-link-files</id> - <goals> - <goal>generate-link-files</goal> - </goals> - <phase>generate-test-resources</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>${felix.version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <!-- <Import-Package>com.hp.hpl.jena</Import-Package> --> + <!-- <Embed-Dependency>artifactId=jena-core;inline=true</Embed-Dependency> --> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>exam-maven-plugin</artifactId> + <version>${pax.exam.version}</version> + <executions> + <execution> + <id>generate-link-files</id> + <goals> + <goal>generate-link-files</goal> + </goals> + <phase>generate-test-resources</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>
