Skip to content

Commit 513b6a8

Browse files
StevenArztStevenArzt
authored
Merge pull request #425 from MarcMil/fix-for-maven-central
Prepare for release on maven central
2 parents c0a2d42 + 7259bcf commit 513b6a8

File tree

7 files changed

+153
-257
lines changed

7 files changed

+153
-257
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ soot-infoflow-summaries/target/
33
/.metadata
44
/.recommenders
55
.idea/
6-
*.iml
6+
*.iml
7+
target/
8+
*/target

‎pom.xml‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
53
<modelVersion>4.0.0</modelVersion>
6-
<groupId>de.fraunhofer.sit.flowdroid</groupId>
4+
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
75
<artifactId>parent</artifactId>
8-
<version>2.10.0-SNAPSHOT</version>
6+
<version>2.10.0</version>
97
<name>FlowDroid Parent Module</name>
108
<packaging>pom</packaging>
119

@@ -14,6 +12,21 @@
1412
<maven.compiler.target>1.8</maven.compiler.target>
1513
</properties>
1614

15+
<developers>
16+
<developer>
17+
<name>Steven Arzt</name>
18+
<email>steven.arzt@sit.fraunhofer.de</email>
19+
<organization>Fraunhofer SIT</organization>
20+
<organizationUrl>https://www.sit.fraunhofer.de/</organizationUrl>
21+
</developer>
22+
</developers>
23+
<licenses>
24+
<license>
25+
<name>GNU LESSER GENERAL PUBLIC LICENSE 2.1</name>
26+
<url>https://www.gnu.org/licenses/lgpl-2.1.txt</url>
27+
<distribution>repo</distribution>
28+
</license>
29+
</licenses>
1730
<modules>
1831
<module>soot-infoflow</module>
1932
<module>soot-infoflow-android</module>
@@ -50,4 +63,17 @@
5063
</dependency>
5164
</dependencies>
5265
</dependencyManagement>
53-
</project>
66+
<!-- Do not deploy parent module -->
67+
<build>
68+
<plugins>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-deploy-plugin</artifactId>
72+
<version>2.4</version>
73+
<configuration>
74+
<skip>true</skip>
75+
</configuration>
76+
</plugin>
77+
</plugins>
78+
</build>
79+
</project>

‎soot-infoflow-android/pom.xml‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>de.tud.sse</groupId>
5+
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
66
<artifactId>soot-infoflow-android</artifactId>
77
<name>soot-infoflow-android</name>
8-
<version>2.10.0-SNAPSHOT</version>
8+
<version>2.10.0</version>
99
<description>Android-specific components of FlowDroid</description>
1010
<url>https://github.com/secure-software-engineering/FlowDroid</url>
1111

@@ -21,8 +21,15 @@
2121
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
2222
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
2323
</properties>
24-
25-
<organization>
24+
25+
<scm>
26+
<connection>scm:git:git@github.com:secure-software-engineering/FlowDroid.git</connection>
27+
<developerConnection>scm:git:git@github.com:secure-software-engineering/FlowDroid.git</developerConnection>
28+
<url>https://github.com/secure-software-engineering/FlowDroid/tree/develop</url>
29+
</scm>
30+
31+
32+
<organization>
2633
<name>Fraunhofer SIT</name>
2734
<url>https://www.sit.fraunhofer.de/</url>
2835
</organization>
@@ -121,6 +128,29 @@
121128
</resources>
122129
</build>
123130

131+
<profiles>
132+
<profile>
133+
<id>sign-artifacts</id>
134+
<build>
135+
<plugins>
136+
<plugin>
137+
<groupId>org.apache.maven.plugins</groupId>
138+
<artifactId>maven-gpg-plugin</artifactId>
139+
<version>3.0.1</version>
140+
<executions>
141+
<execution>
142+
<id>sign-artifacts</id>
143+
<phase>verify</phase>
144+
<goals>
145+
<goal>sign</goal>
146+
</goals>
147+
</execution>
148+
</executions>
149+
</plugin>
150+
</plugins>
151+
</build>
152+
</profile>
153+
</profiles>
124154
<dependencies>
125155
<dependency>
126156
<groupId>org.slf4j</groupId>
@@ -133,9 +163,9 @@
133163
<version>1.7.32</version>
134164
</dependency>
135165
<dependency>
136-
<groupId>de.tud.sse</groupId>
166+
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
137167
<artifactId>soot-infoflow</artifactId>
138-
<version>2.10.0-SNAPSHOT</version>
168+
<version>2.10.0</version>
139169
</dependency>
140170
<dependency>
141171
<groupId>junit</groupId>
@@ -154,11 +184,6 @@
154184
<artifactId>axml</artifactId>
155185
<version>2.1.1</version>
156186
</dependency>
157-
<dependency>
158-
<groupId>ca.mcgill.sable</groupId>
159-
<artifactId>axmlprinter</artifactId>
160-
<version>2016-07-27</version>
161-
</dependency>
162187
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
163188
<dependency>
164189
<groupId>com.google.protobuf</groupId>
@@ -171,17 +196,4 @@
171196
<version>5.2.1</version>
172197
</dependency>
173198
</dependencies>
174-
175-
<repositories>
176-
<repository>
177-
<id>soot-snapshot</id>
178-
<name>Soot snapshot server</name>
179-
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/</url>
180-
</repository>
181-
<repository>
182-
<id>soot-release</id>
183-
<name>Soot release server</name>
184-
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-release/</url>
185-
</repository>
186-
</repositories>
187199
</project>

‎soot-infoflow-android/src/soot/jimple/infoflow/android/axml/parsers/AXMLPrinter2Parser.java‎

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

‎soot-infoflow-cmd/pom.xml‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>de.tud.sse</groupId>
5+
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
66
<artifactId>soot-infoflow-cmd</artifactId>
77
<name>FlowDroid Command Line Util</name>
8-
<version>2.10.0-SNAPSHOT</version>
8+
<version>2.10.0</version>
99
<description>Command-line utility for running FlowDroid</description>
10+
<url>https://github.com/secure-software-engineering/FlowDroid</url>
1011

1112
<properties>
1213
<maven.compiler.source>1.7</maven.compiler.source>
@@ -20,7 +21,13 @@
2021
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
2122
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
2223
</properties>
23-
24+
25+
<scm>
26+
<connection>scm:git:git@github.com:secure-software-engineering/FlowDroid.git</connection>
27+
<developerConnection>scm:git:git@github.com:secure-software-engineering/FlowDroid.git</developerConnection>
28+
<url>https://github.com/secure-software-engineering/FlowDroid/tree/develop</url>
29+
</scm>
30+
2431
<organization>
2532
<name>Fraunhofer SIT</name>
2633
<url>https://www.sit.fraunhofer.de/</url>
@@ -130,16 +137,40 @@
130137
</plugins>
131138
</build>
132139

140+
<profiles>
141+
<profile>
142+
<id>sign-artifacts</id>
143+
<build>
144+
<plugins>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-gpg-plugin</artifactId>
148+
<version>3.0.1</version>
149+
<executions>
150+
<execution>
151+
<id>sign-artifacts</id>
152+
<phase>verify</phase>
153+
<goals>
154+
<goal>sign</goal>
155+
</goals>
156+
</execution>
157+
</executions>
158+
</plugin>
159+
</plugins>
160+
</build>
161+
</profile>
162+
</profiles>
163+
133164
<dependencies>
134165
<dependency>
135-
<groupId>de.tud.sse</groupId>
166+
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
136167
<artifactId>soot-infoflow-android</artifactId>
137-
<version>2.10.0-SNAPSHOT</version>
168+
<version>2.10.0</version>
138169
</dependency>
139170
<dependency>
140-
<groupId>de.tud.sse</groupId>
171+
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
141172
<artifactId>soot-infoflow-summaries</artifactId>
142-
<version>2.10.0-SNAPSHOT</version>
173+
<version>2.10.0</version>
143174
</dependency>
144175
<dependency>
145176
<groupId>commons-cli</groupId>
@@ -156,17 +187,4 @@
156187
<optional>true</optional>
157188
</dependency>
158189
</dependencies>
159-
160-
<repositories>
161-
<repository>
162-
<id>soot-snapshot</id>
163-
<name>Soot snapshot server</name>
164-
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/</url>
165-
</repository>
166-
<repository>
167-
<id>soot-release</id>
168-
<name>Soot release server</name>
169-
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-release/</url>
170-
</repository>
171-
</repositories>
172190
</project>

0 commit comments

Comments
 (0)