Author: andy
Date: Fri Jun 7 13:32:08 2013
New Revision: 1490639
URL: http://svn.apache.org/r1490639
Log:
Clean up as part of intergation into Jena trunk.
Removed:
jena/trunk/jena-text/assembly-text-fuseki.xml
jena/trunk/jena-text/data.ttl
jena/trunk/jena-text/fuseki-text-config.ttl
jena/trunk/jena-text/larq2-score.patch
jena/trunk/jena-text/log4j.properties
jena/trunk/jena-text/src/main/java/org/apache/jena/dsg2/
Modified:
jena/trunk/jena-text/pom.xml
Modified: jena/trunk/jena-text/pom.xml
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-text/pom.xml?rev=1490639&r1=1490638&r2=1490639&view=diff
==============================================================================
--- jena/trunk/jena-text/pom.xml (original)
+++ jena/trunk/jena-text/pom.xml Fri Jun 7 13:32:08 2013
@@ -17,28 +17,15 @@
<artifactId>jena-text</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - SPARQL and Lucene/Solr</name>
- <version>0.0.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-parent</artifactId>
<version>7-SNAPSHOT</version>
- <!--<relativePath>../jena-parent</relativePath>-->
- <relativePath></relativePath>
+ <relativePath>../jena-parent</relativePath>
</parent>
- <!-- While not a truck module, need to find parent as a SNAPSHOT -->
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<properties>
<ver.jena>2.10.2-SNAPSHOT</ver.jena>
<ver.lucene>4.2.1</ver.lucene>
@@ -97,8 +84,8 @@
</dependency>
<!-- Solr client -->
- <!-- Exclusion of slf4: Necessary otherwise maven complians about a
"Dependency
- convergence error" of slf4j-api 1.6.1 (from zookeeper) vs 1.6.4 (Jena)
Possibily
+ <!-- Exclusion of slf4: Necessary otherwise maven complains about a
"Dependency
+ convergence error" of slf4j-api 1.6.1 (from zookeeper) vs 1.6.4 (Jena)
possibly
due to the use of scope-test -->
<dependency>
@@ -146,21 +133,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${ver.junit}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Fuseki -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki</artifactId>
- <version>0.2.8-SNAPSHOT</version>
- <!--<scope>runtime</scope> -->
- </dependency>
-
</dependencies>
<build>
@@ -251,47 +223,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>fuseki-server</shadedClassifierName>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.jena.fuseki.FusekiCmd</mainClass>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
- </transformers>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <!-- Some jars are signed but shading breaks that.
- Don't include signing files.
- -->
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>