Skip to content

Commit

Permalink
#141: Create a publication application in Java based on the existing …
Browse files Browse the repository at this point in the history
…Velocity application

* Moved the publication application on the root of the code hierarchy, in view of having it moved out as an independent extension
* Also changed its version to 1.0-SNAPSHOT
* Moved the scheduler job, that is specific to wikidemarches, to the wikidemat wiki build instead if the generic publication application
* Removed the old publication application from the build of the wikidemat, as it's not used anymore
** Left the code in the repo, but the code should be removed as well, as it was replaced by the new application
  • Loading branch information
lucaa committed Jul 13, 2018
1 parent 8071e81 commit 2e79e2f
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.xwiki.contrib</groupId>
<artifactId>application-publication</artifactId>
<version>1.0</version>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>application-publication-api</artifactId>
<name>Publication Application API</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,21 @@
<artifactId>application-publication</artifactId>
<name>Publication Application parent POM</name>
<packaging>pom</packaging>
<version>1.0</version>
<version>1.0-SNAPSHOT</version>
<developers>
<developer>
<id>slauriere</id>
<name>Stéphane Laurière</name>
</developer>
<developer>
<id>lucaa</id>
<name>Anca Luca</name>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/xwiki-contrib/application-publication.git</connection>
<developerConnection>scm:git:[email protected]:xwiki-contrib/application-publication.git</developerConnection>
<url>https://github.com/xwiki-contrib/application-publication.git</url>
<tag>HEAD</tag>
<connection>scm:git:git://github.com/DISIC/wikidemarches.git</connection>
<developerConnection>scm:git:[email protected]:DISIC/wikidemarches.git</developerConnection>
<url>https://github.com/DISIC/wikidemarches/tree/master</url>
</scm>
<distributionManagement>
<repository>
Expand All @@ -53,6 +56,5 @@
</distributionManagement>
<modules>
<module>application-publication-api</module>
<module>application-publication-ui</module>
</modules>
</project>

This file was deleted.

1 change: 0 additions & 1 deletion applications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<modules>
<module>demarches</module>
<module>publication</module>
<module>application-publication</module>
</modules>
<build>
<extensions>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@
<modules>
<module>applications</module>
<module>wikis</module>
<module>application-publication</module>
</modules>
</project>
8 changes: 3 additions & 5 deletions wikis/wikidemat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.xwiki.projects.dinsic.wikidemarches</groupId>
<artifactId>xwiki-dinsic-wikidemarches-applications-publication</artifactId>
<version>${project.version}</version>
<type>xar</type>
<scope>provided</scope>
<groupId>org.xwiki.contrib</groupId>
<artifactId>application-publication-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down

0 comments on commit 2e79e2f

Please sign in to comment.