Switch to unified view

a/pom.xml b/pom.xml
...
...
6
    <packaging>bundle</packaging>
6
    <packaging>bundle</packaging>
7
    <name>Simple bundle archetype</name>
7
    <name>Simple bundle archetype</name>
8
    <version>1.0-SNAPSHOT</version>
8
    <version>1.0-SNAPSHOT</version>
9
9
10
    <properties>
10
    <properties>
11
        <!--<osgi.scope>compile</osgi.scope>--> <!-- for local packaging -->
11
       <!--<osgi.scope>compile</osgi.scope> --><!-- for local packaging -->
12
        <osgi.scope>provided</osgi.scope>
12
        <osgi.scope>provided</osgi.scope>
13
13
14
        <compiler.version>1.7</compiler.version>
14
        <compiler.version>1.7</compiler.version>
15
        <!--<springframework.version>2.5.6.SEC03</springframework.version>-->
15
        <!--<springframework.version>2.5.6.SEC03</springframework.version>-->
16
        <springframework.version>3.1.0.RELEASE</springframework.version>
16
        <springframework.version>3.1.0.RELEASE</springframework.version>
...
...
58
            <artifactId>org.osgi.compendium</artifactId>
58
            <artifactId>org.osgi.compendium</artifactId>
59
            <version>${osgi.version}</version>
59
            <version>${osgi.version}</version>
60
            <scope>${osgi.scope}</scope>
60
            <scope>${osgi.scope}</scope>
61
        </dependency>
61
        </dependency>
62
62
63
        <!--
64
        <dependency>
63
        <dependency>
65
            <groupId>org.codehaus.jettison</groupId>
64
            <groupId>org.codehaus.jettison</groupId>
66
            <artifactId>jettison</artifactId>
65
            <artifactId>jettison</artifactId>
67
            <version>1.3.4</version>
66
            <version>1.3.4</version>
68
            <scope>${osgi.scope}</scope>
67
            <scope>${osgi.scope}</scope>
69
        </dependency>
68
        </dependency>
70
        -->
71
69
72
        <!--<dependency>
70
       <dependency>
73
            <groupId>com.jcraft.jsch</groupId>
71
            <groupId>com.jcraft.jsch</groupId>
74
            <artifactId>com.springsource.com.jcraft.jsch</artifactId>
72
            <artifactId>com.springsource.com.jcraft.jsch</artifactId>
75
            <version>0.1.41</version>
73
            <version>0.1.41</version>
76
            <scope>${osgi.scope}</scope>
74
            <scope>${osgi.scope}</scope>
77
        </dependency>
75
        </dependency>
78
        -->
79
        <!-- END OSGi relevant dependencies -->
76
        <!-- END OSGi relevant dependencies -->
80
77
81
        <dependency>
78
        <dependency>
82
            <groupId>org.hibernate</groupId>
79
            <groupId>org.hibernate</groupId>
83
            <artifactId>hibernate-commons-annotations</artifactId>
80
            <artifactId>hibernate-commons-annotations</artifactId>
...
...
96
            <artifactId>spring-context</artifactId>
93
            <artifactId>spring-context</artifactId>
97
            <version>${springframework.version}</version>
94
            <version>${springframework.version}</version>
98
            <scope>${osgi.scope}</scope>
95
            <scope>${osgi.scope}</scope>
99
        </dependency>
96
        </dependency>
100
97
98
        <dependency>
99
            <groupId>org.springframework.osgi</groupId>
100
            <artifactId>spring-osgi-core</artifactId>
101
            <version>1.2.1</version>
102
        </dependency>
103
104
        <!--
105
        <dependency>
106
            <groupId>org.springframework.osgi</groupId>
107
            <artifactId>spring-osgi-extender</artifactId>
108
            <version>1.2.1</version>
109
            <scope>test</scope>
110
        </dependency>
111
112
        <dependency>
113
            <groupId>org.springframework.osgi</groupId>
114
            <artifactId>spring-osgi-mock</artifactId>
115
            <version>1.2.1</version>
116
            <scope>test</scope>
117
        </dependency>
118
119
        <dependency>
120
            <groupId>org.springframework.osgi</groupId>
121
            <artifactId>spring-osgi-test</artifactId>
122
            <version>1.2.1</version>
123
            <scope>test</scope>
124
        </dependency>
125
101
       <dependency>
126
       <dependency>
102
            <groupId>org.springframework</groupId>
127
            <groupId>org.springframework</groupId>
103
            <artifactId>spring-beans</artifactId>
128
            <artifactId>spring-beans</artifactId>
104
            <version>${springframework.version}</version>
129
            <version>${springframework.version}</version>
105
           <scope>${osgi.scope}</scope>
130
           <scope>${osgi.scope}</scope>
106
        </dependency>
131
        </dependency>
132
        -->
107
133
108
        <dependency>
134
        <dependency>
109
            <groupId>org.springframework</groupId>
135
            <groupId>org.springframework</groupId>
110
            <artifactId>spring-tx</artifactId>
136
            <artifactId>spring-tx</artifactId>
111
            <version>${springframework.version}</version>
137
            <version>${springframework.version}</version>
...
...
403
429
404
        <dependency>
430
        <dependency>
405
            <groupId>uk.ac.bolton.archimate</groupId>
431
            <groupId>uk.ac.bolton.archimate</groupId>
406
            <artifactId>editor</artifactId>
432
            <artifactId>editor</artifactId>
407
            <version>${archimate.version}</version>
433
            <version>${archimate.version}</version>
434
        </dependency>
435
        <dependency>
436
            <groupId>org.springframework</groupId>
437
            <artifactId>spring-test</artifactId>
438
            <version>${springframework.version}</version>
439
            <scope>test</scope>
408
        </dependency>
440
        </dependency>
409
441
410
    </dependencies>
442
    </dependencies>
411
443
412
    <build>
444
    <build>
...
...
454
                        </goals>
486
                        </goals>
455
                    </execution>
487
                    </execution>
456
                </executions>
488
                </executions>
457
                <configuration>
489
                <configuration>
458
                    <manifestLocation>META-INF</manifestLocation>
490
                    <manifestLocation>META-INF</manifestLocation>
491
492
                    <!--
493
                     <instructions>
494
                        <Import-Package>!org.apache.commons.cli,*</Import-Package>
495
                        <Export-Package>net.timbusproject.extractors.modules.linuxhardware.*</Export-Package>
496
                        <Exclude-Resource>net/timbusproject/extractors/modules/linuxhardware/local/*</Exclude-Resource>
497
                        <Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
498
                    </instructions>
499
                    -->
459
                    <instructions>
500
                    <instructions>
460
                        <Import-Package>
501
                        <Import-Package>
461
                            net.timbusproject.extractors.core;version="[0.0,1)",
502
                            net.timbusproject.extractors.core;version="[0.0,1)",
462
                            org.osgi.framework;version="[1.6,2)",
503
                            org.osgi.framework;version="[1.6,2)",
463
                            javax.naming,
504
                            <!-- javax.naming,
464
                            org.springframework.context.*;version="[3.0,4.0)"
505
                            org.springframework.context.*;version="[3.0,4.0)"-->
465
                        </Import-Package>
506
                        </Import-Package>
466
                        <Private-Package>net.timbusproject.extractors.modules.tavernaextractor</Private-Package>
507
                        <Private-Package>net.timbusproject.extractors.modules.tavernaextractor</Private-Package>
467
                        <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
508
                        <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
468
                        <Embed-Directory>OSGI-INF/lib</Embed-Directory>
509
                        <Embed-Directory>OSGI-INF/lib</Embed-Directory>
469
                        <Embed-Transitive>true</Embed-Transitive>
510
                        <Embed-Transitive>true</Embed-Transitive>
...
...
518
559
519
    <repositories>
560
    <repositories>
520
        <repository>
561
        <repository>
521
            <id>com.springsource.repository.bundles.release</id>
562
            <id>com.springsource.repository.bundles.release</id>
522
            <name>EBR Spring Release Repository</name>
563
            <name>EBR Spring Release Repository</name>
523
            <url>http:// repository.springsource.com/maven/bundles/release</url>
564
            <url>http://repository.springsource.com/maven/bundles/release</url>
524
        </repository>
565
        </repository>
525
526
        <repository>
566
        <repository>
527
            <id>com.springsource.repository.bundles.external</id>
567
            <id>com.springsource.repository.bundles.external</id>
528
            <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
568
            <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
529
            <url>http://repository.springsource.com/maven/bundles/external</url>
569
            <url>http://repository.springsource.com/maven/bundles/external</url>
530
            <snapshots>
570
            <snapshots>
531
                <enabled>false</enabled>
571
                <enabled>false</enabled>
532
            </snapshots>
572
            </snapshots>
533
        </repository>
573
        </repository>
534
535
        <repository>
574
        <repository>
536
            <id>mygrid-repository</id>
575
            <id>mygrid-repository</id>
537
            <name>myGrid Repository</name>
576
            <name>myGrid Repository</name>
538
            <url>http://www.mygrid.org.uk/maven/repository</url>
577
            <url>http://www.mygrid.org.uk/maven/repository</url>
539
            <releases />
578
            <releases />
540
            <snapshots>
579
            <snapshots>
541
                <enabled>false</enabled>
580
                <enabled>false</enabled>
542
            </snapshots>
581
            </snapshots>
543
        </repository>
582
        </repository>
544
545
        <repository>
583
        <repository>
546
            <id>snapshots</id>
584
            <id>snapshots</id>
547
            <name>Archiva Managed Snapshot Repository</name>
585
            <name>Archiva Managed Snapshot Repository</name>
548
            <url>http://olymp.ifs.tuwien.ac.at:8080/archiva/repository/snapshots/</url>
586
            <url>http://olymp.ifs.tuwien.ac.at:8080/archiva/repository/snapshots/</url>
549
            <releases>
587
            <releases>
...
...
551
            </releases>
589
            </releases>
552
            <snapshots>
590
            <snapshots>
553
                <enabled>true</enabled>
591
                <enabled>true</enabled>
554
            </snapshots>
592
            </snapshots>
555
        </repository>
593
        </repository>
594
        <repository>
595
            <id>timbus.repository</id>
596
            <url>http://timbus.teco.edu/maven</url>
597
        </repository>
556
    </repositories>
598
    </repositories>
557
</project>
599
</project>