Skip to content

Commit 127937d

Browse files
author
Vivek Sachdeva
committed
Merge branch 'master' of https://github.com/Internet2/grouper
2 parents ada6d2c + 4e287b6 commit 127937d

File tree

55 files changed

+3098
-5362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3098
-5362
lines changed

grouper-misc/googleapps-grouper-provisioner/pom.xml

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>edu.internet2.middleware.grouper</groupId>
7+
<parent>
8+
<groupId>edu.internet2.middleware.grouper</groupId>
9+
<artifactId>grouper-parent</artifactId>
10+
<version>2.5.0-SNAPSHOT</version>
11+
<relativePath>../../grouper-parent</relativePath>
12+
</parent>
13+
14+
<name>Grouper Google Apps Provisioner</name>
15+
<description>Google Apps Integration Library</description>
816
<artifactId>google-apps-provisioner</artifactId>
9-
<version>1.3.3</version>
1017

1118
<properties>
1219
<commons-collections.version>3.2.1</commons-collections.version>
@@ -22,31 +29,6 @@
2229
<maven.compiler.target>1.7</maven.compiler.target>
2330
</properties>
2431

25-
<build>
26-
<plugins>
27-
<plugin>
28-
<groupId>org.apache.maven.plugins</groupId>
29-
<artifactId>maven-dependency-plugin</artifactId>
30-
<version>2.1</version>
31-
<executions>
32-
<execution>
33-
<id>copy-dependencies</id>
34-
<phase>package</phase>
35-
<goals>
36-
<goal>copy-dependencies</goal>
37-
</goals>
38-
<configuration>
39-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
40-
<overWriteReleases>false</overWriteReleases>
41-
<overWriteSnapshots>false</overWriteSnapshots>
42-
<overWriteIfNewer>true</overWriteIfNewer>
43-
</configuration>
44-
</execution>
45-
</executions>
46-
</plugin>
47-
</plugins>
48-
</build>
49-
5032
<dependencies>
5133
<dependency>
5234
<groupId>edu.internet2.middleware.grouper</groupId>

grouper-misc/morphString/.gitignore

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

grouper-misc/morphString/README.txt

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

grouper-misc/morphString/build.xml

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

grouper-misc/morphString/conf/morphString.example.properties

Lines changed: 0 additions & 21 deletions
This file was deleted.
-105 KB
Binary file not shown.

grouper-misc/morphString/misc/version.properties

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

grouper-misc/morphString/pom.xml

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

0 commit comments

Comments
 (0)