Skip to content

Commit

Permalink
Merge branch 'release/ODN_v1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Marcek committed Mar 16, 2016
2 parents 3f0b6e6 + e8de0f0 commit 29362f0
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 265 deletions.
298 changes: 133 additions & 165 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,35 @@
<groupId>sk.eea.edem</groupId>
<artifactId>odn-cas-overlay</artifactId>
<packaging>war</packaging>
<version>1.1.0</version>
<version>1.1.1</version>

<properties>
<debian-package-version>1.1.0~</debian-package-version>
<debian-package-name>${project.build.directory}/${project.artifactId}-${debian-package-version}_all.deb</debian-package-name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<cas.version>4.1.0</cas.version>
</properties>

<build>
<plugins>

<plugin>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
<version>1.0-m4.3</version>
<configuration>
<flowInitContext>
<!-- masterBranchName>frankenstein</masterBranchName>
<developBranchName>development</developBranchName>
<featureBranchPrefix>feature-</featureBranchPrefix -->
<releaseBranchPrefix>ODN_v</releaseBranchPrefix>
<!-- hotfixBranchPrefix>hotfix-</hotfixBranchPrefix -->
<versionTagPrefix>ODN_v</versionTagPrefix>
</flowInitContext>
<allowSnapshots>true</allowSnapshots>
<noDeploy>true</noDeploy>
<!-- see goals wiki page for configuration options -->
</configuration>
</plugin>
<plugin>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
<version>1.0-m4.3</version>
<configuration>
<flowInitContext>
<releaseBranchPrefix>ODN_v</releaseBranchPrefix>
<versionTagPrefix>ODN_v</versionTagPrefix>
</flowInitContext>
<allowSnapshots>true</allowSnapshots>
<noDeploy>true</noDeploy>
<!-- see goals wiki page for configuration options -->
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -38,119 +44,113 @@
<overlay>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-webapp</artifactId>
<excludes>
<exclude>WEB-INF/cas.properties</exclude>
</excludes>
<excludes>
<exclude>WEB-INF/cas.properties</exclude>
<exclude>WEB-INF/classes/services/HTTPSandIMAPS-10000001.json</exclude>
</excludes>
</overlay>
</overlays>
</configuration>
</plugin>
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>1.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<dataSet>
<data>
<src>${basedir}/src/deb/etc/</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/etc</prefix>
</mapper>
</data>
<data>
<src>${basedir}/src/deb/usr/share/odn-cas</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/usr/share/odn-cas</prefix>
</mapper>
</data>
<data>
<type>template</type>
<paths>
<path>/var/cache/odn-cas/</path>
<path>/var/log/odn-cas/</path>
<path>/var/tmp/odn-cas</path>
<path>/etc/odn-cas/ssl/certs</path>
<path>/etc/odn-cas/ssl/private</path>
</paths>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/share/odn-cas/logs</linkName>
<linkTarget>/var/log/odn-cas</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/local/share/ca-certificates/odn-cert.crt</linkName>
<linkTarget>/etc/odn-cas/ssl/certs/odn-cert.pem</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/share/odn-cas/work</linkName>
<linkTarget>/var/cache/odn-cas/</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/share/odn-cas/temp</linkName>
<linkTarget>/var/tmp/odn-cas</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<src>${project.build.directory}/cas</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/usr/share/odn-cas/webapps/cas</prefix>
</mapper>
</data>
<data>
<src>${project.basedir}/src/slapd/data</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/usr/share/odn-simple/ldap</prefix>
</mapper>
</data>
<data>
<src>${project.basedir}/src/slapd/conf</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/etc/odn-simple/ldap</prefix>
</mapper>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>1.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<deb>${debian-package-name}</deb>
<dataSet>
<data>
<src>${basedir}/src/deb/etc/</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/etc</prefix>
</mapper>
</data>
<data>
<src>${basedir}/src/deb/usr/share/odn-cas</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/usr/share/odn-cas</prefix>
</mapper>
</data>
<data>
<type>template</type>
<paths>
<path>/var/cache/odn-cas/</path>
<path>/var/log/odn-cas/</path>
<path>/var/tmp/odn-cas</path>
<path>/etc/odn-cas/ssl/certs</path>
<path>/etc/odn-cas/ssl/private</path>
</paths>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/share/odn-cas/logs</linkName>
<linkTarget>/var/log/odn-cas</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/local/share/ca-certificates/odn-cert.crt</linkName>
<linkTarget>/etc/odn-cas/ssl/certs/odn-cert.pem</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/share/odn-cas/work</linkName>
<linkTarget>/var/cache/odn-cas/</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<type>link</type>
<linkName>/usr/share/odn-cas/temp</linkName>
<linkTarget>/var/tmp/odn-cas</linkTarget>
<symlink>true</symlink>
<mapper>
<type>perm</type>
</mapper>
</data>
<data>
<src>${project.build.directory}/cas</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/usr/share/odn-cas/webapps/cas</prefix>
</mapper>
</data>
<data>
<src>${project.basedir}/src/slapd/data</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/usr/share/odn-simple/ldap</prefix>
</mapper>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -170,46 +170,14 @@
<type>war</type>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-support-ldap</artifactId>
<version>${cas.version}</version>
</dependency>

<!--<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-support-pac4j</artifactId>
<version>${cas.version}</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-support-saml</artifactId>
<version>${cas.version}</version>
</dependency>
<dependency>
<groupId>org.pac4j</groupId>
<artifactId>pac4j-saml</artifactId>
<version>1.6.0</version>
</dependency>

<dependency>
<groupId>org.pac4j</groupId>
<artifactId>pac4j-core</artifactId>
<version>1.6.0</version>
<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-support-ldap</artifactId>
<version>${cas.version}</version>
</dependency>
-->
</dependencies>

<properties>
<cas.version>4.1.0-SNAPSHOT</cas.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</dependencies>

<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion src/deb/control/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Architecture: all
Maintainer: jan.marcek@eea.sk
Homepage: https://www.apereo.org/
Depends: slapd, ldap-utils, libnet-ldap-perl, libauthen-sasl-perl, openjdk-7-jre-headless, tomcat7
Description: CAS for Open Data Network
Description: Open Data Node - Apereo CAS
Loading

0 comments on commit 29362f0

Please sign in to comment.