Skip to content

Commit

Permalink
Merge pull request #52 from Bernardo-MG/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
Bernardo-MG authored Nov 26, 2017
2 parents 54b19d4 + 73a16d6 commit 4dc8a72
Show file tree
Hide file tree
Showing 178 changed files with 1,034 additions and 1,009 deletions.
31 changes: 23 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,28 @@
* text=auto

# Known text files
*.java text
*.xml text
*.yml text
*.md text
*.sh text
*.css text
*.txt text
*.css text diff=css
*.java text diff=java
*.js text
*.json text
*.jsp text
*.jspf text
*.jspx text
*.htm text diff=html
*.html text diff=html
*.properties text
*.sh text
*.md text
*.txt text
*.xml text
*.yml text

# Known binary files
*.jar binary
*.class binary
*.gif binary
*.ico binary
*.jar binary
*.jpg binary
*.jpeg binary
*.png binary
*.war binary
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ matrix:

before_install:
# Gets scripts
- git clone -b v1.0.0 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
- git clone -b v1.1.3 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
# Sets scripts as executable
- chmod -R +x ~/.scripts/*
# Prepares CI environment
Expand Down
20 changes: 11 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
<!-- ********************************************** -->

<parent>
<groupId>com.wandrell.maven</groupId>
<groupId>com.bernardomg.maven</groupId>
<artifactId>base-pom</artifactId>
<version>1.1.6</version>
<version>1.2.0</version>
</parent>

<!-- ********************************************** -->
<!-- **************** PROJECT INFO **************** -->
<!-- ********************************************** -->

<groupId>com.wandrell.example</groupId>
<groupId>com.bernardomg.example</groupId>
<artifactId>swss-soap-example</artifactId>
<version>1.2.6</version>
<version>1.3.0</version>
<packaging>war</packaging>

<name>Spring Web Services WS-Security Example</name>
Expand Down Expand Up @@ -154,7 +154,8 @@
<site>
<id>site</id>
<name>Project Documentation Site</name>
<url>scp://docs.wandrell.com:2222/home1/duenco/www/maven/swss-soap-example</url>
<!-- The URL should be set externally -->
<url>${site.release.url}</url>
</site>
</distributionManagement>
</profile>
Expand All @@ -166,7 +167,8 @@
<site>
<id>site-development</id>
<name>Project Development Documentation Site</name>
<url>scp://docs.wandrell.com:2222/home1/duenco/www/development/maven/swss-soap-example</url>
<!-- The URL should be set externally -->
<url>${site.develop.url}</url>
</site>
</distributionManagement>
</profile>
Expand Down Expand Up @@ -279,7 +281,7 @@
<developer>
<id>bmg</id>
<name>Bernardo Martínez Garrido</name>
<email>programming@wandrell.com</email>
<email>programming@bernardomg.com</email>
<url>https://github.com/Bernardo-MG</url>
<organization>Bernardo Martínez Garrido</organization>
<organizationUrl>https://github.com/Bernardo-MG</organizationUrl>
Expand All @@ -297,7 +299,7 @@

<properties>
<!-- Manifest data -->
<manifest.name>com/wandrell/example/spring/wss</manifest.name>
<manifest.name>com/bernardomg/example/spring/wss</manifest.name>
<!-- Dependencies versions -->
<ant.version>1.9.7</ant.version>
<commons.codec.version>1.10</commons.codec.version>
Expand Down Expand Up @@ -759,7 +761,7 @@
<dependencies>
<dependency>
<!-- Docs Maven Skin -->
<groupId>com.wandrell.maven.skins</groupId>
<groupId>com.bernardomg.maven.skins</groupId>
<artifactId>docs-maven-skin</artifactId>
<version>${site.skin.version}</version>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Spring Web Services WS-Security Example
# Spring Web Services WS-Security Example [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Spring%20Web%20Services%20WS-Security%20Example%204&url=https://github.com/Bernardo-MG/spring-ws-security-soap-example&via=BernardoMartG&hashtags=spring-ws,wss,soap)

Sample [Spring WS][spring-ws] SOAP web service which sets up various [WS-Security][ws-security] protocols.

Expand Down Expand Up @@ -95,7 +95,7 @@ $ mvn package

After this all the endpoint URLs are accessible. These can be found below, and require some sort of SOAP client, such as the console one included in the project.

This console client can be used by just running the ConsoleClient class, located in the com.wandrell.example.swss.client.console folder.
This console client can be used by just running the ConsoleClient class, located in the com.bernardomg.example.swss.client.console folder.

### Running the example with Java 8

Expand Down Expand Up @@ -147,12 +147,12 @@ If you wish to fork or modify the code, visit the [GitHub project page][scm], wh
The project has been released under the [MIT License][license].

[issues]: https://github.com/bernardo-mg/swss-soap-example/issues
[javadoc-develop]: http://docs.wandrell.com/development/maven/swss-soap-example/apidocs
[javadoc-release]: http://docs.wandrell.com/maven/swss-soap-example/apidocs
[javadoc-develop]: http://docs.bernardomg.com/development/maven/swss-soap-example/apidocs
[javadoc-release]: http://docs.bernardomg.com/maven/swss-soap-example/apidocs
[license]: http://www.opensource.org/licenses/mit-license.php
[scm]: https://github.com/bernardo-mg/spring-ws-security-soap-example
[site-develop]: http://docs.wandrell.com/development/maven/swss-soap-example
[site-release]: http://docs.wandrell.com/maven/swss-soap-example
[site-develop]: http://docs.bernardomg.com/development/maven/swss-soap-example
[site-release]: http://docs.bernardomg.com/maven/swss-soap-example

[ws-security]: https://www.oasis-open.org/committees/wss/
[xwss]: https://docs.oracle.com/cd/E17802_01/webservices/webservices/docs/1.6/tutorial/doc/XWS-SecurityIntro4.html
Expand Down
7 changes: 6 additions & 1 deletion src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
<properties>
<title>Project Changes</title>
<author email="programming@wandrell.com">Bernardo Martínez Garrido</author>
<author email="programming@bernardomg.com">Bernardo Martínez Garrido</author>
</properties>
<body>
<release version="1.0.0" date="2016-03-26" description="First version">
Expand Down Expand Up @@ -139,5 +139,10 @@
Updated base POM and project configuration.
</action>
</release>
<release version="1.3.0" date="2017-11-26" description="Relocation">
<action dev="bmg" type="update">
Relocation.
</action>
</release>
</body>
</document>
2 changes: 1 addition & 1 deletion src/config/pmd/pmd-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE xml>
<ruleset name="DefaultWandrell">
<ruleset name="Defaultbernardomg">
<description>
Default list of rulesets to use, along ignored rules.
</description>
Expand Down
Loading

0 comments on commit 4dc8a72

Please sign in to comment.