Skip to content

Commit 621b6f3

Browse files
adrienlaueradrienlauer
committed
Update for OJO
1 parent dd3c4bf commit 621b6f3

32 files changed

+57
-111
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ cache:
1010
directories:
1111
- "$HOME/.m2/repository"
1212

13-
install: /bin/true
13+
install:
14+
- rm ~/.m2/settings.xml
15+
- if [ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_BRANCH = master ]; then GOAL=deploy; else GOAL=install; fi
1416

15-
script:
16-
- mvn -q -B -U -Pstaging,javadoc,compatibility install jacoco:report
17-
- mvn -q -B coveralls:report -DrepoToken=$COVERALLS_TOKEN
17+
script: mvn -q -U -T 2 -Pcompatibility,snapshots,javadoc $GOAL jacoco:report
1818

19-
after_success:
20-
- echo "<settings><servers><server><id>sonatype-nexus-snapshots</id><username>\${env.SONATYPE_USER}</username><password>\${env.SONATYPE_PASS}</password></server></servers></settings>" > ~/settings.xml
21-
- "[[ $TRAVIS_PULL_REQUEST == \"false\" && $TRAVIS_BRANCH == \"master\" ]] && mvn -q deploy --settings ~/settings.xml -DskipTests=true -Pjavadoc"
19+
after_success: mvn -q coveralls:report -DrepoToken=$COVERALLS_TOKEN

‎pom.xml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<!--
22
3-
Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
4-
5-
This file is part of SeedStack, An enterprise-oriented full development stack.
3+
Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
64
75
This Source Code Form is subject to the terms of the Mozilla Public
86
License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -113,23 +111,33 @@
113111
<tag>HEAD</tag>
114112
</scm>
115113

114+
<pluginRepositories>
115+
<pluginRepository>
116+
<snapshots>
117+
<enabled>false</enabled>
118+
</snapshots>
119+
<id>bintray-jfrog-jfrog-jars</id>
120+
<name>bintray-plugins</name>
121+
<url>http://dl.bintray.com/jfrog/jfrog-jars</url>
122+
</pluginRepository>
123+
</pluginRepositories>
124+
116125
<profiles>
117126
<profile>
118-
<id>staging</id>
127+
<id>snapshots</id>
119128
<repositories>
120129
<repository>
121-
<id>sonatype-nexus-staging</id>
122-
<name>Sonatype Nexus Staging</name>
123-
<url>https://oss.sonatype.org/content/groups/staging</url>
130+
<snapshots>
131+
<enabled>true</enabled>
132+
</snapshots>
133+
<releases>
134+
<enabled>false</enabled>
135+
</releases>
136+
<id>ojo-libs-snapshot</id>
137+
<name>ojo-snapshots</name>
138+
<url>https://oss.jfrog.org/artifactory/libs-snapshot</url>
124139
</repository>
125140
</repositories>
126-
<pluginRepositories>
127-
<pluginRepository>
128-
<id>sonatype-nexus-staging</id>
129-
<name>Sonatype Nexus Staging</name>
130-
<url>https://oss.sonatype.org/content/groups/staging</url>
131-
</pluginRepository>
132-
</pluginRepositories>
133141
</profile>
134142
</profiles>
135143
</project>

‎src/it/java/org/seedstack/seed/validation/internal/ValidationPluginIT.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/it/java/org/seedstack/seed/validation/internal/ValidationPlugin_ValidationErrorIT.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/it/java/org/seedstack/seed/validation/internal/ValidationPlugin_ValidationOkIT.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/it/java/org/seedstack/seed/validation/internal/ValidationServiceIT.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/it/java/org/seedstack/seed/validation/internal/pojo/DummyServiceFieldValidation.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/it/java/org/seedstack/seed/validation/internal/pojo/DummyServiceFieldValidationOK.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/it/java/org/seedstack/seed/validation/internal/pojo/DummyServiceParamReturnType.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/it/java/org/seedstack/seed/validation/internal/pojo/DummyServiceParamValidation.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/**
2-
* Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
3-
*
4-
* This file is part of SeedStack, An enterprise-oriented full development stack.
2+
* Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
53
*
64
* This Source Code Form is subject to the terms of the Mozilla Public
75
* License, v. 2.0. If a copy of the MPL was not distributed with this

0 commit comments

Comments
 (0)