Author: fchrist
Date: Tue Apr 17 18:09:27 2012
New Revision: 1327207
URL: http://svn.apache.org/viewvc?rev=1327207&view=rev
Log:
STANBOL-585 STANBOL-586 merged changes in #1326937 for removing JAWS to
0.9.0-incubating branch
Added:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/resources/
- copied from r1326937,
incubator/stanbol/trunk/contenthub/search/related/src/main/resources/
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/resources/local-maven-repository/
- copied from r1326937,
incubator/stanbol/trunk/contenthub/search/related/src/main/resources/local-maven-repository/
Removed:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/appended-resources/
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/license/THIRD-PARTY.properties
Propchange:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/
------------------------------------------------------------------------------
Merged /incubator/stanbol/trunk/contenthub/search/related:r1326937
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml?rev=1327207&r1=1327206&r2=1327207&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
Tue Apr 17 18:09:27 2012
@@ -81,17 +81,4 @@ Finds related keywords from various type
<artifactId>arq</artifactId>
</dependency>
</dependencies>
-
- <repositories>
- <repository>
- <releases>
- <updatePolicy>always</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- <id>local-wordnet-repo</id>
-
<url>file://localhost/${project.basedir}/src/main/resources/local-maven-repository</url>
- </repository>
- </repositories>
</project>
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/license/THIRD-PARTY.properties?rev=1327207&r1=1327206&r2=1327207&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/license/THIRD-PARTY.properties
Tue Apr 17 18:09:27 2012
@@ -14,12 +14,12 @@
# - ICU License
# - MIT License
# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Mar 15 13:34:33 CET 2012
-edu.smu.tspell--jaws--1.2=JAWS License
+#Tue Apr 17 08:38:23 EEST 2012
javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
