Merge branch 'work/using-react-with-bootstrap4'

steinarb · Nov 16, 2019 · e6f210f · e6f210f
2 parents 2929429 + 4d3f663
commit e6f210f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/karaf/src/main/filtered-resources/feature.xml b/karaf/src/main/filtered-resources/feature.xml
@@ -17,7 +17,6 @@
     <repository>mvn:no.priv.bang.ukelonn/ukelonn.services/${project.version}/xml/features</repository>
     <repository>mvn:no.priv.bang.ukelonn/ukelonn.db.liquibase/${project.version}/xml/features</repository>
     <repository>mvn:no.priv.bang.ukelonn/ukelonn.db.derbytest/${project.version}/xml/features</repository>
-    <repository>mvn:no.priv.bang.ukelonn/ukelonn.db.authservicedbadapter/${project.version}/xml/features</repository>
     <repository>mvn:no.priv.bang.ukelonn/ukelonn.db.postgresql/${project.version}/xml/features</repository>
     <repository>mvn:no.priv.bang.ukelonn/ukelonn.backend/${project.version}/xml/features</repository>
     <repository>mvn:no.priv.bang.authservice/authservice/${authservice.version}/xml/features</repository>
@@ -29,19 +28,16 @@
     </feature>
     <feature name="ukelonn-with-derby" description="Ukelonn webapp" version="${project.version}">
         <feature>ukelonn-backend</feature>
-        <feature>authservice-users</feature>
-        <feature>authservice-web-security</feature>
+        <feature>authservice-with-testdb-dbrealm-and-session</feature>
         <feature>ukelonn-db-derby-test</feature>
-        <feature>ukelonn-db-authservice-db-adapter</feature>
         <feature>authservice-web-security-memorysession</feature>
         <feature>authservice-web-security-dbrealm</feature>
         <feature>ukelonn</feature>
     </feature>
     <feature name="ukelonn-with-postgresql" description="Ukelonn webapp" version="${project.version}">
         <feature>ukelonn-backend</feature>
-        <feature>authservice-users</feature>
+        <feature>authservice-with-productiondb-dbrealm-and-session</feature>
         <feature>ukelonn-db-postgresql</feature>
-        <feature>ukelonn-db-authservice-db-adapter</feature>
         <feature>authservice-web-security-memorysession</feature>
         <feature>authservice-web-security-dbrealm</feature>
         <feature>ukelonn</feature>
@@ -52,9 +48,4 @@
         <feature>ukelonn-db-postgresql</feature>
         <feature>ukelonn</feature>
     </feature>
-    <feature name="user-admin-with-ukelonn-postgresql-and-adapter">
-        <feature>ukelonn-db-postgresql</feature>
-        <feature>ukelonn-db-authservice-db-adapter</feature>
-        <feature>authservice-user-admin</feature>
-    </feature>
 </features>
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,6 @@
         <karaf.version>4.2.5</karaf.version>
         <mockrunner.version>2.0.1</mockrunner.version>
         <liquibase.version>3.5.3</liquibase.version>
-        <liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
         <snakeyaml.version>1.17</snakeyaml.version>
         <derby.version>10.11.1.1</derby.version>
         <postgresql.version>42.2.8</postgresql.version>
@@ -317,12 +316,6 @@
                 <version>1.7.25</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>com.mattbertolini</groupId>
-                <artifactId>liquibase-slf4j</artifactId>
-                <version>${liquibase-slf4j.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>org.liquibase</groupId>
                 <artifactId>liquibase-core</artifactId>