UP-3881: Maven goal (data-import) on project Announcements fails for …

…Windows; bumping Announcements to 2.0.0
vertein · Nov 13, 2013 · 1d60d52 · 1d60d52
1 parent 220255e
commit 1d60d52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -104,7 +104,7 @@
         <filters.file>filters/${env}.properties</filters.file>
 
         <!-- WAR Dependency Version Properties -->
-        <AnnouncementsPortlet.version>2.0.0-M3</AnnouncementsPortlet.version>
+        <AnnouncementsPortlet.version>2.0.0</AnnouncementsPortlet.version>
         <BookmarksPortlet.version>1.0.11</BookmarksPortlet.version>
         <CalendarPortlet.version>2.1.3-M1</CalendarPortlet.version>
         <cas-server.version>3.5.1</cas-server.version>

diff --git a/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml b/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml
@@ -141,16 +141,15 @@
                                 <java failonerror="true" classname="org.jasig.portlet.announcements.Importer">
                                     <sysproperty key="log4j.configuration" value="command-line.log4j.properties" />
                                     <classpath>
-                                        <pathelement path="${project.build.directory}/${project.artifactId}/WEB-INF/classes" />
+                                        <pathelement location="${project.build.directory}/${project.artifactId}/WEB-INF/context" />
                                         <pathelement path="${runtime_classpath}" />
                                         <pathelement path="${plugin_classpath}" />
                                         <pathelement location="${servlet.jar}" />
                                         <pathelement location="${portlet.jar}" />
-                                        <pathelement path="${project.build.directory}/${project.artifactId}/classes" />  <!-- Should be in runtime classpath -->
                                     </classpath>
 
                                     <arg value="${dir}" />
-                                    <arg value="${project.build.directory}/${project.artifactId}/WEB-INF/context/importExportContext.xml" />
+                                    <arg value="importExportContext.xml" />
                                 </java>
                             </tasks>
                         </configuration>
@@ -179,14 +178,15 @@
                                 <java failonerror="true" fork="true" classname="org.jasig.portlet.announcements.Exporter">
                                     <sysproperty key="log4j.configuration" value="command-line.log4j.properties" />
                                     <classpath>
+                                        <pathelement location="${project.build.directory}/${project.artifactId}/WEB-INF/context" />
                                         <pathelement path="${runtime_classpath}" />
                                         <pathelement path="${plugin_classpath}" />
                                         <pathelement location="${servlet.jar}" />
                                         <pathelement location="${portlet.jar}" />
-                                        <pathelement path="${project.build.directory}/${project.artifactId}/WEB-INF/classes" />
                                     </classpath>
+
                                     <arg value="${dir}" />
-                                    <arg value="${project.build.directory}/${project.artifactId}/WEB-INF/context/importExportContext.xml" />
+                                    <arg value="importExportContext.xml" />
                                 </java>
                             </tasks>
                         </configuration>