# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1427013291 -3600
# Node ID fdd7f8e3c9e477048a1028ea3b6d90b61e69dc36
# Parent  ca97def889117e2e894ac7329034059368d34130
Making sure we generate proper javadoc

diff -r ca97def88911 -r fdd7f8e3c9e4 spring.lookup/manifest.mf
--- a/spring.lookup/manifest.mf	Thu Jun 07 20:34:55 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.netbeans.modules.spring.lookup
-OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spring/lookup/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
-
diff -r ca97def88911 -r fdd7f8e3c9e4 spring.lookup/pom.xml
--- a/spring.lookup/pom.xml	Thu Jun 07 20:34:55 2012 +0200
+++ b/spring.lookup/pom.xml	Sun Mar 22 09:34:51 2015 +0100
@@ -1,54 +1,33 @@
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apidesign</groupId>
-  <artifactId>spring-lookup</artifactId>
-  <packaging>jar</packaging>
-  <version>1.2</version>
-  <parent>
-      <groupId>org.apidesign</groupId>
-      <artifactId>all-lookup</artifactId>
-      <relativePath>..</relativePath>
-      <version>2.0</version>
-  </parent>
-  <name>Bridge between Spring and Lookup</name>
-  <url>http://wiki.apidesign.org/wiki/LookupAndSpring</url>
-  <ciManagement>
-      <system>hudson</system>
-      <url>http://hudson.apidesign.org/hudson/job/lookup</url>
-  </ciManagement>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <groupId>org.apidesign</groupId>
+    <artifactId>spring-lookup</artifactId>
+    <packaging>jar</packaging>
+    <version>1.2</version>
+    <parent>
+        <groupId>org.apidesign</groupId>
+        <artifactId>all-lookup</artifactId>
+        <version>2.0</version>
+    </parent>    
+    <name>Bridge between Spring and Lookup</name>
+    <url>http://wiki.apidesign.org/wiki/LookupAndSpring</url>
+    <ciManagement>
+        <system>hudson</system>
+        <url>http://hudson.apidesign.org/hudson/job/lookup</url>
+    </ciManagement>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
-                <configuration>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.10.1</version>
                 <configuration>
                     <detectLinks>true</detectLinks>
                     <links>
-                        <link>http://bits.netbeans.org/6.8/javadoc/org-openide-util/</link>
+                        <link>http://bits.netbeans.org/8.0/javadoc/org-openide-util-lookup/</link>
                         <link>http://static.springsource.org/spring/docs/2.5.6/api/</link>
                     </links>
-                    <excludePackageNames>org.netbeans.modules.spring.lookup</excludePackageNames>
                 </configuration>
             </plugin>
         </plugins>
@@ -56,9 +35,8 @@
     <dependencies>
         <dependency>
             <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-nbjunit</artifactId>
-            <version>RELEASE68</version>
-            <scope>test</scope>
+            <artifactId>org-openide-util-lookup</artifactId>
+            <version>RELEASE80</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.modules</groupId>
@@ -68,26 +46,26 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
+            <artifactId>spring-context</artifactId>
             <version>2.5.6</version>
+            <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>2.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>2.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util</artifactId>
-            <version>RELEASE68</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+            <type>jar</type>
         </dependency>
     </dependencies>
-    <description>Provides mapping between Lookup library,
-so it is directly usable with Spring Framework's
-dependency injection.</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+    <description>
+        Provides mapping between Lookup library,
+        so it is directly usable with Spring Framework's
+        dependency injection.
+    </description>    
 </project>
diff -r ca97def88911 -r fdd7f8e3c9e4 spring.lookup/src/main/java/org/apidesign/spring/package.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/spring.lookup/src/main/java/org/apidesign/spring/package.html	Sun Mar 22 09:34:51 2015 +0100
@@ -0,0 +1,50 @@
+<!--
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head>
+  <body>
+    Convert <b>Lookup</b> to <b>ApplicationContext</b> and back!
+  </body>
+</html>
diff -r ca97def88911 -r fdd7f8e3c9e4 spring.lookup/src/main/javadoc/org/apidesign/spring/package.html
--- a/spring.lookup/src/main/javadoc/org/apidesign/spring/package.html	Thu Jun 07 20:34:55 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<!--
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  </head>
-  <body>
-    Convert <b>Lookup</b> to <b>ApplicationContext</b> and back!
-  </body>
-</html>