Merge remote-tracking branch 'origin/1.1-fixbranch'

swedenconnect · Nov 6, 2023 · 2a911ef · 2a911ef
2 parents ecad10e + a741420
commit 2a911ef
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 148 deletions.
diff --git a/audit/actuator/pom.xml b/audit/actuator/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-audit-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Auditing :: Actuator</name>

diff --git a/audit/base/pom.xml b/audit/base/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-audit-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Auditing :: Base</name>

diff --git a/audit/pom.xml b/audit/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Auditing</name>
@@ -84,18 +84,4 @@
 
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-          </plugin>          
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/authn/base/pom.xml b/authn/base/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-authn-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Authentication :: Base</name>

diff --git a/authn/pom.xml b/authn/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Authentication</name>
@@ -89,18 +89,4 @@
 
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-          </plugin>          
-        </plugins>
-      </build>
-    </profile>
-  </profiles>  
-
 </project>
diff --git a/authn/saml/pom.xml b/authn/saml/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-authn-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Authentication :: SAML</name>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,7 +6,7 @@
   <groupId>se.swedenconnect.signservice</groupId>
   <artifactId>signservice-application-bom</artifactId>
   <packaging>pom</packaging>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
 
   <name>Sweden Connect :: SignService :: Application BOM</name>
   <description>BOM for SignService Applications</description>
@@ -115,85 +115,85 @@
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-core</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-engine</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-protocol-dssext11</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-authn-base</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-authn-saml</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>    
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-audit-base</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-audit-actuator</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-signhandler</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-keycert-base</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>  
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-keycert-simple</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-keycert-cmc</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-config</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-config-spring</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>      
 
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-spring-boot-starter</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
     </dependencies>
@@ -215,7 +215,7 @@
             <configuration>
               <serverId>ossrh</serverId>
               <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+              <autoReleaseAfterClose>true</autoReleaseAfterClose>
               <!--
                 Allows manual inspection of the staging repo before deploying it to the central repo.
                 Use 'mvn nexus-staging:release -Prelease' to release and 'mvn nexus-staging:drop' to abort.

diff --git a/config/base/pom.xml b/config/base/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-config-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Configuration :: Base</name>

diff --git a/config/pom.xml b/config/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Configuration</name>

diff --git a/config/spring/pom.xml b/config/spring/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-config-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Configuration :: Spring</name>

diff --git a/core/pom.xml b/core/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-parent</artifactId>
-    <version>1.1.0</version>  
+    <version>1.1.1</version>  
   </parent>
 
   <name>Sweden Connect :: SignService :: Core</name>
@@ -160,5 +160,4 @@
     </profile>
   </profiles>
 
-
 </project>
diff --git a/demo-apps/app/pom.xml b/demo-apps/app/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice.demo</groupId>
     <artifactId>signservice-demo-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Demo :: Application</name>

diff --git a/demo-apps/pom.xml b/demo-apps/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>se.swedenconnect.signservice.demo</groupId>
   <artifactId>signservice-demo-parent</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <packaging>pom</packaging>
 
   <name>Sweden Connect :: SignService :: Demo</name>
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>se.swedenconnect.signservice</groupId>
         <artifactId>signservice-application-bom</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -187,23 +187,6 @@
     </plugins>
 
   </build>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>            
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>  
 
   <modules>
     <module>app</module>

diff --git a/demo-apps/rest/backend/pom.xml b/demo-apps/rest/backend/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice.demo</groupId>
     <artifactId>signservice-demo-rest-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Demo :: REST :: Backend</name>

diff --git a/demo-apps/rest/frontend/pom.xml b/demo-apps/rest/frontend/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice.demo</groupId>
     <artifactId>signservice-demo-rest-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Demo :: REST :: Frontend</name>

diff --git a/demo-apps/rest/pom.xml b/demo-apps/rest/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice.demo</groupId>
     <artifactId>signservice-demo-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: Demo :: REST</name>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-parent</artifactId>
-    <version>1.1.0</version>  
+    <version>1.1.1</version>  
   </parent>
 
   <name>Sweden Connect :: SignService :: Engine</name>
@@ -113,19 +113,5 @@
     </plugins>
 
   </build>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-          </plugin>          
-        </plugins>
-      </build>
-    </profile>
-  </profiles>  
 
 </project>
diff --git a/keycert/base/pom.xml b/keycert/base/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-keycert-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: KeyAndCertificate :: Base</name>

diff --git a/keycert/cmc/pom.xml b/keycert/cmc/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>se.swedenconnect.signservice</groupId>
     <artifactId>signservice-keycert-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <name>Sweden Connect :: SignService :: KeyAndCertificate :: CMC</name>
@@ -123,4 +123,4 @@
 
   </build>
 
-</project>
+</project>