Skip to content

Commit a7e4f27

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.0.0' into 'master'
2 parents ada1b62 + a252808 commit a7e4f27

File tree

12 files changed

+493
-18
lines changed

12 files changed

+493
-18
lines changed

‎.travis.maven-settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#%L
44
wcm.io
55
%%
6-
Copyright (C) 2014 wcm.io
6+
Copyright (C) 2015 wcm.io
77
%%
88
Licensed under the Apache License, Version 2.0 (the "License");
99
you may not use this file except in compliance with the License.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# #%L
22
# wcm.io
33
# %%
4-
# Copyright (C) 2014 wcm.io
4+
# Copyright (C) 2015 wcm.io
55
# %%
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<img src="http://wcm.io/images/[email protected]"/> wcm.io DevOps CONGA Tooling
1+
<img src="http://wcm.io/images/[email protected]"/> wcm.io DevOps Tooling
22
======
33
[![Build Status](https://travis-ci.org/wcm-io-devops/devops-tooling.png?branch=develop)](https://travis-ci.org/wcm-io-devops/devops-tooling)
44

‎parent_toplevel/changes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26-
<release version="1.0.0" date="not released">
26+
<release version="1.0.0" date="2015-07-21">
2727
<action type="update" dev="sseifert">
2828
Initial release.
2929
</action>

‎parent_toplevel/pom.xml‎

Lines changed: 131 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@
3131

3232
<groupId>io.wcm.devops</groupId>
3333
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
34-
<version>1.0.0-SNAPSHOT</version>
34+
<version>1.0.0</version>
3535
<packaging>pom</packaging>
3636

3737
<name>Toplevel Parent</name>
3838
<description>Toplevel POM for all wcm.io DevOps Maven projects.</description>
39+
<url>${site.url}/${site.url.module.prefix}/</url>
3940

4041
<scm>
4142
<connection>scm:git:https://github.com/wcm-io-devops/devops-tooling.git</connection>
@@ -75,6 +76,80 @@
7576
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
7677
</license>
7778
</licenses>
79+
80+
<properties>
81+
82+
<!-- compiler settings -->
83+
<build.compiler.source>1.8</build.compiler.source>
84+
<build.compiler.target>1.8</build.compiler.target>
85+
86+
<!-- site settings -->
87+
<site.url.module.prefix>tooling/parent_toplevel</site.url.module.prefix>
88+
<site.url>http://devops.wcm.io</site.url>
89+
<site.deploy.id>ssh-wcm.io</site.deploy.id>
90+
<site.deploy.url>scp://[email protected]:222/var/www/devops.wcm.io/www/</site.deploy.url>
91+
92+
</properties>
93+
94+
<dependencies>
95+
96+
<!-- Testing -->
97+
<dependency>
98+
<groupId>junit</groupId>
99+
<artifactId>junit</artifactId>
100+
<scope>test</scope>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.mockito</groupId>
104+
<artifactId>mockito-core</artifactId>
105+
<scope>test</scope>
106+
</dependency>
107+
108+
</dependencies>
109+
<dependencyManagement>
110+
<dependencies>
111+
112+
<!-- Logging -->
113+
<dependency>
114+
<groupId>org.slf4j</groupId>
115+
<artifactId>slf4j-api</artifactId>
116+
<version>1.7.12</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.slf4j</groupId>
120+
<artifactId>slf4j-log4j12</artifactId>
121+
<version>1.7.12</version>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.slf4j</groupId>
125+
<artifactId>slf4j-simple</artifactId>
126+
<version>1.7.12</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>log4j</groupId>
130+
<artifactId>log4j</artifactId>
131+
<version>1.2.17</version>
132+
</dependency>
133+
134+
<!-- Testing -->
135+
<dependency>
136+
<groupId>junit</groupId>
137+
<artifactId>junit</artifactId>
138+
<version>4.12</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.mockito</groupId>
142+
<artifactId>mockito-core</artifactId>
143+
<version>2.0.13-beta</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.hamcrest</groupId>
147+
<artifactId>hamcrest-core</artifactId>
148+
<version>1.3</version>
149+
</dependency>
150+
151+
</dependencies>
152+
</dependencyManagement>
78153

79154
<build>
80155
<plugins>
@@ -93,6 +168,53 @@
93168
</executions>
94169
</plugin>
95170

171+
<!-- GitFlow settings only for this POM -->
172+
<plugin>
173+
<groupId>external.atlassian.jgitflow</groupId>
174+
<artifactId>jgitflow-maven-plugin</artifactId>
175+
<inherited>false</inherited>
176+
<configuration>
177+
<!-- Prefix release numbers with artifactId for GIT repo with more than one released artifact -->
178+
<flowInitContext>
179+
<releaseBranchPrefix>release/${project.artifactId}-</releaseBranchPrefix>
180+
<hotfixBranchPrefix>hotfix/${project.artifactId}-</hotfixBranchPrefix>
181+
<versionTagPrefix>${project.artifactId}-</versionTagPrefix>
182+
</flowInitContext>
183+
</configuration>
184+
</plugin>
185+
186+
<!-- site configuration -->
187+
<plugin>
188+
<groupId>org.apache.maven.plugins</groupId>
189+
<artifactId>maven-site-plugin</artifactId>
190+
<dependencies>
191+
<dependency>
192+
<groupId>lt.velykis.maven.skins</groupId>
193+
<artifactId>reflow-velocity-tools</artifactId>
194+
<version>1.1.1</version>
195+
</dependency>
196+
<!-- Reflow skin requires Velocity >= 1.7 -->
197+
<dependency>
198+
<groupId>org.apache.velocity</groupId>
199+
<artifactId>velocity</artifactId>
200+
<version>1.7</version>
201+
</dependency>
202+
</dependencies>
203+
<configuration>
204+
<generateReports>true</generateReports>
205+
<inputEncoding>UTF-8</inputEncoding>
206+
<outputEncoding>UTF-8</outputEncoding>
207+
</configuration>
208+
<executions>
209+
<execution>
210+
<id>attach-descriptor</id>
211+
<goals>
212+
<goal>attach-descriptor</goal>
213+
</goals>
214+
</execution>
215+
</executions>
216+
</plugin>
217+
96218
</plugins>
97219

98220
<pluginManagement>
@@ -120,19 +242,6 @@
120242
</configuration>
121243
</plugin>
122244

123-
<plugin>
124-
<groupId>external.atlassian.jgitflow</groupId>
125-
<artifactId>jgitflow-maven-plugin</artifactId>
126-
<configuration>
127-
<!-- Prefix release numbers with artifactId for GIT repo with more than one released artifact -->
128-
<flowInitContext>
129-
<releaseBranchPrefix>release/${project.artifactId}-</releaseBranchPrefix>
130-
<hotfixBranchPrefix>hotfix/${project.artifactId}-</hotfixBranchPrefix>
131-
<versionTagPrefix>${project.artifactId}-</versionTagPrefix>
132-
</flowInitContext>
133-
</configuration>
134-
</plugin>
135-
136245
</plugins>
137246

138247
</pluginManagement>
@@ -206,4 +315,12 @@
206315
</profile>
207316
</profiles>
208317

318+
<distributionManagement>
319+
<site>
320+
<id>${site.deploy.id}</id>
321+
<name>Maven Site Deployment</name>
322+
<url>${site.deploy.url}${site.url.module.prefix}</url>
323+
</site>
324+
</distributionManagement>
325+
209326
</project>

‎parent_toplevel/src/site/site.xml‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
#%L
4+
wcm.io
5+
%%
6+
Copyright (C) 2015 wcm.io
7+
%%
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing, software
15+
distributed under the License is distributed on an "AS IS" BASIS,
16+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
See the License for the specific language governing permissions and
18+
limitations under the License.
19+
#L%
20+
-->
21+
22+
<project name="devops.wcm.io"
23+
xmlns="http://maven.apache.org/DECORATION/1.3.0"
24+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
25+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
26+
27+
<bannerLeft>
28+
<name><![CDATA[<img src="http://wcm.io/images/[email protected]"/> wcm.io DevOps]]></name>
29+
<href>http://devops.wcm.io</href>
30+
</bannerLeft>
31+
32+
<publishDate position="bottom" format="yyyy-MM-dd" />
33+
<version position="bottom" />
34+
35+
<skin>
36+
<groupId>io.wcm.maven.skins</groupId>
37+
<artifactId>reflow-maven-skin</artifactId>
38+
<version>1.0.2</version>
39+
</skin>
40+
<custom>
41+
<reflowSkin>
42+
<!-- Make this to 'false' for local development, i.e. file:// URLs -->
43+
<protocolRelativeURLs>false</protocolRelativeURLs>
44+
<smoothScroll>true</smoothScroll>
45+
<theme>default</theme>
46+
<highlightJs>true</highlightJs>
47+
<highlightJsTheme>github</highlightJsTheme>
48+
<absoluteResourceURL>http://devops.wcm.io</absoluteResourceURL>
49+
<skinAttribution>false</skinAttribution>
50+
<brand>
51+
<!-- Brand text in top-left part of the site -->
52+
<name>wcm.io DevOps</name>
53+
<href>http://devops.wcm.io</href>
54+
</brand>
55+
<slogan>Tools for Configuration Management and Deployment</slogan>
56+
<titleTemplate>%2$s | %1$s</titleTemplate>
57+
<!-- Use Table of Contents as sidebar -->
58+
<toc>sidebar</toc>
59+
<!-- Include the documentation and tools in the top navigation (in addition to links) -->
60+
<topNav>Categories|Contribute</topNav>
61+
<!-- Split menus in the bottom navigation -->
62+
<bottomNav maxSpan="9" >
63+
<column>Main</column>
64+
<column>Categories</column>
65+
<column>Contribute</column>
66+
<column>reports</column>
67+
</bottomNav>
68+
<bottomDescription>
69+
<![CDATA[
70+
wcm.io DevOps is an Open Source project which provides tools for configuration management and deployment.
71+
]]>
72+
</bottomDescription>
73+
<pages>
74+
<index>
75+
<!-- no ToC on the main index page -->
76+
<toc>false</toc>
77+
<markPageHeader>false</markPageHeader>
78+
</index>
79+
<!-- Disable source highlighting for Maven reports -->
80+
<source-repository>
81+
<highlightJs>false</highlightJs>
82+
</source-repository>
83+
<issue-tracking>
84+
<highlightJs>false</highlightJs>
85+
<toc>false</toc>
86+
</issue-tracking>
87+
<license>
88+
<highlightJs>false</highlightJs>
89+
<toc>false</toc>
90+
</license>
91+
<!-- Disable ToC for some Maven reports -->
92+
<project-info>
93+
<toc>false</toc>
94+
</project-info>
95+
<github-report>
96+
<toc>false</toc>
97+
</github-report>
98+
<dependencies>
99+
<tocTopMax>4</tocTopMax>
100+
</dependencies>
101+
</pages>
102+
</reflowSkin>
103+
</custom>
104+
105+
<body>
106+
107+
<links>
108+
<item name="GitHub project" href="http://github.com/wcm-io-devops" />
109+
</links>
110+
111+
<breadcrumbs>
112+
<item name="wcm.io DevOps" href="http://devops.wcm.io" />
113+
</breadcrumbs>
114+
115+
<menu name="Main" inherit="top">
116+
<item name="Home" href="http://devops.wcm.io" />
117+
<item name="Platforms" href="http://devops.wcm.io/platforms.html" />
118+
<item name="Maven Repositories" href="http://devops.wcm.io/maven.html" />
119+
<item name="GitHub project" href="http://github.com/wcm-io-devops" />
120+
<item name="Subprojects" href="http://wcm.io/subprojects.html" />
121+
<item name="License" href="http://devops.wcm.io/license.html" />
122+
<item name="Imprint" href="http://wcm.io/imprint.html" />
123+
</menu>
124+
<menu name="Categories" inherit="top">
125+
<item name="CONGA - CONfiguration GenerAtor" href="http://devops.wcm.io/conga/"/>
126+
</menu>
127+
<menu name="Contribute" inherit="top">
128+
<item name="Contribute" href="http://wcm.io/contribute.html" />
129+
<item name="Manifest" href="http://wcm.io/manifest.html" />
130+
<item name="Issues" href="https://wcm-io.atlassian.net" />
131+
<item name="Wiki" href="https://wcm-io.atlassian.net/wiki/" />
132+
<item name="Mailing Lists" href="http://wcm.io/mailing-lists.html" />
133+
<item name="Continuous Integration" href="https://travis-ci.org/wcm-io-devops" />
134+
<item name="Fork on GitHub" href="http://github.com/wcm-io-devops" />
135+
</menu>
136+
<menu name="Maven documentation" inherit="top" ref="reports"/>
137+
</body>
138+
139+
</project>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
<modules>
4141
<module>parent_toplevel</module>
42+
<module>public_site</module>
4243
</modules>
4344

4445
<build>

0 commit comments

Comments
 (0)