Conflicts: view/pom.xml view/src/main/java/se/su/dsv/scipro/activityplan/panels/ActivityPlanPanel.html view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaDetailsCrudPanel.java view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.html view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.java view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.html view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.java view/src/main/java/se/su/dsv/scipro/admin/panels/AdminRolesPanel.html view/src/main/java/se/su/dsv/scipro/basepages/BasePage.html view/src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.html view/src/main/java/se/su/dsv/scipro/components/StylableDateTimeField.html view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.html view/src/main/java/se/su/dsv/scipro/landingpages/NewIdeaLandingPage.java view/src/main/java/se/su/dsv/scipro/project/pages/ProjectOppositionPage.html view/src/main/java/se/su/dsv/scipro/project/panels/ProjectMyIdeasPanel.java view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewAllSupervisorIdeasPanel.java view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewIdeaSubmissionPanel.html view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewIdeaSubmissionPanel.java view/src/main/java/se/su/dsv/scipro/repository/pages/RepositoryDownloadPage.java view/src/main/java/se/su/dsv/scipro/reusable/AbstractRoleAutoCompleteComponent.java view/src/main/java/se/su/dsv/scipro/security/auth/ExternalAuthenticationRequestHelper.java view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarThesisPanel.java view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAllSupervisorIdeasPanel.java view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewAllStudentIdeasPanel.java view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewEditIdeaPanel.html view/src/test/java/se/su/dsv/scipro/panels/ChecklistAnswerCommentPanelTest.java view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java
91 lines
2.8 KiB
XML
91 lines
2.8 KiB
XML
<?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>
|
|
|
|
<parent>
|
|
<groupId>se.su.dsv.scipro</groupId>
|
|
<artifactId>SciPro</artifactId>
|
|
<version>0.1-SNAPSHOT</version>
|
|
</parent>
|
|
|
|
<artifactId>fitnesse</artifactId>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>se.su.dsv.scipro</groupId>
|
|
<artifactId>core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>se.su.dsv.scipro</groupId>
|
|
<artifactId>core</artifactId>
|
|
<type>test-jar</type>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.wicket</groupId>
|
|
<artifactId>wicket-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.fitnesse</groupId>
|
|
<artifactId>fitnesse</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>servlet-api</artifactId>
|
|
<scope>provided</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
<resources>
|
|
<resource>
|
|
<filtering>true</filtering>
|
|
<directory>src/main/resources</directory>
|
|
<includes>
|
|
<include>**</include>
|
|
</includes>
|
|
<excludes>
|
|
<exclude>**/*.java</exclude>
|
|
</excludes>
|
|
</resource>
|
|
<resource>
|
|
<directory>src/main/java</directory>
|
|
<includes>
|
|
<include>**</include>
|
|
</includes>
|
|
<excludes>
|
|
<exclude>**/*.java</exclude>
|
|
</excludes>
|
|
</resource>
|
|
</resources>
|
|
<testResources>
|
|
<testResource>
|
|
<directory>src/test/java</directory>
|
|
<includes>
|
|
<include>**</include>
|
|
</includes>
|
|
<excludes>
|
|
<exclude>**/*.java</exclude>
|
|
</excludes>
|
|
</testResource>
|
|
<testResource>
|
|
<filtering>true</filtering>
|
|
<directory>src/test/resources</directory>
|
|
<includes>
|
|
<include>**</include>
|
|
</includes>
|
|
<excludes>
|
|
<exclude>**/*.java</exclude>
|
|
</excludes>
|
|
</testResource>
|
|
</testResources>
|
|
|
|
<plugins>
|
|
|
|
</plugins>
|
|
</build>
|
|
</project> |