Update to Seed 2.3.0-S

seedstack · Mar 17, 2016 · bc6bceb · bc6bceb
1 parent 5d56cbb
commit bc6bceb
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,18 @@
-# Use docker-based infrastructure
 sudo: false
 
 language: java
 
-jdk:
-  - oraclejdk8
+jdk: oraclejdk8
 
 cache:
   directories:
     - "$HOME/.m2/repository"
 
 install:
-  - rm ~/.m2/settings.xml
-  - if [ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_BRANCH = master ]; then GOAL=deploy; else GOAL=install; fi
+  - echo "<settings><servers><server><id>bintray</id><username>\${env.BINTRAY_USER}</username><password>\${env.BINTRAY_KEY}</password></server></servers></settings>" > ~/.m2/settings.xml
+  - if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
+  - if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; else ADDITIONAL_PROFILES=snapshots; fi
 
-script: mvn -q -U -T 2 -Pbuild-number,compatibility,bintray,snapshots,javadoc $GOAL jacoco:report
+script: mvn -q -U -T 2 -Pbuild-number,compatibility,bintray,javadoc,$ADDITIONAL_PROFILES $GOAL jacoco:report
 
 after_success: mvn -q coveralls:report -DrepoToken=$COVERALLS_TOKEN
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+    Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,18 +14,20 @@
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>2.1.0</version>
+        <version>2.3.0</version>
     </parent>
 
     <groupId>org.seedstack.addons.ldap</groupId>
     <artifactId>ldap</artifactId>
     <version>2.1.1-SNAPSHOT</version>
 
     <properties>
-        <seed.version>2.1.0</seed.version>
+        <seed.version>2.3.0-SNAPSHOT</seed.version>
         <unboundid.version>2.3.8</unboundid.version>
 
-        <compatibility.skip>true</compatibility.skip>
+        <compatibility.version>2.1.0</compatibility.version>
+
+        <bintray.package>ldap-addon</bintray.package>
     </properties>
 
     <build>
@@ -150,7 +152,7 @@
                     <releases>
                         <enabled>true</enabled>
                     </releases>
-                    <id>bintray-seedstack-jars</id>
+                    <id>bintray</id>
                     <name>bintray</name>
                     <url>http://dl.bintray.com/seedstack/jars</url>
                 </repository>

diff --git a/src/it/java/org/seedstack/seed/security/LdapITPlugin.java b/src/it/java/org/seedstack/seed/security/LdapITPlugin.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/it/java/org/seedstack/seed/security/LdapRealmIT.java b/src/it/java/org/seedstack/seed/security/LdapRealmIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/it/resources/META-INF/configuration/org.seedstack.security.props b/src/it/resources/META-INF/configuration/org.seedstack.security.props
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/it/resources/logback-test.xml b/src/it/resources/logback-test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+    Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/LdapException.java b/src/main/java/org/seedstack/ldap/LdapException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/LdapService.java b/src/main/java/org/seedstack/ldap/LdapService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/LdapUserContext.java b/src/main/java/org/seedstack/ldap/LdapUserContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/LdapUserContextPrincipalProvider.java b/src/main/java/org/seedstack/ldap/LdapUserContextPrincipalProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/internal/DefaultLDAPService.java b/src/main/java/org/seedstack/ldap/internal/DefaultLDAPService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/internal/DefaultLDAPUserContext.java b/src/main/java/org/seedstack/ldap/internal/DefaultLDAPUserContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/internal/LDAPRealm.java b/src/main/java/org/seedstack/ldap/internal/LDAPRealm.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/internal/LdapErrorCodes.java b/src/main/java/org/seedstack/ldap/internal/LdapErrorCodes.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/internal/LdapModule.java b/src/main/java/org/seedstack/ldap/internal/LdapModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/org/seedstack/ldap/internal/LdapPlugin.java b/src/main/java/org/seedstack/ldap/internal/LdapPlugin.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/resources/META-INF/errors/org.seedstack.ldap.internal.LdapErrorCodes.properties b/src/main/resources/META-INF/errors/org.seedstack.ldap.internal.LdapErrorCodes.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this