Skip to content

Commit 28118a6

Browse files
wow-such-codewow-such-code
committed
Merge branch 'development' into release/1.7.0
2 parents a057cea + 66f2f64 commit 28118a6

File tree

5 files changed

+102
-241
lines changed

5 files changed

+102
-241
lines changed

‎pom.xml‎

Lines changed: 102 additions & 191 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project
3-
xmlns="http://maven.apache.org/POM/4.0.0"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
6-
<modelVersion>4.0.0</modelVersion>
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
6+
<modelVersion>4.0.0</modelVersion>
77

88
<groupId>life.qbic</groupId>
99
<artifactId>xml-manager-lib</artifactId>
@@ -13,196 +13,107 @@
1313
<description>library for reading and writing of specific openBIS xml properties </description>
1414
<packaging>jar</packaging>
1515

16-
<properties>
17-
<maven.compiler.source>1.8</maven.compiler.source>
18-
<maven.compiler.target>1.8</maven.compiler.target>
16+
<properties>
17+
<maven.compiler.source>1.8</maven.compiler.source>
18+
<maven.compiler.target>1.8</maven.compiler.target>
1919

20-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
22-
</properties>
20+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
22+
</properties>
2323

24-
<repositories>
25-
<repository>
26-
<releases>
27-
<enabled>true</enabled>
28-
<updatePolicy>always</updatePolicy>
29-
<checksumPolicy>fail</checksumPolicy>
30-
</releases>
31-
<snapshots>
32-
<enabled>false</enabled>
33-
</snapshots>
34-
<id>maven-central</id>
35-
<name>Maven central</name>
36-
<url>https://repo.maven.apache.org/maven2</url>
37-
</repository>
38-
<repository>
39-
<releases>
40-
<enabled>false</enabled>
41-
</releases>
42-
<snapshots>
43-
<enabled>true</enabled>
44-
<updatePolicy>always</updatePolicy>
45-
<checksumPolicy>fail</checksumPolicy>
46-
</snapshots>
47-
<id>nexus-snapshots</id>
48-
<name>QBiC Snapshots</name>
49-
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-snapshots</url>
50-
</repository>
51-
<repository>
52-
<releases>
53-
<enabled>true</enabled>
54-
<updatePolicy>always</updatePolicy>
55-
<checksumPolicy>fail</checksumPolicy>
56-
</releases>
57-
<snapshots>
58-
<enabled>false</enabled>
59-
</snapshots>
60-
<id>nexus-releases</id>
61-
<name>QBiC Releases</name>
62-
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-releases</url>
63-
</repository>
64-
</repositories>
24+
<repositories>
25+
<repository>
26+
<releases>
27+
<enabled>true</enabled>
28+
<updatePolicy>always</updatePolicy>
29+
<checksumPolicy>fail</checksumPolicy>
30+
</releases>
31+
<snapshots>
32+
<enabled>false</enabled>
33+
</snapshots>
34+
<id>maven-central</id>
35+
<name>Maven central</name>
36+
<url>https://repo.maven.apache.org/maven2</url>
37+
</repository>
38+
<repository>
39+
<releases>
40+
<enabled>false</enabled>
41+
</releases>
42+
<snapshots>
43+
<enabled>true</enabled>
44+
<updatePolicy>always</updatePolicy>
45+
<checksumPolicy>fail</checksumPolicy>
46+
</snapshots>
47+
<id>nexus-snapshots</id>
48+
<name>QBiC Snapshots</name>
49+
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-snapshots</url>
50+
</repository>
51+
<repository>
52+
<releases>
53+
<enabled>true</enabled>
54+
<updatePolicy>always</updatePolicy>
55+
<checksumPolicy>fail</checksumPolicy>
56+
</releases>
57+
<snapshots>
58+
<enabled>false</enabled>
59+
</snapshots>
60+
<id>nexus-releases</id>
61+
<name>QBiC Releases</name>
62+
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-releases</url>
63+
</repository>
64+
</repositories>
6565

66-
<dependencyManagement>
67-
<dependencies>
68-
<dependency>
69-
<groupId>org.codehaus.groovy</groupId>
70-
<artifactId>groovy-bom</artifactId>
71-
<version>3.0.9</version>
72-
<type>pom</type>
73-
<scope>import</scope>
74-
</dependency>
75-
</dependencies>
76-
</dependencyManagement>
77-
<dependencies>
78-
<dependency>
79-
<groupId>org.codehaus.groovy</groupId>
80-
<artifactId>groovy</artifactId>
81-
<scope>provided</scope>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.spockframework</groupId>
85-
<artifactId>spock-core</artifactId>
86-
<version>1.3-groovy-2.5</version>
87-
<scope>test</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.apache.commons</groupId>
91-
<artifactId>commons-lang3</artifactId>
92-
<version>3.7</version>
93-
<scope>${osgi.scope}</scope>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.apache.logging.log4j</groupId>
97-
<artifactId>log4j-api</artifactId>
98-
<version>2.13.2</version>
99-
<scope>${osgi.scope}</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.apache.logging.log4j</groupId>
103-
<artifactId>log4j-core</artifactId>
104-
<version>2.13.2</version>
105-
<scope>${osgi.scope}</scope>
106-
</dependency>
107-
<dependency>
108-
<groupId>org.glassfish.jaxb</groupId>
109-
<artifactId>jaxb-runtime</artifactId>
110-
<version>2.3.1</version>
111-
<scope>${osgi.scope}</scope>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.osgi</groupId>
115-
<artifactId>osgi.core</artifactId>
116-
<version>7.0.0</version>
117-
<scope>${osgi.scope}</scope>
118-
</dependency>
119-
</dependencies>
66+
<dependencies>
67+
<dependency>
68+
<groupId>org.apache.commons</groupId>
69+
<artifactId>commons-lang3</artifactId>
70+
<version>3.7</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.apache.logging.log4j</groupId>
74+
<artifactId>log4j-api</artifactId>
75+
<version>2.17.1</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.apache.logging.log4j</groupId>
79+
<artifactId>log4j-core</artifactId>
80+
<version>2.17.1</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>junit</groupId>
84+
<artifactId>junit</artifactId>
85+
<version>4.13.2</version>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.glassfish.jaxb</groupId>
90+
<artifactId>jaxb-runtime</artifactId>
91+
<version>2.3.1</version>
92+
</dependency>
93+
</dependencies>
12094

121-
<distributionManagement>
122-
<repository>
123-
<uniqueVersion>true</uniqueVersion>
124-
<id>nexus-releases</id>
125-
<name>QBiC Releases</name>
126-
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-releases</url>
127-
</repository>
128-
<snapshotRepository>
129-
<uniqueVersion>false</uniqueVersion>
130-
<id>nexus-snapshots</id>
131-
<name>QBiC Snapshots</name>
132-
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-snapshots</url>
133-
</snapshotRepository>
134-
</distributionManagement>
135-
<build>
136-
<plugins>
137-
<plugin>
138-
<groupId>org.apache.maven.plugins</groupId>
139-
<artifactId>maven-compiler-plugin</artifactId>
140-
<version>3.8.1</version>
141-
</plugin>
142-
<plugin>
143-
<groupId>org.codehaus.gmavenplus</groupId>
144-
<artifactId>gmavenplus-plugin</artifactId>
145-
<version>1.11.0</version>
146-
<executions>
147-
<execution>
148-
<goals>
149-
<goal>execute</goal>
150-
<goal>addSources</goal>
151-
<goal>addTestSources</goal>
152-
<goal>generateStubs</goal>
153-
<goal>compile</goal>
154-
<goal>generateTestStubs</goal>
155-
<goal>compileTests</goal>
156-
<goal>removeStubs</goal>
157-
<goal>removeTestStubs</goal>
158-
</goals>
159-
</execution>
160-
</executions>
161-
</plugin>
162-
</plugins>
163-
</build>
95+
<distributionManagement>
96+
<repository>
97+
<uniqueVersion>true</uniqueVersion>
98+
<id>nexus-releases</id>
99+
<name>QBiC Releases</name>
100+
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-releases</url>
101+
</repository>
102+
<snapshotRepository>
103+
<uniqueVersion>false</uniqueVersion>
104+
<id>nexus-snapshots</id>
105+
<name>QBiC Snapshots</name>
106+
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-snapshots</url>
107+
</snapshotRepository>
108+
</distributionManagement>
109+
<build>
110+
<plugins>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-compiler-plugin</artifactId>
114+
<version>3.8.1</version>
115+
</plugin>
116+
</plugins>
117+
</build>
164118

165-
<profiles>
166-
<profile>
167-
<id>no-liferay</id>
168-
<activation>
169-
<activeByDefault>true</activeByDefault>
170-
</activation>
171-
<properties>
172-
<osgi.scope>compile</osgi.scope>
173-
</properties>
174-
</profile>
175-
<profile>
176-
<id>liferay</id>
177-
<properties>
178-
<osgi.scope>provided</osgi.scope>
179-
</properties>
180-
<build>
181-
<plugins>
182-
<plugin>
183-
<groupId>org.apache.maven.plugins</groupId>
184-
<artifactId>maven-jar-plugin</artifactId>
185-
<version>3.2.0</version>
186-
<configuration>
187-
<archive>
188-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
189-
</archive>
190-
</configuration>
191-
</plugin>
192-
<plugin>
193-
<groupId>biz.aQute.bnd</groupId>
194-
<artifactId>bnd-maven-plugin</artifactId>
195-
<version>5.1.2</version>
196-
<executions>
197-
<execution>
198-
<goals>
199-
<goal>bnd-process</goal>
200-
</goals>
201-
</execution>
202-
</executions>
203-
</plugin>
204-
</plugins>
205-
</build>
206-
</profile>
207-
</profiles>
208119
</project>

‎src/main/groovy/life/qbic/example/Activator.groovy‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/main/groovy/life/qbic/example/Car.groovy‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/main/groovy/life/qbic/example/Garage.groovy‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/main/groovy/life/qbic/example/Porsche.groovy‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)